diff options
264 files changed, 12184 insertions, 48754 deletions
@@ -37,18 +37,17 @@ stamp-h1 *.gmo .dirstamp po/stamp-po -src/aethyra +src/tmw # files created during Windows build .objs *.dll -aethyra.exe -aethyra.depend -aethyra.layout +tmw.exe +tmw.depend +tmw.layout # files copied in on Windows include/* lib/* packaging/windows/upx/* data/music/*.ogg - @@ -1,34 +1,6 @@ ---------------------------- -Aethyra Dev Team ---------------------------- - - Tametomo <irarice@gmail.com> - -== Programmers == - - Kraant <kraant@gmail.com> - Tametomo <irarice@gmail.com> - -== Artists == - - Frictor <frictor2(at)hotmail.com> - Angeliex - -== Map Designers == - - Ichigo Black (aka Gonzo Dark) - Arkyan - -== Inactive/Retired == - - Blameu aka Kevin Day (blame@aethyra.com.com) - Sanga <sanga@aethyra.com> - Scraggy <DougABoffey@netscape.net> - Sertraline - ------------------------ -The Mana World Dev Team ------------------------ +--------------------------------- +-- The Mana World Contributors -- +--------------------------------- This file lists all contributors up to the current release. Check the wiki for the currently active development team. @@ -50,8 +22,10 @@ Eric Scrivner <zenogais gmail.com> Fate <fate.tmw googlemail.com> Fredrik Reveny <chetic gmail.com> Guillaume Melquiond (Silene) <guillaume.melquiond gmail.com> +Ira Rice <irarice gmail.com> Jan-Fabian Humann (Mra) <malastare gmx.net> José Ávila <linux javila.net> +Joshua Langley <joshlangley optusnet.com.au> Kiyoshi Kyokai <kiyoshi.kyokai gmail.com> Lloyd Bryant <lloyd_bryant netzero.net> Marcel W. Wysocki <maci satgnu.org> @@ -80,6 +54,13 @@ Scott Ellis <quiche_on_a_leash hotmail.co.uk> Tatjana Ti Sing Hao +== Translators == + +Bjørn Lindeijer (Dutch) <bjorn lindeijer.nl> +Eugenio Favalli (Italian) <elvenprogrammer gmail.com> +Leif Kildelund (Danish) <gonzo.dark gmail.com> +Matthias Hartmann (German) <hartmann.matthias gmail.com> + == Other contributors == Jean-Francois Lampron <sull.kf gmail.com> diff --git a/CMakeLists.txt b/CMakeLists.txt index 365f0944..0ce5d305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ -PROJECT(AETHYRA) +PROJECT(TMW) -SET(VERSION 0.0.27.1) +SET(VERSION 0.0.28) # where to look for cmake modules SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) @@ -11,11 +11,11 @@ IF (WIN32) SET(PKG_DATADIR ".") SET(PKG_BINDIR ".") ELSE (WIN32) - SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/aethyra) + SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tmw) SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) ENDIF (WIN32) ADD_SUBDIRECTORY(data) ADD_SUBDIRECTORY(src) -INSTALL(FILES aethyra.desktop DESTINATION share/applications) +INSTALL(FILES tmw.desktop DESTINATION share/applications) @@ -1,6144 +0,0 @@ -2008-11-01 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/openglgraphics.h, src/openglgraphics.cpp: Made an option around - the syncing, but no way to change it for now. - -2008-09-21 Kevin Day ("Blame") <blame@aethyra.com> - - * Added the update.sh script to work with autobuild.sh - -2008-09-16 Kevin Day ("Blame") <blame@aethyra.com> - - * Added autobuild.sh complete build script for the client - * Updated the gui graphics for the client for halloween - -2008-09-12 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Changed default port for Aethyra to 21001 - * Modified "/where" command to display X and Y coordinates - (Again - this was done on 2008-08-21, but the changes - were overwritten somehow) - * Added client support for Heal spell ("/cast heal") - * Added client support for Gather spell ("/cast gather") - * some changes to inventory system, to support the use of - "Kafra" storage (this is not yet operational - these - changes are only part of what's required to enable storage - in the client) - -2008-09-04 Douglas Boffey ("Scraggy") <scraggy@aethyra.com> - - * Added code to change colours in the chatlog - -2008-08-30 Kevin Day ("Blame") <blame@aethyra.com> - - * Updated the in game help files "/trunk/data/help" - -2008-08-28 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Patch to prevent crash if a map layer has too many - tiles (From TMW svn, r4544) - -2008-08-26 Douglas Boffey ("Scraggy") <DougABoffey@netscape.net> - - * Corrected position of registration dialogs - -2008-08-21 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added configuration option "EnableSync" that causes - client to honor 0x88 "Stop Walking" packet. - * Added X and Y coordinates to output of "/where" - * Reformatted src/chat.cpp - it was missing indentation - in large areas - -2008-08-17 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Set the wallpaper based on the screen width. - * Added a usleep to the login sequence loop to - prevent it from unnecessarily maxing out the CPU - -2008-08-17 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Correctly show GP remaining after buying from NPC - vendor (from TMW svn, r4449) - -2008-08-17 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Fixed issues with unequipping some arrows failing. - * Removed hard-coded item ID's from several files - -2008-08-16 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Fixed bug where client would crash if another player - was targeted when you hit a warp point. - -2008-08-14 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Uncommented line so that MP status bar correctly - updates based on remaining mana - -2008-08-13 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added code to display NPC and monster names using an - alternate colored font. Added support for a server - provided "GM flag", which prepends "(GM)" to the player's - name and changes the font color. - -2008-08-08 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Made "--skipupdate" skip the update download process, but - still load whatever updates have been previously downloaded. - -2008-07-25 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added feature to remember window locations from one - session to the next (patch from TMW by ElvenProgrammer) - -2008-07-24 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Tweak in net/beinghandler.cpp to compensate for a visual - bug when using the TMW server. - -2008-07-23 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added support for capes/misc1/misc2 into the character - selection display - -2008-07-23 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added "chat" button to open/close chat window - * Added support for viewable cape/misc1/misc2 (new eAthena - version ONLY - -2008-07-22 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added handler for 0x0086 movement packet (new eAthena). - * Changed startup sequence for game.cpp to send a ping packet - to the server after all the handlers have been initialized. - This is required by the new eAthena version. - * Added #deines for some "ping" packets. - -2008-07-19 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Removed unnecessary check ("weight") from itemdb loader - -2008-07-18 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added code to provide viewable glove and shoe sprites - -2008-07-11 Douglas Boffey <DougABoffey@netscape.net> - - * Added code to avoid collision between different displayed text. - -2008-07-08 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added handling for a "Stop Walking" packet. This will - force the client back into sync during those "can't run - away from a battle" sync error conditions. - -2008-07-07 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Added support for update host provided by login server - * Changed startup sequence to login first, then update - -2008-07-05 Lloyd Bryant ("Sanga") <sanga@aethyra.com> - - * Applied patch from kraant to convert into a TME branded client - * Removed redundant autoconf files - -2008-07-01 Douglas Boffey <DougABoffey@netscape.net> - - * Split ChatWindow into ChatWindow, Recorder and Party. - * Added /toggle command. - -2008-06-28 Kevin Day <blame582@gmail.com> - - * Updated configure and configure.ac to reflect tme version info. - -2008-06-25 Kevin Day <blame582@gmail.com> - - * Updated README added /commands and updated skill level listing. - -2008-06-25 Douglas Boffey <DougABoffey@netscape.net> - - * Added a command to display the characters present within hearing - distance (/help present for details). - * Removed the need to select the map server if only one available. - * Added a text entry for the port to the login dialog. - * Added the basis of the party subsystem. (/help party for details). - * Added the recording subsystem (/help record for details). - * Add a dropdown to the login dialog to make it easier to log in - on different servers. - * Made the chatlog entry sticky (Cancelled by a blank line) - - TODO Make an option. - -2008-06-24 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Added particle property "follow-parent" which - makes the particle move when its parent particle is moved. - -2008-06-23 Philipp Sehmisch <tmw@crushnet.org> - - * src/imageparticle.cpp, src/particle.cpp, src/particle.h, - src/particleemitter.cpp, src/particleemitter.h, src/textparticle.cpp: - Implemented "alpha" particle property. - -2008-06-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/player_relations.h: Fixed warning about missing virtual - destructor. - -2008-06-17 Fate <fate.tmw@googlemail.com> - - * src/net/tradehandler.cpp: bug #333: Suppress `trade with X cancelled' - messages for ignored players. - -2008-06-16 Fate <fate.tmw@googlemail.com> - - * player_relations.h: Allow whispers by default. - -2008-06-14 David Athay <ko2fan@gmail.com> - - * src/gui/shop.cpp, src/gui/browserbox.cpp, src/net/tradehandler.cpp: - Fixed compilation errors. Fixed trade bug (although a little hacky - right now). - * src/net/tradehandler.cpp: Changed bug fix as requested by Bjørn. - -2008-06-08 Fate <fate.tmw@googlemail.com> - - * src/gui/table.cpp: Invalidate mTopWidget whenever the model is - regenerated to reflect that we have no current valid selection. - * src/player_relations.cpp: Proper handling of case where player, to - apply ignore strategy to, is NULL. - -2008-06-05 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/gui/setup_video.cpp: Lowered default particle - detail level. - -2008-06-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/updatewindow.cpp, src/gui/updatewindow.h, src/main.cpp, - src/resources/buddylist.cpp, src/resources/spritedef.cpp, - src/resources/resourcemanager.cpp: Added command line argument to - specify the update host (-H). Also, to avoid problems when files with - the same name are served by different update hosts, the updates are - now stored in an update host specific directory. Based on a patch by - Sanga. - -2008-06-04 Lloyd Bryant <sanga@aethyra.com> - - * src/net/charserverhandler.cpp: Display shield sprite also in - character select window. - -2008-05-30 Lloyd Bryant <sanga@aethyra.com> - - * src/net/equipmenthandler.cpp, src/net/beinghandler.cpp, - src/net/protocol.h, src/being.h: Merged handling for eAthena packets - 0x00c3 and 0x01d7 and added support for displaying a shield sprite. - -2008-05-28 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp: Changed the way particle emitter skip is handled - to make linear and circular emitters work with particleEmitterSkip - enabled. - * src/gui/setup.cpp, src/gui/setup_video.cpp, src/gui/setup_video.h: - Added slider for controlling particleEmitterSkip (overall quality of - particle effects) to video setup menu. - -2008-05-28 Dennis Friis <peavey@placid.dk> - - * src/being.cpp: Change order of direction to up/down/right/left in - Being::getSpriteDirection to fix inconsistancy of facing direction - when walking diagonally. - -2008-05-27 David Athay <ko2fan@gmail.com> - - * src/main.cpp, src/player_relations.cpp: Changed OSX tmw directory to - a more suitable location, and fixed compile error. - -2008-05-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/Makefile.am, src/CMakeLists.txt: Fixed linker error caused by - missing module. - -2008-05-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/setup_players.cpp, src/gui/popup_box.h, src/gui/viewport.h, - src/gui/popup_box.cpp, src/gui/setup_players.h, src/Makefile.am: - Removed the PopupBox class and used gcn::DropDown instead. It has - clipping issues, but it would be better to fix those instead of using - this complicated workaround. - -2008-05-19 Philipp Sehmisch <tmw@crushnet.org> - - * src/net/beinghandler.cpp: Implemented interpretation of names for - NPCs and monsters. - * src/npc.cpp, src/resources/npcdb.cpp, src/resources/npcdb.hpp: Added - the possibility to add particle effects to NPCs in npcs.xml. - -2008-05-16 David Athay <ko2fan@gmail.com> - - * src/gui/popupmenu.cpp: Applied QOAL's patch to fix popup bug. - -2008-05-14 fate <fate.tmw@googlemail.com> - - * src/configuration.cpp, src/game.cpp, src/player_relations.h, - src/beingmanager.h, src/gui/setup_players.cpp, src/gui/setup.cpp, - src/gui/table_model.h, src/gui/table_model.cpp, src/gui/popup_box.h, - src/gui/popup_box.cpp, src/gui/table.h, src/gui/setup.h, - src/gui/table.cpp, src/gui/setup_players.h, src/gui/popupmenu.cpp, - src/beingmanager.cpp, src/player.cpp, src/main.cpp, src/being.cpp, - src/player.h, src/net/tradehandler.h, src/net/beinghandler.cpp, - src/net/tradehandler.cpp, src/net/chathandler.cpp, - src/configuration.h, src/player_relations.cpp, src/Makefile.am, - src/being.h, data/graphics/gui/emotions.png, - data/graphics/gui/Makefile.am, data/help/commands.txt: Added ability - to define friends, players you want to ignore or disregard and - configure whether trading is allowed. Based on new popup code, - configuration improvements to store hierarchical data and a table - model. - -2008-05-08 Dennis Friis <peavey@placid.dk> - - * src/game.cpp: Make F8 toggle shortcut window as suggested by And1 - and fate. - * src/game.cpp, src/gui/chat.h, src/gui/chat.cpp: Allow page up and - page down to scroll the chat window, based on patch by fate. - -2008-05-06 Dennis Friis <peavey@placid.dk> - - * src/gui/itemshortcutcontainer.cpp: Don't allow dragging of empty - placeholders. - -2008-04-29 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/gui/chat.h, src/gui/chat.cpp: Fixed issue with - determining whether chat input is focused (method no longer virtual). - * src/gui/itemshortcutcontainer.cpp: Fixed sometimes rendering with - the wrong font. - * src/gui/window.h, src/gui/window.cpp: Fixed warnings about hiding - virtual method, Window now always deletes its children (the option not - to do so was never used anyway). - * src/gui/gccontainer.h, src/gui/gccontainer.cpp: Removed unused - option from GCContainer to not delete a child, fixing warnings about - hiding virtual method gcn::Container::add. - * src/log.h, src/resources/imageset.cpp: When compiling with GCC, use - the printf format attribute for the log method so that the compiler - checks the type of its parameters. - -2008-04-28 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/inventorywindow.h, src/gui/itemcontainer.h, - src/gui/inventorywindow.cpp, src/gui/scrollarea.h, - src/gui/itemcontainer.cpp, src/gui/scrollarea.cpp: Properly fix - problems with ItemContainer in InventoryWindow not resizing properly - since upgrade to Guichan 0.8.0. - -2008-04-28 Dennis Friis <peavey@placid.dk> - - * src/gui/scrollarea.h, src/gui/scrollarea.cpp: Add methods to get - width and height adjusted for any visible scrollbars. - * src/gui/itemcontainer.cpp: Fix buildup of whitespace by using - correct gridHeight and adding just 4px space to bottom. - * src/gui/inventorywindow.h, src/gui/inventorywindow.cpp: Switch to - use our extended ScrollArea and use adjusted width to proper calculate - the grid for itemcontainer. - * src/game.cpp: Tweak keyboard input handling a bit. This fixes using - emoticons triggering shortcut items to be used. - * src/game.cpp: Remove check for KMOD_NONE since this is not working - uniformly across systems. - -2008-04-27 Dennis Friis <peavey@placid.dk> - - * src/gui/inventorywindow.cpp: Fix ItemContainer not being resized - properly when resizing inventory window. - -2008-04-26 Dennis Friis <peavey@placid.dk> - - * src/inventory.cpp: Avoid stacking equipment other than arrows. Based on - similar fix in inventoryhandler. - * src/gui/trade.cpp: Text fix, z => GP. - * src/net/playerhandler.cpp: When picking up GP from trade or quest, - tell the user in the chat window like with items. - -2008-04-24 Dennis Friis <peavey@placid.dk> - - * src/itemshortcut.h, src/gui/itemshortcutcontainer.cpp, - src/gui/itemcontainer.cpp, src/net/inventoryhandler.cpp, - src/itemshortcut.cpp: Make shortcut container ID based instead of slot - based. Fixes items shifting around often causing equipment to be lost. - * data/help/commands.txt: Document anti-trade function. - -2008-04-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/beingmanager.cpp: Fixed a bug, thanks GCC 4.3! - -2008-04-18 David Athay <ko2fan@gmail.com> - - * src/game.cpp, src/openglgraphics.cpp: Mac now uses Apple key for - emoticons, so alt can be used for alternate characters. Disable vsync - on mac. - -2008-04-17 Dennis Friis <peavey@placid.dk> - - * src/gui/sell.cpp: Fix shop list not to scroll to top when selling. - Redo of revision 3801 due to changes in guichan 0.8.0. - * src/gui/minimap.cpp: Draw NPCs in yellow on minimap and skip drawing - of warps. Based on idea by leeor_net. - -2008-04-16 Dennis Friis <peavey@placid.dk> - - * src/gui/browserbox.cpp: Fix a basic_string::at sometimes being out - of range in BrowserBox::draw when checking for line separators and - color codes. - * src/localplayer.cpp: Cancel walking to a clicked monster if the - target is lost while getting to it (killed or otherwise removed). - -2008-04-16 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/npc_text.h, src/gui/textbox.cpp, src/gui/npc_text.cpp, - src/gui/scrollarea.h, src/gui/textbox.h: Restored the text wrapping in - TextBox, since it was based on overriding a method that is no longer - virtual in Guichan 0.8.0. - * src/gui/viewport.cpp: Fixed compilation warning. - -2008-04-15 David Athay <ko2fan@gmail.com> - - * src/gui/viewport.cpp, src/beingmanager.cpp, tmw.cbp: Fixed clicking - near player. - -2008-04-14 Dennis Friis <peavey@placid.dk> - - * src/gui/chat.cpp: Tweaked /whisper command to allow quoting of nicks - with spaces in them. - -2008-04-14 Philipp Sehmisch <tmw@crushnet.org> - - * src/resources/dye.cpp: Fixed multi-channel dyeing (patch by fate) - * src/gui/chat.h: Changed prefix of received whisper messages from - "says:" to "whispers:" - -2008-04-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/itemshortcutcontainer.h, src/gui/itemshortcutcontainer.cpp, - src/gui/itemshortcutwindow.cpp, src/gui/scrollarea.h, - src/gui/scrollarea.cpp, src/gui/itemshortcutwindow.h: Fixed display of - item shortcut container. gcn::Widget::setWidth is no longer virtual. - -2008-04-11 David Athay <ko2fan@gmail.com> - - * src/localplayer.cpp, src/beingmanager.h, src/gui/viewport.cpp, - src/beingmanager.cpp, src/localplayer.h, tmw.cbp: Players now need to - click on the monster sprites rather than the tile. Players will now - move to the target before attacking it. - -2008-04-10 Dennis Friis <peavey@placid.dk> - - * src/gui/chat.h, src/gui/chat.cpp, src/net/protocol.h, - src/net/chathandler.cpp: Implemented support for whispering to other - players. - -2008-04-10 Philipp Sehmisch <tmw@crushnet.org> - - * src/net/beinghandler.cpp: Critical hits are now displayed. - -2008-04-09 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/shoplistbox.cpp, src/gui/shoplistbox.h: Fixed problem with - row height in shop list box. - * src/game.cpp, src/gui/menuwindow.cpp, src/gui/itemcontainer.cpp, - src/main.cpp, src/CMakeLists.txt, src/net/inventoryhandler.cpp, - src/Makefile.am: Re-enabled non-functional item shortcut window, - planned to be fixed for 0.0.25. - -2008-04-07 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/particle.cpp, src/utils/xml.cpp, src/utils/xml.h, - src/resources/mapreader.cpp, src/resources/spritedef.cpp, - src/resources/npcdb.h, src/resources/monsterdb.cpp, - src/resources/itemdb.cpp, src/resources/npcdb.cpp, - src/resources/spritedef.h: Added XML::Document class which simplifies - parsing an XML document and automatically cleans it up again. - * src/being.cpp: Fixed crash on trying to show out of range emoticon. - * src/winver.h, README, configure.ac, data/help/changes.txt, - data/help/header.txt, NEWS, CMakeLists.txt: Updated version, release - date and changes. - -2008-04-03 David Athay <ko2fan@gmail.com> - - * src/game.cpp: Tweaked disconnect dialog, hoping to fix a crash bug. - -2008-03-31 Philipp Sehmisch <tmw@crushnet.org> - - * src/main.cpp, src/npc.cpp, src/npc.h, src/resources/npcdb.h, - src/resources/npcdb.cpp, data/npcs.xml, src/Makefile.am, tmc.cbp: - Implemented NPC XML database which maps NPC IDs to one or more - animation files and thus enables animated NPCs. - -2008-03-30 Dennis Friis <peavey@placid.dk> - - * configure.ac: Updated for tmwdata split. - -2008-03-27 Dennis Friis <peavey@placid.dk> - - * src/gui/progressbar.cpp, src/gui/scrollarea.cpp: Revert progress bar - changes and initialize mWalkTime. - -2008-03-26 Dennis Friis <peavey@placid.dk> - - * src/gui/progressbar.cpp, src/localplayer.cpp: Initialized some - uninitialized variables. - -2008-03-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/engine.h, src/gui/viewport.h, src/engine.cpp, - src/net/playerhandler.cpp: Removed unnecessary forwarding method. - -2008-03-16 Dennis Friis <peavey@placid.dk> - - * The Mana World.dev: Updated Dev-C++ project file. - -2008-03-11 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am: - Removed unused image here too. - -2008-03-11 Eugenio Favalli <elvenprogrammer@themanaworld.org> - - * data/graphics/gui/attack_target.png: Removed unused image. - -2008-03-09 Dennis Friis <peavey@placid.dk> - - * src/game.cpp: Pressing escape in the quit dialog closes the dialog. - * src/gui/chat.cpp, src/gui/chat.h: Fixed a bug with chat messages - without a sender which include semicolons. - * src/chat.cpp: Added "/clear" command to clear chat window. - -2008-03-08 Philipp Sehmisch <tmw@crushnet.org> - - * tools/tmxcopy/main.cpp, tools/tmxcopy/main.map.cpp, - tools/tmxcopy/zlibutils.cpp: Fixed some width/height mixups in - TMXCopy. - -2008-03-07 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/*: Moved dynamically released data to its own module (tmwdata). - -2008-03-07 Eugenio Favalli <elvenprogrammer@themanaworld.org> - - * data/equipment.xml, data/graphics/items/armor-legs-chaps.png, - data/graphics/items/armour-head-cowboyblack.png, - data/graphics/items/armour-head-cowboywhite.png, - data/graphics/items/generic-snakeskin.png, - data/graphics/sprites/head-cowboyblack.png, - data/graphics/sprites/head-cowboyblack.xml, - data/graphics/sprites/head-cowboywhite.png, - data/graphics/sprites/head-cowboywhite.xml, - data/graphics/sprites/leg-chaps-female.png, - data/graphics/sprites/leg-chaps-female.xml, - data/graphics/sprites/leg-chaps-male.png, - data/graphics/sprites/leg-chaps-male.xml, - data/graphics/sprites/monster-snake.png, - data/graphics/sprites/monster-snake.xml, - data/graphics/sprites/npcs.png, data/items.xml, data/monsters.xml: - Added new items by Black Don, new xml definitions by Peavey. - -2008-03-02 Eugenio Favalli <elvenprogrammer@themanaworld.org> - - * tmw.cbp: Upgraded project file to latest C::B release. - -2008-03-02 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/leg-jeans-female.png: fixed transparency issue. - -2008-02-26 Eugenio Favalli <elvenprogrammer@themanaworld.org> - - * src/gui/minimap.cpp: Keep minimap status. Based on a patch by Knivey. - * data/graphics/tiles/tulimshar1.png, data/maps/new_3-1.tmx: Added - Modanung's mud tileset and applyed to some houses in Tulimshar. - -2008-02-26 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/maps/new_14-1.tmx: Fixed some monster traps on - southwest woodland. - -2008-02-23 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/items/generic-ironore.png, data/items.xml: - Implemented iron ore item. - * data/maps/new_10-1.tmx, data/maps/new_11-1.tmx, - data/maps/new_12-1.tmx, data/maps/new_21-1.tmx: Map fixes by - QOAL. - * data/graphics/sprites/head-mask.xml, - data/graphics/sprites/head-warlordhelm.xml: - Animaton fixes by QOAL. - -2008-02-19 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_22-1.tmx: Map fixes at snake dungeon by QOAL. - -2008-02-18 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/hairstyle7-female.xml, src/sound.cpp, - src/utils/strprintf.cpp, tmw.cbp: Fixed image name. - -2008-02-13 Philipp Sehmisch <tmw@crushnet.org> - - * data/equipment.xml, data/items.xml, - data/graphics/items/armor-head-crusaderhelm.png, - data/graphics/items/armor-head-infantryhelm.png, - data/graphics/items/armor-head-knighthelm.png, - data/graphics/items/armor-head-warlordhelm.png, - data/graphics/sprites/head-crusaderhelm.png, - data/graphics/sprites/head-infantryhelm.png, - data/graphics/sprites/head-knighthelm.png, - data/graphics/sprites/head-warlordhelm.png, - data/graphics/sprites/head-crusaderhelm.xml, - data/graphics/sprites/head-infantryhelm.xml, - data/graphics/sprites/head-knighthelm.xml, - data/graphics/sprites/head-warlordhelm.xml: Added new headgears by - Black Don (thanks to QOAL for testing and implementation) - -2008-02-12 Dennis Friis <peavey@placid.dk> - - * src/localplayer.cpp, src/map.cpp, src/gui/viewport.cpp, src/being.cpp - src/map.h: Made pathfinding not halt on collision destination tile, - made moving around with mouse smoother. Added possibility to pass - through players with key controls. - -2008-02-11 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_22-1.tmx: Added music and overlay to snake dungeon. - -2008-02-10 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_23-1.tmx: Added Dimonds Cove outdoor map by MerlinX420. - -2008-02-08 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_14-1.tmx, data/maps/new_22-1.tmx: Added Dimonds Cove - outdoor map by MerlinX420. Fixed some map bugs in snake dungeon. - * data/items.xml: Added chicken leg meta information. - -2008-01-28 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/sell.cpp, src/gui/window.cpp, src/gui/inventorywindow.h, - src/gui/buy.h, src/gui/itemshortcutwindow.cpp, - src/gui/inventorywindow.cpp, src/gui/buy.cpp, src/gui/sell.h, - src/gui/window.h, src/gui/windowlistener.h, - src/gui/itemshortcutwindow.h, src/CMakeLists.txt, src/Makefile.am: - Used the gcn::WidgetListener instead of our WindowListener. - -2008-01-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/trade.h, src/game.h, src/being.h: Fixed a GCC 4.3 compile - error and constified the usage of auto_ptr, since that's the way in - which we are using them. - -2008-01-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/char_server.cpp, src/gui/window.cpp, src/gui/checkbox.h, - src/gui/playerbox.h, src/gui/button.cpp, src/gui/chat.cpp, - src/gui/slider.cpp, src/gui/tabbedcontainer.cpp, src/gui/textfield.h, - src/gui/shoplistbox.cpp, src/gui/register.cpp, - src/gui/radiobutton.cpp, src/gui/textbox.cpp, src/gui/login.cpp, - src/gui/setup_audio.cpp, src/gui/setup_video.cpp, - src/gui/textfield.cpp, src/gui/playerbox.cpp, - src/gui/setup_joystick.cpp, src/gui/scrollarea.h, - src/gui/windowlistener.h, src/gui/checkbox.cpp, - src/gui/scrollarea.cpp: Compile against Guichan 0.8.0. Some issues - with ShopListBox left and not trying to use their new TabbedArea, - SelectionListener and WidgetListener yet. Also needs more testing. - * src/gui/trade.cpp, src/gui/sell.cpp, src/gui/inventorywindow.h, - src/gui/selectionlistener.h, src/gui/itemcontainer.h, - src/gui/shoplistbox.cpp, src/gui/shoplistbox.h, src/gui/listbox.h, - src/gui/buy.h, src/gui/inventorywindow.cpp, src/gui/buy.cpp, - src/gui/itemcontainer.cpp, src/gui/sell.h, src/gui/trade.h, - src/gui/listbox.cpp, src/CMakeLists.txt, src/Makefile.am: Used the - gcn::SelectionListener instead of our own. - -2008-01-19 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_10-1.tmx, data/maps/new_11-1.tmx: Map fixes by 5t3v3 at - the new snow maps. Added hot spring particle effect to pond south of - snow village. - * data/graphics/particles/bubbles_32px, - data/graphics/particles/bubbles_12px, - data/graphics/particles/bubbles_8px, - data/graphics/particles/whirlpool.particle.xml: Added bubble particle - effect. - -2008-01-14 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_10-1.tmx, data/maps/new_11-1.tmx: Added new versions of - snow maps by 5t3v3. - * src/sound.cpp: Fixed an error in Davids last commit (couldn't compile - that way). - -2008-01-13 David Athay <ko2fan@gmail.com> - - * src/resources/resourcemanager.h, src/resources/resourcemanager.cpp, - src/main.cpp, src/sound.cpp, src/engine.cpp: Fixed music loading from - non-default location. - -2008-01-03 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_1-1.tmx, data/maps/new_3-1.tmx: Some map bugs reported - by Strump, fixed by Zipon. - -2007-12-30 Philipp Sehmisch <tmw@crushnet.org> - - * src/gui/viewport.cpp: Added config options to set the scroll center. - * src/engine.cpp, src/engine.h, src/gui/viewport.h, - src/net/playerhandler.cpp: Retained scroll offset during map change for - smoother map transitions. - -2007-12-30 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_22-1.tmx: Some mapping fixes at snake dungeon map. - * src/game.cpp, src/beingmanager.cpp, src/beingmanager.h, - src/keyboardconfig.cpp, src/keyboardconfig.h: Added a key for targeting - the nearest player character based on patches by Trinexx. - -2007-12-28 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_7-1.tmx, data/maps/new_22-1.tmx: Added new map by 5t3v3 - (east desert cave) and enhanced version of eastern desert by Len. - -2007-12-28 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_3-1.tmx: Some mapping errors fixed by Zipon. - * src/being.cpp, src/monster.cpp, src/resources/monsterinfo.cpp, - src/resources/monsterinfo.h: Added the possibility to assign particle - effects to monsters in the monster database. - * data/monsters.xml: Added flame particle effect to fire goblin as a - proof of concept. - -2007-12-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * README: Fixed year here too... - -2007-12-25 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/help/header.txt: Fixed year. :) - * debian/rules: Fixed missing backslash. - * src/CMakeLists.txt: Updated CMake file. - -2007-12-24 David Athay <ko2fan@gmail.com> - - * src/game.cpp: Fixed dialog for disconnections, so it says Ok, not - yes/no. - * src/openglgraphics.cpp: Changed type so it would compile on Leopard. - -2007-12-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * README, data/help/changes.txt, data/help/header.txt, NEWS: Updated - release date. - * src/game.cpp, src/gui/menuwindow.cpp, src/gui/itemcontainer.cpp, - src/main.cpp, src/CMakeLists.txt, src/net/inventoryhandler.cpp, - src/Makefile.am: Disabled non-functional item shortcut window. - * src/particleemitter.cpp: Fix compile warning. - -2007-12-23 Philipp Sehmisch <tmw@crushnet.org> - - * src/particleemitter.cpp, src/particleemitter.h: Particle images - are now reference-counted properly. - * src/resources/spritedef.cpp: Error placeholder is now used when - attempting to load a sprite definition file that doesn't exist. - * src/monster.cpp, src/player.cpp: Avoided attempts to load - "data/graphics/" when a monster or equipment piece has no sprite. - * data/graphics/particles/cookingfire.particle.xml: Removed some - particle properties that did nothing because they were misspelled. - -2007-12-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/winver.h, README, configure.ac, INSTALL, data/help/header.txt, - NEWS, CMakeLists.txt: Updated version to 0.0.24. - * src/net/chathandler.cpp, NEWS: Make sure chat messages are also - trimmed for the local player. - -2007-12-21 David Athay <ko2fan@gmail.com> - - * src/game.cpp, src/gui/updatewindow.cpp: Attempted to fix client - freeze when unable to connect to update host, and added exit dialog - when client loses connection. - -2007-12-21 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/shoplistbox.cpp: Fixed shop list box not to scroll up when - the selection is removed. - * src/resources/resourcemanager.h, src/resources/resourcemanager.cpp: - Added logging of error on PHYSFS_addToSearchPath. - * src/localplayer.cpp, src/inventory.h, src/gui/inventorywindow.cpp, - src/inventory.cpp, src/localplayer.h: Fixed inventory size not - matching the size assumed by eAthena, and related memory corruption. - * src/main.cpp: Increased default chat log length. - -2007-12-19 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_18-1.tmx: Fixed a map bug (monster trap) on - map 18 (woodland village surrounding) - -2007-12-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * tools/upalyzer/analyse.php: Fixed association of entries to update, - added no-cache headers, added a bit of error reporting in case of - invalid zip files, kept original ordering of the update list and - sorted the list of entries on their filename. - * tools/upalyzer/analyse.php: Added list of files in each update with - indication on whether they are still used. - -2007-12-18 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/main.cpp: Remember to delete the progressbar and label also when - the game was not started. - * tools/upalyzer/analyse.php: Added initial version of the update - analysis tool upalyzer. - * tools/upalyzer/analyse.php: Optimized with single loop approach and - nicer printing calls, inspired by doener's version. Also added list of - update entries and their respective update. - -2007-12-14 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/head-mask.png, - data/graphics/sprites/head-mask.xml, - data/graphics/sprites/head-mushroom.xml, - data/graphics/sprites/head-shroom.xml, - data/items.xml, data/equipment.xml: - Fixed some problems with the new items. - -2007-12-12 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/cave.png, data/graphics/tiles/cave_x2.png: - Fixed the blurred outlines of the new tiles. - -2007-12-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/tiles/cave.png, data/graphics/tiles/cave_x2.png, - data/maps/new_4-1.tmx: Added two new cave tiles by yosuhara. - -2007-12-12 Philipp Sehmisch <tmw@crushnet.org> - - * tools/tmxcopy/base64.cpp, - tools/tmxcopy/base64.h, tools/tmxcopy/main.cpp, - tools/tmxcopy/map.cpp, tools/tmxcopy/map.hpp, - tools/tmxcopy/readme.txt, tools/tmxcopy/tmxcopy.cbp, - tools/tmxcopy/tostring.h, tools/tmxcopy/xmlutils.cpp, - tools/tmxcopy/xmlutils.h, tools/tmxcopy/zlibutils.cpp, - tools/tmxcopy/zlibutils.h: Added my tmxcopy tool for copying - parts of maps to other maps. - -2007-12-10 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/being.cpp: Include cassert header. - -2007-12-10 Philipp Sehmisch <tmw@crushnet.org> - - * src/being.cpp, src/being.h, src/net/beinghandler.cpp, - src/net/charserverhandler.cpp, src/net/equipmenthandler.cpp, - src/player.cpp, src/player.h, data/items.xml: Simplified player - subsprite handling by treating equipment, hairstyle and base - sprites alike. This also enables gender-specific hairstyles. - * src/game.cpp, src/gui/chat.cpp, src/gui/chat.h, src/log.cpp, - src/log.h: Added an option to show log messages in the chat console. - * data/items.xml, - data/graphics/sprites/hairstyle1.png, - data/graphics/sprites/hairstyle1.xml, - data/graphics/sprites/hairstyle1-male.png, - data/graphics/sprites/hairstyle1-male.xml, - data/graphics/sprites/hairstyle1-female.png, - data/graphics/sprites/hairstyle1-female.xml, - data/graphics/sprites/hairstyle2.png, - data/graphics/sprites/hairstyle2.xml, - data/graphics/sprites/hairstyle2-male.png, - data/graphics/sprites/hairstyle2-male.xml, - data/graphics/sprites/hairstyle2-female.png, - data/graphics/sprites/hairstyle2-female.xml, - data/graphics/sprites/hairstyle3.png, - data/graphics/sprites/hairstyle3.xml, - data/graphics/sprites/hairstyle3-male.png, - data/graphics/sprites/hairstyle3-male.xml, - data/graphics/sprites/hairstyle3-female.png, - data/graphics/sprites/hairstyle3-female.xml, - data/graphics/sprites/hairstyle4.png, - data/graphics/sprites/hairstyle4.xml, - data/graphics/sprites/hairstyle4-male.png, - data/graphics/sprites/hairstyle4-male.xml, - data/graphics/sprites/hairstyle4-female.png, - data/graphics/sprites/hairstyle4-female.xml, - data/graphics/sprites/hairstyle5.png, - data/graphics/sprites/hairstyle5.xml, - data/graphics/sprites/hairstyle5-male.png, - data/graphics/sprites/hairstyle5-male.xml, - data/graphics/sprites/hairstyle5-female.png, - data/graphics/sprites/hairstyle5-female.xml, - data/graphics/sprites/hairstyle6.png, - data/graphics/sprites/hairstyle6.xml, - data/graphics/sprites/hairstyle6-male.png, - data/graphics/sprites/hairstyle6-male.xml, - data/graphics/sprites/hairstyle6-female.png, - data/graphics/sprites/hairstyle6-female.xml, - data/graphics/sprites/hairstyle7.png, - data/graphics/sprites/hairstyle7.xml, - data/graphics/sprites/hairstyle7-male.png, - data/graphics/sprites/hairstyle7-male.xml, - data/graphics/sprites/hairstyle7-female.png, - data/graphics/sprites/hairstyle7-female.xml: - Implemented female hairstyles. - -2007-12-09 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/head-funkywinter.png, - data/graphics/sprites/head-funkywinter.xml, - data/graphics/sprites/head-xmaself.png, - data/graphics/sprites/head-xmaself.xml: New versions of funky hat - and elf hat by QOAL. - -2007-12-04 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/items/generic-santacookie.png, - data/items.xml: Added a new drop item for the christmas event. - -2007-12-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/map.cpp, src/map.h: Fix drawing of very high fringe tiles by - keeping track of the maximum tile height. - * src/itemshortcut.h, src/gui/itemshortcutcontainer.h, - src/gui/itemshortcutcontainer.cpp, src/gui/itemshortcutwindow.cpp, - src/gui/itemshortcutwindow.h, src/itemshortcut.cpp: Random cleanups. - -2007-12-04 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/head-funkywinter.png, - data/graphics/sprites/head-funkywinter.xml, - data/graphics/sprites/head-mask.png, - data/graphics/sprites/head-mask.xml, - data/graphics/sprites/head-mushroom.png, - data/graphics/sprites/head-mushroom.xml, - data/graphics/sprites/head-shroom.png, - data/graphics/sprites/head-shroom.xml, - data/graphics/sprites/head-tophat.png, - data/graphics/sprites/head-tophat.xml, - data/graphics/sprites/head-xmaself.png, - data/graphics/sprites/head-xmaself.xml, - data/graphics/items/armor-head-xmaself.png, - data/graphics/items/armor-head-mask.png, - data/items.xml: Added/renamed some headgears for the christmas event. - -2007-11-20 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/maps/new_1-1.tmx, - data/graphics/maps/new_3-1.tmx, - data/graphics/maps/new_15-1.tmx: Updated desert maps with new - tiles by Len. - -2007-11-16 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/floor_item.cpp, src/localplayer.cpp, src/item.cpp, - src/inventory.h, src/gui/sell.cpp, src/gui/equipmentwindow.cpp, - src/gui/shop.cpp, src/gui/shoplistbox.cpp, src/gui/shop.h, - src/gui/itemshortcutcontainer.cpp, src/gui/buy.cpp, - src/gui/itemcontainer.cpp, src/inventory.cpp, src/item.h, - src/equipment.h, src/shopitem.cpp, src/CMakeLists.txt, - src/floor_item.h, src/net/inventoryhandler.cpp, src/equipment.cpp, - src/localplayer.h, src/Makefile.am, src/resources/iteminfo.h, - src/resources/itemdb.cpp, src/resources/iteminfo.cpp, src/shopitem.h: - Moved item icon from ItemInfo class to the Item class, so that it can - be loaded on demand. Results in faster startup time and reduced memory - usage. - -2007-11-16 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/resources/resourcemanager.h, src/resources/resource.h, - src/resources/resourcemanager.cpp, src/resources/resource.cpp: Delayed - resource deletion by 30 seconds. - * src/resources/image.cpp: Sped up recoloring of transparent pixels. - -2007-11-16 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/log.cpp, src/utils/wingettimeofday.h: Removed useless win32 - implementation of gettimeofday. - * src/log.cpp, tmw.cbp: Fixed minor issues. - -2007-11-11 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/item_amount.cpp, src/gui/item_amount.h, - src/gui/inventorywindow.cpp: Moved check on dropping 1 item to the - inventory dialog. - -2007-11-09 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/chest-chainmail-male, - data/graphics/sprites/chest-chainmail-female, - data/graphics/sprites/chest-cotton-male, - data/graphics/sprites/chest-cotton-female, - data/graphics/sprites/chest-leather-male, - data/graphics/sprites/chest-leather-female, - data/graphics/sprites/chest-tnecksweater-male, - data/graphics/sprites/chest-tnecksweater-female, - data/graphics/sprites/chest-vnecksweater-male, - data/graphics/sprites/chest-vnecksweater-female: - Modifications at the back shading of shirt sprites by Pauan. - -2007-11-04 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/resources/dye.cpp, src/resources/resourcemanager.cpp: Moved - palette qualifiers to the right as the code appends things on the left. - * src/resources/spritedef.cpp, src/resources/spritedef.h, - src/resources/resourcemanager.h: Added propagation of palettes through - sprite resource names. - * data/monsters.xml, data/graphics/sprites/monster-scorpion.xml: Used - palettes on sprite names. - * data/graphics/sprites/monster-scorpion-black.xml, - data/graphics/sprites/monster-scorpion-red.xml: Removed obsolete files. - * src/player.cpp: Added hair colors. - * data/graphics/sprites/hairstyle*.xml: Removed sprite variants. Set - replaceable color. - * data/graphics/sprites/hairstyle*.png: Reduced image sizes. - * data/monsters.xml, data/graphics/sprites/monster-slime.xml, - data/graphics/sprites/monster-slime.png: Added generic slime. - * data/graphics/sprites/monster-slime-{green,red,yellow}.png, - data/graphics/sprites/monster-slime-{green,red,yellow}.xml: Removed - obsolete files. - -2007-11-03 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/player.cpp, src/player.h, src/gui/char_select.cpp: Factored code. - * src/net/beinghandler.cpp, src/net/charserverhandler.cpp: Fixed double - load of hair graphics. - * src/Makefile.am, src/resources/dye.cpp, src/resources/dye.h: Added - palette holder and linear interpolator of colors. - * src/resources/image.h, src/resources/image.cpp: Added palette-based - recoloring of images. - * src/resources/resourcemanager.h, src/resources/resourcemanager.cpp: - Added automatic recoloring of images depending on their names. - * data/graphics/sprites/monster-scorpion.png: Flattened colors. - * data/graphics/sprites/monster-scorpion-black.png, - data/graphics/sprites/monster-scorpion-red.png: Removed obsolete files. - * data/graphics/sprites/monster-scorpion.xml, - data/graphics/sprites/monster-scorpion-black.xml, - data/graphics/sprites/monster-scorpion-red.xml: Added automatic - recoloring of scorpions. - -2007-11-01 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/particles/aniblaze.png, - data/graphics/particles/cookingfire.particle.xml, - data/graphics/particles/fireplace.particle.xml, - data/graphics/particles/flame.particle.xml: Improved fire particle - effects by using animated particles. - -2007-10-31 Philipp Sehmisch <tmw@crushnet.org> - - * data/items.xml, data/graphics/sprites/leg-skirt.png, - data/graphics/sprites/leg-skirt.xml, - data/graphics/items/armor-leg-skirt.png: Added skirt by Saphy. - ViewID is 26, item ID is 632, item properties are c&p from jeans - shorts. - -2007-10-27 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/properties.h, src/game.cpp, src/channel.h, src/log.cpp, - src/gui/window.cpp, src/gui/setup.cpp, src/gui/button.cpp, - src/gui/chat.h, src/gui/widgets/dropdown.cpp, src/gui/chat.cpp, - src/gui/tabbedcontainer.cpp, src/gui/windowcontainer.cpp, - src/gui/skill.cpp, src/gui/serverdialog.cpp, src/gui/textfield.cpp, - src/gui/playerbox.cpp, src/gui/scrollarea.cpp, src/beingmanager.cpp, - src/flooritemmanager.cpp, src/channelmanager.cpp, src/main.cpp, - src/particle.cpp, src/net/messageout.cpp, src/channel.cpp, - src/localplayer.h, src/resources/imageset.cpp, - src/resources/buddylist.cpp, src/resources/monsterinfo.h, - src/resources/iteminfo.h, src/resources/monsterdb.cpp, - src/resources/monsterinfo.cpp, src/resources/itemdb.cpp: Fixed missing - dependencies, spurious const qualifiers, and weak brackets, so that it - compiles with GCC 4.3. - -2007-10-26 Philipp Sehmisch <tmw@crushnet.org> - - * src/gui/item_ammount.cpp: Item amount dialog is now skipped - when there is only one item on the stack. - * src/browserbox.cpp, src/browserbox.h, src/chat.h, src/main.cpp: - Added possibility of length limitation to browserbox and used it - for the chatlog (length set by the config option "ChatLogLength"). - * src/chat.cpp, src/chat.h: Removed some completely useless code - from the chat class. - * src/monster.cpp, src/monster.h, data/sfx/logmonster-hurt1.ogg, - data/sfx/logmonster-hurt2.ogg, data/sfx/logmonster-hurt3.ogg, - data/sfx/logmonster-hurt4.ogg, data/sfx/logmonster-hurt5.ogg: - Implemented monster hurt sounds and added new sound effects by - Cosmostrator. - -2007-10-24 Philipp Sehmisch <tmw@crushnet.org> - - * data/items.xml, data/graphics/items/generic-darkcrystal.png: - Added a new quest loot item for the halloween event. - -2007-10-22 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/particle.cpp: Plugged memory leak. - * src/configuration.cpp, src/main.cpp: Plugged memory leak. Cleaned - code. - -2007-10-21 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/gui/window.cpp, src/gui/window.h: Removed redundant resizable - flag. Factored moving/resizing code, so that events are fired only - once per size change. - * src/resources/spritedef.cpp: Plugged memory leak in sprites. - * src/resources/action.cpp: Fixed double-free of sprite actions. - * src/resources/iteminfo.cpp, src/resources/iteminfo.h: Plugged memory - leak in equipment sound. - * src/resources/monsterdb.cpp: Plugged memory leak in database reader. - * src/engine.cpp, src/engine.h, src/game.cpp: Fixed current map not - deleted on server change. - * src/gui/trade.cpp: Added persistent positioning. - * src/gui/menuwindow.cpp: Fixed missing pixels at bottom and right. - * src/gui/window.cpp, src/gui/window.h: Changed to use default values - when restoring missing settings. - * src/gui/shoplistbox.cpp, src/gui/listbox.cpp: Fixed invisible text. - -2007-10-20 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/gui/playerbox.cpp: Centered sprite inside selection box. - -2007-10-19 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/resources/resource.cpp, src/resources/resource.h, - src/resources/imageset.cpp, src/resources/imageset.h: Removed mandatory - identifier path. - * src/resources/resourcemanager.cpp, src/resources/resourcemanager.h: - Factored code between resource handlers. - * src/resources/soundeffect.h, src/resources/soundeffect.cpp, - src/resources/music.h, src/resources/music.cpp, src/resources/image.h, - src/resources/image.cpp: Reworked resource loaders. - * src/resources/spritedef.h, src/resources/spritedef.cpp: Implemented - a failure-friendly loader. - * src/gui/truetypefont.cpp, src/resources/imageloader.cpp, - src/tileset.h: Removed dummy parameter. - -2007-10-19 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/images/ambient/fog.png: Added fog effect overlay - graphic. - -2007-10-18 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/resources/iteminfo.h, src/resources/itemdb.cpp: Removed unused - slot field. - * src/localplayer.cpp, src/localplayer.h: Removed specific type. - * src/gui/viewport.cpp, src/gui/minimap.cpp: Changed identification of - local player to a check of player_node. - * src/animatedsprite.cpp, src/animatedsprite.h, src/npc.cpp, - src/player.cpp, src/monster.cpp, src/resources/resourcemanager.cpp: - Prevented client from exiting on missing sprites. - * src/resources/spritedef.cpp: Added filename to fatal error messages. - * src/resources/iteminfo.cpp, src/resources/iteminfo.h, - src/resources/itemdb.cpp, data/items.xml: Merged weapon_type and - attacktype field. - -2007-10-18 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/hairstyle7-male.png, - data/graphics/sprites/hairstyle7-female.png: Readded hairstyle number - 7. - -2007-10-18 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/net/tradehandler.h, src/net/tradehandler.cpp: - Implemented automatic denying of trade requests based on a patch - submitted by Quiche_on_a_leash. - -2007-10-07 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/maps/new_18-1.tmx: Fixed some collision layer problems. - -2007-10-01 Philipp Sehmisch <tmw@crushnet.org> - - * src/player.cpp, data/graphics/sprites/hairstyle*: - Added support for different hairstyles for male and female characters - (current female hairstyles are copies of the male ones until the - real female ones are finished) - -2007-09-30 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/desert_x3.png: Removed the purple line from the - ruin tile. - -2007-09-27 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/desert2.png, data/graphics/tiles/desert_x3.png, - data/graphics/tiles/desert_x5.png: Added new desert tiles by Len. - -2007-09-20 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/equipment.xml, data/graphics/items/armor-head-funkyhat.png, - data/graphics/items/armor-head-mushroomhat.png, - data/graphics/items/armor-head-shroomhat.png, - data/graphics/items/armor-head-tophat.png, - data/graphics/sprites/item019.png, data/graphics/sprites/item019.xml, - data/graphics/sprites/item020.png, data/graphics/sprites/item020.xml, - data/graphics/sprites/item021.png, data/graphics/sprites/item021.xml, - data/graphics/sprites/item022.png, data/graphics/sprites/item022.xml, - data/items.xml, data/maps/new_21-1.tmx: Added 4 new items and a new ice - cave map. - -2007-09-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/items.xml, data/equipment.xml: Added temporary weapon IDs below - 256 to use as view-ID in eAthena's item DB. - * src/gui/shoplistbox.cpp, src/gui/buy.h, src/gui/buy.cpp: Allowed - selection of items that cannot be afforded, so that their descriptions - are still accessible. Also made sure the player's money value of - ShopItemList gets updated. - -2007-09-11 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/chat.cpp, tmw.cbp: Fixed admin commands. - -2007-09-08 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/particles/aniblaze.png, - data/graphics/particles/cookingfire.particle.xml, - data/graphics/particles/fireplace.particle.xml, - data/graphics/particles/flame.particle.xml: Improved fire effects by - using animated particles. - -2007-09-06 Philipp Sehmisch <tmw@crushnet.org> - - * src/animationparticle.cpp, src/imageparticle.cpp: Fixed animated - particles. - -2007-09-01 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/Makefile.am: Fixed the entry for windowlistener.h. - -2007-08-30 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/localplayer.cpp, src/player.cpp, src/main.cpp, src/being.cpp, - src/CMakeLists.txt, src/Makefile.am, src/resources/iteminfo.h, - src/resources/equipmentdb.h, src/resources/equipmentinfo.h, - src/resources/itemdb.cpp, src/resources/iteminfo.cpp, - src/resources/equipmentdb.cpp, src/resources/equipmentinfo.cpp, - src/resources/spritedef.h, src/being.h, data/items.xml, - data/equipment.xml: Merged equipment database with items database and - got rid of the unused item art attribute. - * src/net/beinghandler.cpp, src/net/charserverhandler.cpp: Removed the - now unnecessary multiplication of weapon IDs with 10000. - * src/resources/iteminfo.cpp, data/graphics/items/unknown.png: Added - fallback item icon and use it for unknown items or when item image - fails to load. - * NEWS: Updated with changes since last update. - * data/items.xml, data/equipment.xml: Reverted equipment database and - included original low-ID items in items.xml for compatibility with - eAthena, which doesn't support View ID to come above 255. - * src/resources/itemdb.cpp: Accept items without a name. - -2007-08-29 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/sell.cpp, src/gui/inventorywindow.cpp, src/gui/sell.h: Made - sell dialog resizable and tweaked inventory resize code a bit. - * data/items.xml: Fixed typo in chainmail description. - -2007-08-28 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/window.cpp, src/gui/inventorywindow.h, - src/gui/selectionlistener.h, src/gui/buy.h, - src/gui/itemshortcutwindow.cpp, src/gui/inventorywindow.cpp, - src/gui/buy.cpp, src/gui/window.h, src/gui/windowlistener.h, - src/gui/itemshortcutwindow.h, src/CMakeLists.txt, src/Makefile.am: - Made buy dialog resizable and added a WindowListener class for - listening for window resize and move events. - * src/textparticle.h, src/particle.h, src/CMakeLists.txt, - src/particle.cpp, src/imageparticle.cpp, src/vector.h, - src/textparticle.cpp, src/Makefile.am: Added Vector class and used it - in the particle engine. - -2007-08-27 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/engine.cpp, src/resources/mapreader.cpp: Made client search for - both compressed and non-compressed map files. - -2007-08-27 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp: Assigned unused emotions to Alt +/-. (applied a patch - by Quiche_on_a_leash). - * data/maps/new_1-1.tmx, data/maps/new_1-1.tmx.gz, - data/maps/new_10-1.tmx, data/maps/new_10-1.tmx.gz, - data/maps/new_11-1.tmx, data/maps/new_11-1.tmx.gz, - data/maps/new_12-1.tmx, data/maps/new_12-1.tmx.gz, - data/maps/new_13-1.tmx, data/maps/new_13-1.tmx.gz, - data/maps/new_14-1.tmx, data/maps/new_14-1.tmx.gz, - data/maps/new_15-1.tmx, data/maps/new_15-1.tmx.gz, - data/maps/new_16-1.tmx, data/maps/new_16-1.tmx.gz, - data/maps/new_17-1.tmx, data/maps/new_17-1.tmx.gz, - data/maps/new_18-1.tmx, data/maps/new_18-1.tmx.gz, - data/maps/new_19-1.tmx, data/maps/new_19-1.tmx.gz, - data/maps/new_2-1.tmx, data/maps/new_2-1.tmx.gz, - data/maps/new_20-1.tmx, data/maps/new_20-1.tmx.gz, - data/maps/new_3-1.tmx, data/maps/new_3-1.tmx.gz, - data/maps/new_4-1.tmx, data/maps/new_4-1.tmx.gz, - data/maps/new_5-1.tmx, data/maps/new_5-1.tmx.gz, - data/maps/new_6-1.tmx, data/maps/new_6-1.tmx.gz, - data/maps/new_7-1.tmx, data/maps/new_7-1.tmx.gz, - data/maps/new_8-1.tmx, data/maps/new_8-1.tmx.gz, - data/maps/new_9-1.tmx, data/maps/new_9-1.tmx.gz: Replaced compressed - maps with layer compressed maps. - -2007-08-26 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Removed home dir - from config file to avoid encoding issues. - -2007-08-26 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/gui/button.cpp: Fixed incorrect button dimensions, as they mess - OpenGL display with rectangle textures. - * src/graphics.cpp, src/openglgraphics.h, src/graphics.h, - src/openglgraphics.cpp: Fixed fonts not being recolored by adding an - explicit parameter to require it. - -2007-08-25 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * configure.ac: Removed dependency on Guichan's OpenGL library. - * src/Makefile.am, src/resources/sdlimageloader.cpp, - src/resources/sdlimageloader.h, src/resources/openglsdlimageloader.h, - src/resources/openglsdlimageloader.cpp, src/resources/imageloader.cpp, - src/resources/imageloader.h, src/gui/gui.cpp, src/gui/gui.h: Replaced - Guichan's image loaders with our owns, so that we have control over all - the images used as textures. - * src/resources/image.cpp, src/openglgraphics.h, src/resources/image.h, - src/openglgraphics.cpp, src/graphics.cpp, src/graphics.h: Added support - for rectangle OpenGL textures when available, in order to reduce video - memory usage. - -2007-08-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/gui.h, src/gui/gui.cpp: Removed useless logic method and - reverted mouse cursor to non-static since there can be only one Gui - instance so there is no point in supporting a shared resource. - * src/gui/window.cpp, src/gui/gui.h: Removed unnecessary - Gui::isCustomCursor method. - * src/gui/char_select.h, src/gui/char_select.cpp, src/utils/trim.h: - Added trimming of name for new character creation. - * src/net/chathandler.cpp: Added trimming of chat messages appearing - above players. - * src/gui/window.cpp, src/gui/window.h: Improved resize mouse cursor - indication, removing duplicated code and fixing indicator above resize - grip. - -2007-08-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/viewport.h, src/gui/viewport.cpp: Removed two useless popup - related methods. - * src/gui/debugwindow.h, src/gui/debugwindow.cpp: Use generic close - button functionality. - * src/particle.h, src/particleemitter.cpp, src/particle.cpp: Renamed - Particle::mVector to Particle::mVelocity for clarity. - * src/localplayer.cpp, src/gui/ministatus.cpp, src/gui/status.cpp, - src/being.cpp, src/net/charserverhandler.cpp, - src/net/playerhandler.cpp, src/localplayer.h, src/being.h: Changed XP - gaining effect to appear on the player instead. - * data/graphics/gui/hits_yellow.png: Restored shadow of yellow font. - -2007-08-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/itemshortcutcontainer.h: Fixed compiler warning. - * src/CMakeLists.txt, src/Makefile.am: Updated source lists. - * data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am: - Added close button and item shortcut backgrounds to files that will be - installed. - * src/gui/itemshortcutcontainer.cpp: Make sure mGridWidth and - mGridHeight are initialized properly (fixes arithmetic exception in - ItemShortcutContainer::draw). - * src/keyboardconfig.cpp: Changed default sitting key back to 's'. - * src/net/equipmenthandler.cpp: Removed a line that attempted to set - the player's weapon sprite with each kind of equipment. Seems to work - fine without as well. - * src/gui/chat.cpp, src/utils/trim.h, src/CMakeLists.txt, - src/Makefile.am: Added trimming of chat messages. - -2007-08-22 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/chest-lightplatemail-male.png, - data/graphics/sprites/chest-lightplatemail-female.png, - data/graphics/items/armor-chest-lightplatemail.png, - data/graphics/tiles/woodland_indoor_x2.png: Another color correction - at the light platemail (looks more metalic now) - * data/maps/new_18-1.tmx.gz, data/maps/new_19-1.tmx.gz, - data/images/minimap_new_18-1.png, data/images/minimap_new_19-1.png: - Removed a tree that prevented people from sitting on one of the - benches properly. Added correct minimap to woodland village and - surrounding. - -2007-08-22 Joshua Langley <joshlangley[at]optusnet.com.au> - - * data/graphics/gui/item_shortcut_bgr.png, src/game.cpp, - src/gui/gui.cpp, src/gui/itemcontainer.cpp, - src/gui/itemshortcutcontainer.cpp, src/gui/itemshortcutcontainer.h, - src/gui/itemshortcutwindow.cpp, src/gui/itemshortcutwindow.h, - src/gui/menuwindow.cpp, src/gui/setup_keyboard.cpp, src/gui/window.h, - src/itemshortcut.cpp, src/itemshortcut.h, src/keyboardconfig.cpp, - src/keyboardconfig.h, src/localplayer.cpp, src/localplayer.h, - src/main.cpp, src/net/inventoryhandler.cpp, src/utils/tostring.h, - tmw.cbp: Added item shortcut bar. - -2007-08-20 Joshua Langley <joshlangley[at]optusnet.com.au> - - * data/graphics/gui/mouse.png, src/gui/equipmentwindow.cpp, - src/gui/gui.cpp, src/gui/gui.h, src/gui/inventorywindow.cpp, - src/gui/setup.cpp, src/gui/skill.cpp, src/gui/skill.h, - src/gui/status.cpp, src/gui/window.cpp, src/gui/window.h, - data/graphics/gui/close_button.png: Added close button functionality, - resize cursor cues. - * data/graphics/gui/hits_yellow.png, src/being.cpp, src/being.h, - src/gui/gui.cpp, src/localplayer.cpp, src/localplayer.h, - src/net/charserverhandler.cpp, src/net/playerhandler.cpp, - src/particle.cpp, src/particle.h: Added monster killed xp notification - effect. - -2007-08-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/equipment.xml: Fixed typo in female light plate mail. - * NEWS: Updated with changes since 0.0.23. - -2007-08-19 Joshua Langley <joshlangley[at]optusnet.com.au> - - * src/keyboardconfig.cpp, src/keyboardconfig.h: Minor cleanup. - * src/gui/buy.cpp, src/gui/sell.cpp: Buy/sell fixed minimum quantity. - * src/gui/setup_keyboard.cpp, src/gui/setup_keyboard.h: Fixed bug - - reverts unassigned key. - -2007-08-17 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * tools/adler32.c: Added little program for calculating adler32 - checksums of files. - * src/gui/setup_keyboard.cpp: Fixed compile issue related to array - bound not being an integer constant. - -2007-08-15 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/npcs.png, data/graphics/sprites/npc.xml: - Added farmer NPC for woodland village. - -2007-08-14 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/popupmenu.cpp, src/gui/viewport.cpp, src/gui/viewport.h, - tmw.cbp: Fixed popup menu requiring one more click after being used. - -2007-08-09 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/chest-lightplatemail-male.png, - data/graphics/sprites/chest-lightplatemail-female.png, - data/graphics/items/armor-chest-lightplatemail.png, - data/graphics/tiles/woodland_indoor_x2.png: Gave the platemail - armor a blue tint. Looks less boring and makes recoloring through - hue shifting possible. - -2007-08-08 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/particles/cookingfire.particle.xml, - data/graphics/particles/fireplace.particle.xml, - data/maps/new_20-1.tmx.gz: Added particle effects and music to the - woodland village indoor map. - * data/maps/new_19-1.tmx.gz: Added overlay effect and music to - woodland village outdoor map. - * data/maps/new_18-1.tmx.gz: Fixed some collision map errors and added - music and overlay effect to the surrounding of the woodland village. - -2007-08-07 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/npcs.png: Added two new NPCs and gave some - of the older NPCs a makeover to look more like the style of the new - playerset. - * data/maps/new_20-1.tmx.gz: Corrected a few mapping errors in the - new woodland village. - * data/items.xml: Tweaked description and values of the scythe. - -2007-08-06 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/Makefile.am, src/utils/strprintf.h, src/utils/strprintf.cpp: - Added a helper function for printf-formatting a (gettext) C string - into a dynamically-sized C++ string. - -2007-08-05 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/woodland_indoor.png, - data/graphics/tiles/woodland_indoor_x2.png, - data/graphics/tiles/woodland_indoor_x3.png: Added woodland - village indoor tilesets. - * data/maps/new_20-1.tmx.gz: Added woodland village indoor map. - -2007-07-29 Björn Steinbrink <B.Steinbrink@gmx.de> - - * CMake/Modules/FindLibXml2.cmake, CMake/Modules/FindLibcurl.cmake, - src/CMakeLists.txt: Switch to upstream CMake modules for libxml2 and - curl. - -2007-07-27 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/resources/image.cpp: Added support for subimages of subimages. - * src/gui/equipmentwindow.cpp, src/gui/button.cpp, src/gui/slider.cpp, - src/gui/widgets/resizegrip.cpp, src/gui/widgets/dropdown.cpp, - src/gui/progressbar.cpp, src/gui/browserbox.cpp, src/gui/gui.cpp, - src/gui/radiobutton.cpp, src/gui/textfield.cpp, src/gui/playerbox.cpp, - src/gui/itemcontainer.cpp, src/gui/checkbox.cpp, src/gui/minimap.cpp, - src/gui/scrollarea.cpp, src/gui/popupmenu.cpp: Removed useless yet - costly dynamic casts. - -2007-07-25 Joshua Langley <joshlangley[at]optusnet.com.au> - - * src/gui/setup.cpp, src/gui/setup_keyboard.cpp, - src/gui/setup_keyboard.h, src/keyboardconfig.cpp, - src/keyboardconfig.h, src/main.cpp: Minor changes to keyboard config, - keyboard setup gui re-designed. - -2007-07-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/CMakeLists.txt, src/Makefile.am: Added setup_keyboard.* and - keyboardconfig.* to the list of source files. - * src/keyboardconfig.h: Fixed initialization order. - -2007-07-17 Joshua Langley <joshlangley[at]optusnet.com.au> - - * src/game.cpp: Only one key per function. - * src/main.cpp: Keyboard configuration included. - * src/gui/button.cpp, src/gui/button.h: Default constructor and - init function added. - * src/gui/setup.cpp: Keyboard setup tab added. - * src/gui/setup_keyboard.cpp, src/gui/setup_keyboard.h: Add to project - file, it is the keyboard setup tab. - * src/keyboardconfig.cpp, src/keyboardconfig.h: Add to project file, - the main keyboard config operations. - -2007-07-16 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/items.xml: Fixed description of silk headband. - -2007-07-11 Philipp Sehmisch <tmw@crushnet.org> - - * src/resources/monsterdb.cpp, src/resources/monsterinfo.cpp, - src/resources/monsterinfo.h, src/monster.cpp: Renamed SoundEvent - to MonsterSoundEvent. - * src/resources/equipmentdb.cpp, src/resources/equipmentinfo.cpp, - src/resources/equipmentinfo.h: EquipmentDB now holds the type of - attack animation and the sounds of weapons. - * src/being.cpp. src/being.h, src/localplayer.cpp, - src/net/beinghandler.cpp, src/net/charserverhandler.cpp, - src/net/equipmenthandler.cpp, src/player.cpp, src/player.h: The - type of weapon player characters are using is now set using - setVisibleEquipment() instead of setWeapon() or setWeaponById(). - * src/CMakeLists.txt, src/Makefile.AM, tmw.cbp, The Mana World.dev: - Updated project files and buildscripts. - * data/graphics/images/login-wallpaper.png: Replaced login wallpaper - with a new one by Irukard. - -2007-07-11 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/window.cpp: Fixed resizing windows by their resize grip. - -2007-07-07 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/gui.cpp, src/gui/chatinput.h, src/gui/chatinput.cpp, - INSTALL: Ported to Guichan 0.7.0. Unfortunately, since Guichan 0.6.x - didn't have a FocusListener, compatibility with older versions is - broken. - -2007-06-29 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particleemitter.cpp: Corrected some perspective - issues of the particle engine and fixed a crash caused by particles - with child emitters that have an image than isn't used elsewhere. - * data/maps/new-3-1.tmx.gz: Added a particle effect at the spawn point - in Tulimshar. - -2007-06-21 Philipp Sehmisch <tmw@crushnet.org> - - * data/monsters.xml, data/graphics/sprites/monster-logmonster.png, - data/graphics/sprites/monster-logmonster.xml: Added logmonster by - Enigmatik (Monster ID is 23). - * data/items.xml, data/equipment.xml, - data/graphics/items/armor-chest-lightplatemail.png, - data/graphics/sprites/chest-lightplatemail-male.xml, - data/graphics/sprites/chest-lightplatemail-male.png, - data/graphics/sprites/chest-lightplatemail-female.png, - data/graphics/sprites/chest-lightplatemail-female.xml: - Added light platemail (see entry in items.xml for proposed specs). - -2007-06-16 Guillaume Melquiond <guillaume.melquiond@gmail.com> - - * src/resources/image.cpp: Set GL texture index to zero when an image - uses the SDL backend. - -2007-06-13 Philipp Sehmisch <tmw@crushnet.org> - - * The Mana World.dev: Updated DevCpp project file. - -2007-06-13 Philipp Sehmisch <tmw@crushnet.org> - - * src/main.cpp: Added logging of version number. - -2007-06-12 David Athay <ko2fan@gmail.com> - - * src/net/playerhandler.cpp: Fixed bug with DEF_BONUS not updating - Mantis id: 0000087 - * data/icons/The Mana World.icns: Added Mac OSX icon. - -2007-06-11 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.h, src/being.cpp: Fixed a bug that prevented - being-controlled particles from being deleted (thanks to tuchs for - reporting). - -2007-06-06 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/items.xml: Fixed defense of silk headband. - -2007-06-04 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/maps/new_17-1.tmx.gz: Changed the minimap image of the - lamp snake cave to the correct one. - -2007-06-03 David Athay <ko2fan@gmail.com> - - * src/main.cpp, src/game.cpp: Fixed screenshot taking on OSX. - -2007-06-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/CMakeLists.txt, src/Makefile.am, docs/Makefile.am: Added some - files to be included with the release. - * src/utils/fastsqrt.h: Fixed warning about strict-aliasing rules. - * src/Makefile.am: Don't die on warnings by default. - * src/resources/image.cpp: Fixed image loading in software mode to not - check for alpha layer when images aren't 32-bit. - * src/graphics.cpp, src/graphics.h, src/imageparticle.cpp: Removed - drawImageTransparent from Graphics class, should be set on image. - * src/imageparticle.h, src/particleemitter.h, src/particle.h, - src/particleemitter.cpp, src/particle.cpp, src/imageparticle.cpp: Have - ParticleEmitter load a possible particle image early on and don't - cause a crash when the image can't be found. - -2007-06-02 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/winver.h, README, NEWS, CMakeLists.txt, configure.ac, - data/help/changes.txt, data/help/header.txt: Updated version and - release date and summarized changes. - * src/gui/chat.h, src/gui/chat.cpp: Changed color of chat messages in - OpenGL mode from orange to black. - * src/gui/sell.cpp, src/gui/buy.h, src/gui/buy.cpp, src/gui/sell.h: - Some cleanup of buy/sell dialog code. - -2007-06-01 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am: - Added target cursors to installed files. - -2007-05-31 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_16-1.tmx.gz: Fixed an inconsistency with the neighbor - map (no new walkmap required). - -2007-05-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/sell.cpp, src/gui/buy.cpp, src/being.cpp: A bunch of - lingering syntactical changes. - * src/gui/viewport.cpp: Added a missing include and fixed a bug with - cleaning up target cursor animations. - -2007-05-23 Philipp Sehmisch <tmw@crushnet.org> - - * src/gui/viewport.cpp, - data/graphics/gui/target-cursor-blue-s.png, - data/graphics/gui/target-cursor-blue-m.png, - data/graphics/gui/target-cursor-blue-l.png, - data/graphics/gui/target-cursor-red-s.png, - data/graphics/gui/target-cursor-red-m.png, - data/graphics/gui/target-cursor-red-l.png: Replaced target cursor - graphics with higher quality ones by Pauan. - * src/particle.cpp: Made bouncing particles immune against death by - ground contact and removed a nonsensical debugging log message. Made - text splash effects fade out. - * src/textparticle.cpp: Implemented fading in and out for text - particles. - * src/being.cpp, src/particle.cpp, src/particle.h, - src/textparticle.cpp, src/textparticle.h: The color values of text - particles are now stored in 3 integers instead of a Guichan color - structure. - -2007-05-20 Eugenio Favalli <elvenprogrammer@gmail.com> - - * tmw.cbp: Updated Code::Blocks project file. - -2007-05-20 Philipp Sehmisch <tmw@crushnet.org> - - * src/gui/buy.cpp, src/gui/sell.cpp: Unified some differences between - buy and sell dialog. Money label now shows money after transaction - instead of current money. - * src/gui/sell.cpp: Fixed the amount-not-reset-when-using-scrollwheel - bug. - * src/being.h, src/gui/viewport.cpp, src/gui/viewport.h: Added 3 - different target cursor sizes. - * src/monster.h, src/monster.cpp, src/resources/monsterdb.cpp, - scr/resources/monsterinfo.h, data/monsters.xml: Target cursor size for - monster is read from the monsters.xml. - * data/graphics/gui/target-cursor-blue-s.png, - data/graphics/gui/target-cursor-blue-m.png, - data/graphics/gui/target-cursor-blue-l.png, - data/graphics/gui/target-cursor-red-s.png, - data/graphics/gui/target-cursor-red-m.png, - data/graphics/gui/target-cursor-red-l.png: Added temporary - placeholders for small and large target cursors until better versions - based on the original SVG are available. - -2007-05-08 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/monster-bat.png, - data/graphics/sprites/monster-bat.xml, - data/graphics/sprites/monster-flower.xml, - data/graphics/sprites/monster-fluffy.xml, - data/graphics/sprites/monster-fluffy.png, - data/graphics/sprites/monster-goblin-fire.xml, - data/graphics/sprites/monster-maggot-giant.xml, - data/graphics/sprites/monster-maggot.xml, - data/graphics/sprites/monster-mountsnake.xml, - data/graphics/sprites/monster-mushroom-red.xml, - data/graphics/sprites/monster-mushroom-spiky.xml, - data/graphics/sprites/monster-pinkie.xml, - data/graphics/sprites/monster-scorpion-black.xml, - data/graphics/sprites/monster-scorpion-red.png, - data/graphics/sprites/monster-scorpion-red.xml, - data/graphics/sprites/monster-skull-poison.xml, - data/graphics/sprites/monster-slime-green.xml, - data/graphics/sprites/monster-slime-red.xml, - data/graphics/sprites/monster-slime-rudolph.xml, - data/graphics/sprites/monster-slime-santa.png, - data/graphics/sprites/monster-slime-santa.xml, - data/graphics/sprites/monster-slime-yellow.xml, - data/graphics/sprites/monster-snake-cave.png, - data/graphics/sprites/monster-snake-cave.xml, - data/graphics/sprites/monster-snake.xml, - data/graphics/sprites/monster-spider.xml: - Adjusted offsets of monster sprites (thanks to Pauan for finding out - the correct offsets - I just subtracted 6 of all x offsets to take the - new position of the target circle in account) and committed some - modifications at some monster graphics by Pauan. - -2007-05-02 Philipp Sehmisch <tmw@crushnet.org> - - * src/sprite.h, src/being.cpp, src/being.h, src/animatedsprite.cpp, - src/animatedsprite.h: Added methods to get the width and height of the - graphical representation of a sprite. - * src/gui/viewport.cpp: Fixed positioning of monster names and target - circles. - -2007-05-02 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp: Fixed a compiler warning. - -2007-05-02 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am: Add the new particle subclasses to the automake - configuration. - * src/imageparticle.h, src/textparticle.h, src/particle.h, - src/animationparticle.h, src/CMakeLists.txt, src/particleemitter.cpp, - src/animationparticle.cpp, src/particle.cpp, src/imageparticle.cpp, - src/textparticle.cpp, src/utils/xml.cpp, src/utils/xml.h: Split the - particle class into subclasses based on their appearance. - -2007-04-24 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h: Some minor code cleanups, speed - optimizations and a bit of documentation. - -2007-04-23 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/particles/flame.particle.xml, - data/graphics/particles/blaze.png: Added two files I forgot with the - last commit. - * src/resources/mapreader.cpp, src/particle.cpp, - src/particleemitter.cpp: Using XML child node iteration macro. - -2007-04-22 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/configuration.cpp, src/utils/xml.h, src/resources/mapreader.cpp, - src/resources/spritedef.cpp, src/resources/monsterdb.cpp, - src/resources/itemdb.cpp, src/resources/equipmentdb.cpp: Added a macro - for XML child node iterations to make the code more terse and easier - to read. - * src/resources/itemdb.cpp: Made the parameter checks more terse and - manageable. - -2007-04-19 Philipp Sehmisch <tmw@crushnet.org> - - * src/resources/mapreader.cpp: Emitter positions are now read from map - files. - * src/engine.cpp: Removed the player follow effect used for testing. - * data/maps/new_4-1.tmx.gz, data/maps/new_5-1.tmx.gz: Added flame - effect to all lamps on the cave maps - * data/maps/new_9-1.tmx.gz: Added waterfall effect to the upper right - corner of NW woodland map. - -2007-04-15 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/openglgraphics.cpp: Rely on default 0 value for z axis. - * src/CMakeLists.txt, src/gui/window.cpp, src/gui/widgets, - src/gui/widgets/resizegrip.cpp, src/gui/widgets/resizegrip.h, - src/gui/inventorywindow.cpp, src/gui/window.h, src/Makefile.am: - Reimplemented window resizing. It is now once again possible to resize - windows using their borders (except for the top one, since that's the - title bar for Guichan) and the resize grip in the bottom right is much - easier to grab. - * src/gui/window.cpp: Increased minimum window height and fixed a - problem with setting window content size which was introduced with the - new resize grip. - -2007-04-13 Björn Steinbrink <B.Steinbrink@gmx.de> - - * data/graphics/gui/CMakeLists.txt: Added target cursor graphics to - the set of files to be installed. - -2007-03-25 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Improved programming style and documentation - and added some small tweaks. - * src/engine.cpp, src/map.cpp, src/map.h, src/resources/mapreader.cpp: - Prepared getting the emitter positions from the map file by storing - them in the Map class and setting them up from the MapReader. - -2007-03-22 Philipp Sehmisch <tmw@crushnet.org> - - * src/simpleanimation.cpp, src/simpleanimation.h: Added new - constructor for simple animation that allows to build the animation - based on an xmlNodePtr pointing to an <animation> node. - * src/particle.cpp, src/particle.h: Added support for <image> and - <animation> childtags for effect root particles. - * data/graphics/particles/playerglow.particle.xml: New player follow - effect that demonstrates an animated root particle with an emitter. - -2007-04-05 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/main.cpp: Unified storage of configuration, updates and - screenshots in home directory. - -2007-04-03 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/items/generic-easteregg-blue.png, - data/graphics/items/generic-easteregg-green.png, - data/graphics/items/generic-easteregg-pink.png, - data/graphics/items/generic-easteregg-red.png, - data/graphics/items/generic-easteregg-teal.png, - data/graphics/items/generic-easteregg-yellow.png, - data/items.xml: Added six different easter egg item graphics for the - easter event. Item IDs are 1208 - 1213. - * data/graphics/sprites/npcs.png: Added bunny girl npc for the easter - event. - -2007-04-01 Philipp Sehmisch <tmw@crushnet.org> - - * src/game.cpp: Screenshots are no longer saved directly in the users - home directory on UNIX systems but in the sub folder /.tmw/. A chatlog - message about the success of the screenshot saving does appear now. - Based on a patch by Patrick "the-me" Matthäi. - -2007-03-27 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/main.cpp: Icon loading doesn't necessarily succeed, so better - not crash when it doesn't. - -2007-03-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/main.cpp: Changed the order of network message handling and - logic, in order to prevent an incoming character delete message from - deleting the player character that was about to be drawn. - * src/gui/char_select.cpp: Removed useless lock/unlock calls. - * src/logindata.h, src/main.cpp, src/gui/login.cpp: Go back to login - or register state on error, depending on what the user was doing. - * src/gui/register.cpp: Actually use the server that is filled in. - * src/net/loginhandler.cpp: Fixed error message. - * src/net/charserverhandler.cpp: Fixed crash since now logic is called - after non-selected characters are deleted, by properly setting deleted - instances to 0 and going back to initial selection. - * src/main.cpp, src/net/network.h, src/net/network.cpp: Make sure that - when a network error occurs, the error message is available and shown - to the user. - * src/gui/register.h, src/gui/register.cpp: Only enable Register - button when all necessary fields are filled in. - -2007-03-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/char_select.cpp, src/gui/char_select.h, - src/net/charserverhandler.h, src/net/charserverhandler.cpp: Clarified - the error message when character creation fails and made sure the - character creation dialog doesn't close when creation failed. - -2007-03-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/login.cpp, src/gui/login.h, src/gui/register.h, - src/gui/register.cpp: Only enable login button when a username, - password and server are filled in. Pass username, password and server - on to the register dialog. Go back to login dialog when canceling - registration. Fixed a crash caused by deleting an OkDialog twice (it - also deletes itself). Made the register dialog a bit wider. Register - dialog no longer clears username field when it is invalid. - * src/main.cpp, data/icons/CMakeLists.txt, data/icons/Makefile.am, - data/icons/tmw-32x32.png: Use a 32x32 non-alpha layered window icon. - * tmw.cbp: Updated project file. - * data/icons/CMakeLists.txt, data/icons/Makefile.am, src/main.cpp, - data/icons/tmw-32x32.png: Removed 32x32 non-alpha layered window icon - again, and instead used the icon in the executable on Windows. - -2007-03-21 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/main.cpp, src/gui/viewport.cpp, src/resources/image.h, - src/resources/image.cpp: Reduced amount of useless logging, calculate - nearest power of two in a function and only do the alpha check in - software mode. - * src/gui/login.cpp: Fixed small issue where default server didn't fit - in the server entry field properly. - * src/main.cpp: Display a progress bar and connecting status for each - server and display the version using a gcn::Label. - * src/gui/viewport.cpp, src/monster.h: Avoiding magic numbers where - possible (1002) and also display the target when other players are - targeted. - * src/floor_item.cpp, src/being.cpp, src/main.cpp, src/CMakeLists.txt, - src/gui/equipmentwindow.cpp, src/gui/viewport.cpp, - src/gui/itemcontainer.cpp, src/gui/viewport.h, src/engine.cpp, - src/animatedsprite.cpp, src/tileset.h, src/npc.cpp, src/Makefile.am, - src/being.h, src/resources/imageset.cpp, src/resources/animation.h, - src/resources/spritedef.cpp, src/resources/resourcemanager.h, - src/resources/spriteset.h, src/resources/imageset.h, - src/resources/resourcemanager.cpp, src/resources/spriteset.cpp, - src/resources/spritedef.h: Renamed Spriteset to ImageSet. - -2007-03-20 Philipp Sehmisch <tmw@crushnet.org> - - * src/gui/updatewindow.cpp: Cancel button is now disabled after - downloading is finished. - -2007-03-20 David Athay <ko2fan@gmail.com> - - * src/gui/viewport.cpp: Fixed target cursor animation, and changed - which layer it is drawn after. - * src/gui/viewport.cpp, src/gui/viewport.h: Split drawing the target - cursor and target name into functions. - -2007-03-20 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/gui/mouse.png: Positioned the cursor image more - accurate. - -2007-03-19 David Athay <ko2fan@gmail.com> - - * src/localplayer.cpp, src/gui/viewport.cpp, src/gui/viewport.h, - src/net/equipmenthandler.cpp, src/localplayer.h, - src/net/protocol.h: Added target cursor. - -2007-03-18 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * docs/Makefile.am, docs/tmw.6: Added man page by Patrick Matthäi. - * src/resources/image.cpp: Restored alpha layer check, since it should - be more efficient in software mode when SDL knows an image doesn't use - the alpha layer. - * data/graphics/gui/thickborder.png, - data/graphics/gui/vscroll_grey.png, data/graphics/gui/slider.png, - data/graphics/gui/vscroll_blue.png, data/graphics/gui/vscroll_red.png, - data/graphics/gui/deepbox.png, - data/graphics/sprites/monster-slime-red.png, - data/graphics/sprites/monster-scorpion-black.png, - data/graphics/sprites/monster-scorpion.png, - data/graphics/sprites/monster-slime-rudolph.png, - data/graphics/sprites/monster-snake.png, - data/graphics/sprites/monster-slime-santa.png, - data/graphics/sprites/monster-maggot.png, - data/graphics/sprites/monster-spider.png, - data/graphics/sprites/monster-scorpion-red.png, - data/graphics/sprites/monster-slime-yellow.png, - data/graphics/sprites/monster-slime-green.png, - data/graphics/sprites/monster-maggot-giant.png: Replaced pink pixels - with transparent ones. - -2007-03-18 Rogier Polak <rogier.l.a.polak@gmail.com> - - * src/main.cpp: Added (-v) version to the arguments. (Applied a patch - by Patrick Matthäi). - * src/resources/image.cpp: Deleted the "pink code", which added - transparancy with SDL_SetColorKey. - -2007-03-18 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * icons/tmw.ico, icons/tmw.png, icons/tmw.xpm: Replaced icons with the - green globe that is also used on the website. - -2007-03-14 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/main.cpp, src/tmw.rc, data/icons/tmw-icon.png, - data/icons/tmw-icon.xpm, data/icons/tmw.ico, data/icons/tmw-icon.ico, - data/icons/Makefile.am, data/icons/tmw.png, data/icons/tmw.xpm, - data/icons/CMakeLists.txt: Renamed icons to make things easier for - Debian packaging, and the "-icon" part was superfluous anyway. - -2007-03-12 Philipp Sehmisch <tmw@crushnet.org> - - * src/simpleanimation.cpp, src/simpleanimation.h, src/CmakeLists.txt, - src/Makefile.am: Added a simple animation class that hosts a looping - animation without the action and direction stuff from AnimatedSprite. - * src/particle.cpp, src/particle.h, src/particleemitter.cpp: Used said - simple animation class for animated particles. - -2007-03-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/items/armor-head-rangerhat.png: New version of ranger - hat icon by Pauan. - -2007-03-11 Philipp Sehmisch <tmw@crushnet.org> - - * src/map.cpp, src/gui/viewport.cpp: Fixed a bug that made the engine - not draw the last row and column of the map. - -2007-03-09 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp: Reimplemented physics mode that uses the default - square root function as fallback for systems where the fastInvSqrt - function doesn't work properly. - * src/particle.cpp, src/particle.h: Some performance optimizations - suggested by Rogier "Avaniel" Polak. - -2007-03-09 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/gui/target-cursor-blue.png, - data/graphics/gui/target-cursor-red.png: Added targeting cursors by - Pauan. - * data/graphics/sprites/chest-cotton-male.png, - data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt - with improved version by Pauan. - -2007-02-27 Philipp Sehmisch <tmw@crushnet.org> - - * gui/button.cpp, src/guibutton.h, - src/gui/tabbedcontainer.cpp, src/gui/tabbedcontainer.h:: Tabbed - containers now display the button of the active tab pressed all - the time. - -2007-02-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac: Made OpenGL enabled by default. - -2007-02-26 Philipp Sehmisch <tmw@crushnet.org> - - * data/sfx/maggot-dying1.ogg, data/sfx/maggot-hit1.ogg, - data/sfx/maggot-hit2.ogg, data/sfx/maggot-miss1.ogg, - data/sfx/pinkie-hit1.ogg, data/sfx/pinkie-miss1.ogg, - data/monsters.xml: New sound effects by Cosmostrator. - -2007-02-25 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.h, src/particleemitter.h: Just some documentation work. - -2007-02-22 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Added new particle property "bounce" that makes - particles bounce off the ground and use it with the damage numbers. - - -2007-02-21 Philipp Sehmisch <tmw@crushnet.org> - - * src/gui/char-server.cpp, src/gui/updatewindow.cpp, src/gui/main.cpp, - src/gui/main.h: Added a new state "LOADDATA_STATE" that loads the XML - databases. - * src/resourcemanager.cpp, src/resourcemanager.h, src/main.cpp, - customdata/: Added a customdata dir that allows to add custom user - data easily. Just create a zip file with the same structure like the - update archives and drop it in the customdata folder and the files in - it override the default data and the updates. - -2007-02-15 Philipp Sehmisch <tmw@crushnet.org> - - * src/engine.cpp: The name conflict problem with Guichan seems to be - solved with version 0.6.1. - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Added support for animated particles. - * data/graphics/particles/playerglow.particle.xml: Created a new - player follow particle that spawns a swarm of animated bats that - follow the player. - -2007-02-09 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp: Fixed a misspelled include and another - optimisation at the vector calculation. - -2007-02-08 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/utils/fastsqrt.h: Added a faster function to - calculate square roots and using it for hypotenuse calculations. - Thanks to Rogier aka Avaniel for finding the function. - -2007-02-07 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp: Renamed - Particle::MAX_PARTICLES to Particle::maxCount and read the value from - config ("particleMaxCount") - * src/particle.cpp: Added fast physics mode that replaces the - trigonometric calculations made for calculating the acceleration by - much less cpu intense but also less accurate formulas. To enable it - set the config option "particleFastPhysics" to "1". - * src/particle.cpp: Added the config option "particleEmitterSkip" that - allows to reduces the output of the emitters by making them spawn - particles only every n-th game tick. - * src/graphics.cpp, src/graphics.h: Added a new method - "drawImageTransparent" to the graphic engine that blits an image with - an alpha factor. - * src/particle.cpp: Using new drawImageTransparent method. - -2007-02-01 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Implemented die-distance (particles are deleted - when they reached a certain proximity to their target) - * src/particle.cpp: Fixed a bug in the acceleration vector calculation. - * src/particle.cpp, src/particle.h: Fixed a problem with particles with - unlimited lifetime and fade-in. - * data/graphics/particles/playerglow.particle.xml: And again a new - player follow particle. This time it demonstrates die-distance and the - fixed acceleration vector calculation. - * src/engine.cpp, data/graphics/particles/snow.particle.xml, - data/graphics/particles/snowflake.png: I can't stand the begging - anymore. Now it snows in the snow area... and the forest... and the - desert... and under the earth... and indoors... Are you happy now, - Rotonen and Elven? ;-) - * src/particle.cpp: Removed some debug log messages. - * src/being.cpp: Avoided crash when attempting to control an invalid - particle. - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Cleaned the includes up. - -2007-01-31 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Changed some variable names. - * data/graphics/particles/waterfall.particle.xml, - data/graphics/particles/waterfall-a.png: New waterfall with Modanungs - waterfall particle. - * src/particle.cpp: forgot to remove a svn conflict marker and changed - the order of initialisations to fix some compiler warnings. - -2007-01-30 Eugenio Favalli <elvenprogrammer@gmail.com> - - * tmw.cbp: Updated Code::blocks project file. - -2007-01-30 Philipp Sehmisch <tmw@crushnet.org> - - * src/net/beinghandler.cpp, - data/graphics/particles/skillup.particle.xml: Added different particle - effect for job levelup. - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Renamed "alphafade" to "fade-out", added new - property "fade-in". - * data/graphics/particles/playerglow.particle.xml: Added a new player - effect (a fire) demonstrating how to use fade-in and fade-out to fade - one color into another. - -2007-01-29 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Added a new particle property "alphafade" that - makes the particles fade into alpha before their lifetime ends. - * src/particle.cpp, src/particle.h: fixed an issue with particles that - have a lifetime of 0 and an issue with the momentum property. - * data/graphics/particles/waterfall.particle.xml, - data/graphics/particles/fog-medium-white-a.png, - data/graphics/particles/fog-medium-white-b.png, - data/graphics/particles/fog-medium-white-c.png: Added fog to the - waterfall effect demonstrating the new alphafade feature. - -2007-01-28 Philipp Sehmisch <tmw@crushnet.org> - - * src/utils/xml.cpp, src/utils/xml.h, src/particleemitter.cpp: Most - values are now read as floating point values from the emitter files. - * data/graphics/particles/fountain.particle.xml, - data/graphics/particles/hit.particle.xml, - data/graphics/particles/playerglow.particle.xml: Changed some values - as floating point values. Made the player follow effect magenta to - improve the visibility of the hit effects. - * src/engine.cpp, data/graphics/particles/waterfall.particle.xml: - Removed the fountain and added a waterfall instead. - * src/particle.h: Corrected the drawing order of the particles in - relation to the other sprites. - * src/gui/debugwindow.cpp, src/gui/debugwindow.h: Added particle count - to debug window. - * src/particle.cpp: Allowed momentum without acceleration and - implement the acceleration properly. - * src/utils/minmax.h, src/particleemitter.cpp, src/particleemitter.h: - Added a structure to hold a pair of numeric minimum and maximum values - and used it to store all numeric emitter properties. - * src/utils/randbetween.h: Removed (the functionality is now in struct - MinMax) - -2007-01-27 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/shoplistbox.cpp: Fixed compilation against Guichan 0.6.1. - * src/utils/randbetween.h: Fixed integer overflow causing the - randBetween function not to work properly on Linux. - -2007-01-27 Philipp Sehmisch <tmw@crushnet.org> - - * src/net/beinghandler.cpp: Fixed a compiler issue. - -2007-01-27 Philipp Sehmisch <tmw@crushnet.org> - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h, src/engine.cpp: Emitter data is read from - external xml files. Reimplemented target-based particles with the - difference that they don't target beings or locations but other - particles (at the moment the host particle of the effect). - * src/being.cpp: Beings now move controlled particles to their center - instead of their upper left corner. - * data/graphics/particles/orb*: Added a bunch of new particles. - * data/graphics/particles/fountain.particle.xml: Reimplementation of - the fountain effect in XML. - * data/graphics/particles/playerglow.particle.xml: New effect that - spawns orbs that orbit around the origin. - * src/being.cpp, data/graphics/particles/hit.particle.xml: Added - particle effect on hit. - * src/net/beinghandler.cpp, - data/graphics/particles/levelup.particle.xml: Added particle effect on - levelup (own or other player). - -2007-01-24 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp: Initialized all variables of the particles in the - constructor. - * src/particleemitter.cpp, src/particleemitter.h: minor cleanups. - -2007-01-22 Philipp Sehmisch <tmw@crushnet.org> - - * src/being.cpp, src/being.h, src/particle.cpp, src/particle.h - src/particleemitter.cpp, src/particleemitter.h, src/engine.cpp: - Particle effects are now created in child particles of the root - particle. Particle emitters have no longer a being they check every - frame. Instead beings have the ability to take control of particles. - -2007-01-19 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h, src/particleemitter.cpp, - src/particleemitter.h: Implemented emitters that follow a being. - * src/engine.cpp: Added an emitter that follows the local player. - * src/particle.cpp: Fixed the crash on exit (reason was that the - mSpriteIterator wasn't initialized in every case) - -2007-01-18 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/particle.h, src/particle.cpp, src/CMakeLists.txt, - src/Makefile.am: Fixed compilation issues on Linux. - -2007-01-15 Philipp Sehmisch <tmw@crushnet.org> - - * src/game.cpp, src/particle.cpp, src/particle.h, - src/particleemitter.h: Made the particle count global and more - performant. - -2007-01-14 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/main.cpp, src/gui/trade.cpp, src/gui/sell.cpp, - src/gui/connection.cpp, src/gui/buddywindow.cpp, src/gui/browserbox.h, - src/gui/char_server.cpp, src/gui/window.cpp, src/gui/login.cpp, - src/gui/inttextbox.h, src/gui/viewport.cpp, src/gui/button.h, - src/gui/shoplistbox.h, src/gui/skill.h, src/gui/item_amount.h, - src/gui/setup_audio.h, src/gui/newskill.cpp, src/gui/listbox.h, - src/gui/register.h, src/gui/setup.cpp, src/gui/npclistdialog.h, - src/gui/updatewindow.cpp, src/gui/button.cpp, src/gui/char_select.cpp, - src/gui/login.h, src/gui/setup_audio.cpp, src/gui/item_amount.cpp, - src/gui/setup_joystick.h, src/gui/chat.h, src/gui/npc_text.cpp, - src/gui/setup_video.cpp, src/gui/ok_dialog.cpp, - src/gui/inventorywindow.h, src/gui/gccontainer.cpp, - src/gui/newskill.h, src/gui/buy.h, src/gui/setup.h, - src/gui/itemcontainer.h, src/gui/confirm_dialog.cpp, - src/gui/debugwindow.cpp, src/gui/chat.cpp, src/gui/setup_joystick.cpp, - src/gui/updatewindow.h, src/gui/char_select.h, src/gui/buysell.h, - src/gui/tabbedcontainer.cpp, src/gui/inventorywindow.cpp, - src/gui/help.cpp, src/gui/status.h, src/gui/npc_text.h, - src/gui/setup_video.h, src/gui/menuwindow.cpp, src/gui/browserbox.cpp, - src/gui/ok_dialog.h, src/gui/buy.cpp, src/gui/itemcontainer.cpp, - src/gui/gccontainer.h, src/gui/buddywindow.h, src/gui/sell.h, - src/gui/trade.h, src/gui/inttextbox.cpp, src/gui/char_server.h, - src/gui/window.h, src/gui/shoplistbox.cpp, src/gui/skill.cpp, - src/gui/buysell.cpp, src/gui/confirm_dialog.h, src/gui/debugwindow.h, - src/gui/status.cpp, src/gui/listbox.cpp, src/gui/register.cpp, - src/gui/viewport.h, src/gui/tabbedcontainer.h, - src/gui/npclistdialog.cpp, src/gui/help.h, src/gui/chatinput.h, - src/gui/chatinput.cpp, src/net/tradehandler.cpp, - src/net/playerhandler.cpp: Upgraded to Guichan 0.6.0 (merge from - guichan-0.6.0 branch). - * src/winver.h, configure.ac, data/help/header.txt, NEWS, README, - CMakeLists.txt: Updated version to 0.0.22.1. - -2007-01-14 Philipp Sehmisch <tmw@crushnet.org> - - * src/particle.cpp, src/particle.h; src/particleemitter.cpp, - src/particleemitter.h, src/utils/randbetween.h: - Implemented particle engine. - * src/engine.cpp, src/game.cpp: added calls to the particle engine - * data/graphics/particles/*: added a bunch of particle graphics for - testing purpose. - * particleengine-todo.txt: Added particle engine todo list (please - omit when merging) - -2007-01-13 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/sprites/Makefile.am, - data/graphics/sprites/CMakeLists.txt: Updated with regard to renaming - of cotton equipment. - -2006-01-13 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/debugwindow.cpp, src/gui/viewport.h: Fixed mouse coordinates - display in debug window. - -2007-01-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/viewport.cpp: Fixed initialization of mPlayerFollowMouse, - the lack of which sometimes caused the player to start walking when - clicking on the GUI. - -2007-01-09 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/icecave.png: Added new tiles and fixes by Nickman and - made some other cosmetical corrections. - -2007-01-07 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/sprites/monster-mountsnake.xml, - data/graphics/sprites/monster-mountsnake.png, data/monsters.xml: Added - brown snake by Pauan. - -2007-01-07 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/chest-cottonshirt-male.png, - data/graphics/chest-cottonshirt-male.xml, - data/graphics/chest-cottonshirt-female.png, - data/graphics/chest-cottonshirt-female.xml, - data/graphics/item001.png, data/equipment.xml: Added female - cottonshirt sprites. - * data/equipment.xml: Fixed some wrong armor values. - -2007-01-05 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/CMakeLists.txt, data/graphics/images/ambient/Makefile.am, - data/graphics/sprites/CMakeLists.txt: Synchronized build files. - -2006-12-12 Eugenio Favalli <elvenprogrammer@gmail.com> - - * tools/Purger.java: Removed purger tool. - -2006-12-25 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/tiles/christmastree.png, data/maps/new_11-1.tmx.gz: - Added Christmas tree by Pauan. - * data/graphics/sprites/head-christmastree.xml: Fixed name of image. - * src/resources/spriteset.cpp: Fixed index check to prevent crashing. - * data/graphics/sprites/head-christmastreehat.png, - data/graphics/sprites/head-rangerhat.png, - data/graphics/sprites/head-christmastree.xml, - data/graphics/sprites/head-antlerhat.xml, - data/graphics/sprites/head-santabeardhat.xml, - data/graphics/sprites/head-santabeardhat.png, - data/graphics/sprites/head-rangerhat.xml: Updates to Pauan's recent - sprites by Pauan. - * data/items.xml: Fixes to descriptions and weights by Pauan. - -2006-12-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/shoplistbox.cpp: Don't try to draw an icon when it is not - defined or failed to load properly. - * src/resources/image.cpp: Major rendering performance increase in - software mode, by not using RLE compression on loaded images while - most of the time, we're only drawing a small subimage of them. - * README, data/help/header.txt, NEWS: Filled in release dates. - -2006-12-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac, data/graphics/items/Makefile.am, - data/graphics/items/CMakeLists.txt, data/graphics/images/Makefile.am, - data/graphics/images/CMakeLists.txt, - data/graphics/sprites/Makefile.am, - data/graphics/sprites/CMakeLists.txt, data/graphics/Makefile.am, - data/graphics/CMakeLists.txt, data/maps/Makefile.am, - data/maps/CMakeLists.txt, data/sfx/Makefile.am, - data/sfx/CMakeLists.txt, data/Makefile.am, data/CMakeLists.txt: - Removed database files, minimaps, items, monster sprites, maps and - sounds from the release. They will be released dynamically only. - * data/graphics/tiles/snow_x3.png: Added bottom of Christmas tree by - pauan. - * src/main.cpp, src/resources/itemdb.h, src/resources/monsterdb.cpp, - src/resources/itemdb.cpp, src/resources/equipmentdb.cpp: Load the - databases at the start of the LOGIN state, after the updates are - loaded. - -2006-12-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/items/armor-head-rangerhat.png, - data/graphics/items/generic-redstocking.png, - data/graphics/items/armor-head-christmastree.png, - data/graphics/items/armor-head-antlerhat.png, - data/graphics/items/armor-head-santabeardhat.png, - data/graphics/sprites/head-christmastreehat.png, - data/graphics/sprites/head-rangerhat.png, - data/graphics/sprites/head-christmastree.xml, - data/graphics/sprites/head-antlerhat.xml, - data/graphics/sprites/head-santabeardhat.xml, - data/graphics/sprites/head-antlerhat.png, - data/graphics/sprites/head-santabeardhat.png, - data/graphics/sprites/head-rangerhat.xml, data/items.xml, - data/equipment.xml, data/monsters.xml: Added new Christmas themed - headwear by Pauan. - * data/graphics/items/Makefile.am, data/graphics/items/CMakeLists.txt, - data/graphics/sprites/Makefile.am, - data/graphics/sprites/CMakeLists.txt, data/Makefile.am, - data/CMakeLists.txt: Updated Makefiles. - -2006-12-21 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac, CMakeLists.txt, README, data/help/header.txt: Updated - version to 0.0.22. - -2006-12-18 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/items/armor-chest-vnecksweater.png: New version of - the inventory icon for the V-neck sweater by Saphy. - -2006-12-17 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/sell.cpp, src/gui/shoplistbox.h, src/gui/listbox.h, - src/gui/shop.cpp, src/gui/buy.cpp, src/gui/shoplistbox.cpp, - src/gui/listbox.cpp: Subclassed ShopListBox from ListBox to get rid of - some duplicated code, and fixed a problem with scrolling to the - current selection. Also aligned the text a bit better and put the - price in parenthesis. - -2006-12-16 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/connection.cpp, src/gui/chargedialog.cpp: Fixed dialog - visibility. - * src/localplayer.cpp, src/game.cpp, src/localplayer.h: Fixed issues - with walking one tile too many and changing direction towards an - obstacle. - -2006-12-15 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/desert1.png: Removed some unused legacy tiles and - added variant tiles for the cliffs. - -2006-12-14 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/engine.h, src/engine.cpp: Removed the rather - useless remaining draw function from the engine class. - * src/being.cpp, src/being.h: Fixed an issue with fading out damage - texts (they were sometimes fully opaque at the end of fading out). - -2006-12-12 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, tmw.cbp: Updated project files. - * src/gui/updatewindow.cpp, src/gui/updatewindow.h, src/main.cpp: - Added Adler32 checksum for updates. - * src/net/playerhandler.cpp: Fixed crash when selecting an item after - death. - * data/items.xml: Fixed defense values for sweaters. - * src/net/playerhandler.cpp: Hide all NPC dialogs after death. - -2006-12-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/animatedsprite.h, src/CMakeLists.txt, src/animatedsprite.cpp, - src/resources/action.h, src/resources/animation.h, - src/resources/spritedef.cpp, src/resources/action.cpp, - src/resources/animation.cpp, src/resources/spritedef.h: Moved - Action, Animation and Frame (renamed from AnimationPhase) classes into - the resources directory, since they are part of the SpriteDef class. - * src/CMakeLists.txt, src/utils/base64.cpp, src/utils/base64.h, - src/Makefile.am, src/resources/mapreader.cpp: Moved base64 module into - utils directory. - * src/engine.cpp, src/npc.cpp: Cleaned up some unused stuff. - -2006-12-12 Philipp Sehmisch <tmw@crushnet.org> - - * data/sfx/bat-dying1.ogg, data/sfx/bat-hit1.ogg, - data/sfx/bow_shoot_1.ogg, data/sfx/fire-goblin-hit1.ogg - data/sfx/fire-goblin-hit2.ogg, data/sfx/fire-goblin-miss1.ogg, - data/sfx/fist-swish.ogg, data/sfx/flower-hit1.ogg, - data/sfx/flower-hit2.ogg, data/sfx/flower-miss1.ogg, - data/sfx/fluffy-hit1.ogg, data/sfx/fluffy-hit2.ogg, - data/sfx/fluffy-hit3.ogg, data/sfx/fluffy-hurt1.ogg, - data/sfx/fluffy-miss1.ogg, data/sfx/knife-hit1.ogg, - data/sfx/knife-miss1.ogg, data/sfx/levelup.ogg - data/sfx/scorpion-hit1.ogg, data/sfx/scorpion-hit2.ogg - data/sfx/scorpion-hit3.ogg, data/sfx/scorpion-hit4.ogg - data/sfx/scorpion-miss1.ogg, data/sfx/short-sword-hit1.ogg - data/sfx/short-sword-miss1.ogg, data/sfx/shroom-hit1.ogg - data/sfx/slime-hit1.ogg: - Normalized versions of sound effects by Cosmostrator. - -2006-12-11 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/updatewindow.cpp: Fixed visibility of the update window. - -2006-12-11 Philipp Sehmisch <tmw@crushnet.org> - - * data/equipment.xml, data/items.xml, - data/graphics/sprites/chest-tnecksweater-male.png, - data/graphics/sprites/chest-tnecksweater-female.png, - data/graphics/sprites/chest-vnecksweater-male.png, - data/graphics/sprites/chest-vnecksweater-female.png, - data/graphics/sprites/chest-tnecksweater-male.xml, - data/graphics/sprites/chest-tnecksweater-female.xml, - data/graphics/sprites/chest-vnecksweater-male.xml, - data/graphics/sprites/chest-vnecksweater-female.xml, - data/graphics/sprites/Makefile.AM, - data/graphics/sprites/CMakeLists.txt, - data/graphics/items/armor-chest-vnecksweater.png, - data/graphics/items/armor-chest-tnecksweater.png, - data/graphics/items/armor-chest-woolsweater.png, - data/graphics/items/Makefile.AM, data/graphics/items/CMakeLists.txt: - Added new sweaters by Saphy. Info for server admins: Item IDs are 564 - for turtleneck (should already be in there) and 624 for v-neck. The - visible sprite IDs are 19 for turtleneck and 20 for v-neck. - -2006-12-11 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/main.h, src/tmw.rc, src/winver.h, The Mana World.dev, tmw.cbp: - Fixed windows binary version. - -2006-12-10 Eugenio Favalli <elvenprogrammer@gmail.com> - - * docs/INSTALL/win32.txt: Added more detailed instructions for Dev-C++ - users. - -2006-12-09 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/npcs.png: Added pirate NPC. - -2006-12-09 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/sprite.h, src/gui/playerbox.h, src/gui/char_select.cpp, - src/gui/playerbox.cpp, src/gui/passwordfield.h, src/gui/char_select.h, - src/main.cpp, src/being.cpp, src/player.h, src/floor_item.h, - src/being.h: Use new animation system in character selection/creation. - Shows equipment and allowed for some cleanup. Had a bit of help from - the patch by VictorSan. - -2006-12-08 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/base64.cpp, src/base64.h, src/resources/mapreader.cpp: - Downgraded to base64 codec from PHP 3 to resolve licensing issues. - -2006-12-06 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, tmw.cbp: Updated project files. - -2006-12-06 Philipp Sehmisch <tmw@crushnet.org> - - * src/net/beinghandler.cpp: Fixed crashs when changing equipment. - * data/graphics/tiles/desert1.png, data/graphics/tiles/desert2.png: - More tiling related fixes at the cliffs. - -2006-12-06 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/item_amount.cpp: Fixed visibility of item amount window. - -2006-12-05 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/desert1.png: Improved the tiling behavior - of the cliffs (still not gridless but at least the edges fit - together in the most common situations) - -2006-12-04 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/engine.h, src/gui/windowcontainer.h, - src/gui/viewport.cpp, src/gui/gui.cpp, src/gui/gui.h, - src/gui/debugwindow.cpp, src/gui/inventorywindow.cpp, - src/gui/viewport.h, src/engine.cpp, src/CMakeLists.txt, - src/Makefile.am: Introduced a new class Viewport which combines the - drawing code from Engine with the (rather misplaced) input handling - from the Gui class. Also, it's a Container itself which should allow - for extending it to show Guichan widgets on map coordinates. - -2006-12-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/sound.cpp, src/monster.cpp, src/sound.h, - src/resources/soundeffect.cpp, src/resources/resourcemanager.cpp: - Don't try to play empty strings as sounds, and don't return a - SoundEffect instance when Mix_Chunk loading failed. - * src/beingmanager.cpp, src/npc.cpp, src/npc.h: Show NPC names. - * src/game.cpp, src/gui/char_server.cpp, src/gui/window.cpp, - src/gui/login.cpp, src/gui/char_select.cpp, src/gui/ok_dialog.cpp, - src/gui/confirm_dialog.cpp, src/gui/ok_dialog.h, src/gui/window.h, - src/gui/confirm_dialog.h, src/gui/register.cpp: Windows now default - to invisible, since this seems the most common case. - -2006-12-02 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/chest-leather-female.png: A little correction - at the female leather shirt by mangamaniac. - -2006-12-01 Philipp Sehmisch <tmw@crushnet.org> - - * src/net/beinghandler.cpp, src/being.h, src/being.cpp, src/monster.h, - src/gui/gui.cpp: Visible equipment slot numbers are now converted by - the beinghandler from eAthena to our system. No more distinction - between monster attacking and player attacking between beinghandler - and the being classes. - * src/being.cpp, src/monster.cpp, src/being.h, src/monster.h: Moved - the monster specific action handling into the monster class. - * monster.cpp, mosterinfo.cpp, monsterinfo.h: Monsters now make sounds - when they attack, gett hurt or die. - * src/being.cpp: Delayed the damage numbers a bit to synchronize them - better with the hurt sounds. - * data/monsters.xml, data/sfx//bat-dying1.ogg, data/sfx/bat-hit1.ogg, - data/sfx/bow_shoot_1.ogg, data/sfx/fire-goblin-hit1.ogg, - data/sfx/fire-goblin-hit2.ogg, data/sfx/fire-goblin-miss1.ogg, - data/sfx/fist-swish.ogg, data/sfx/flower-hit1.ogg, - data/sfx/flower-hit2.ogg, data/sfx/flower-miss1.ogg, - data/sfx/fluffy-hit1.ogg, data/sfx/fluffy-hit2.ogg, - data/sfx/fluffy-hit3.ogg, data/sfx/fluffy-hurt1.ogg, - data/sfx/fluffy-miss1.ogg, data/sfx/knife-hit1.ogg, - data/sfx/knife-miss1.ogg, data/sfx/levelup.ogg, - data/sfx/scorpion-hit1.ogg, data/sfx/scorpion-hit2.ogg, - data/sfx/scorpion-hit3.ogg, data/sfx/scorpion-hit4.ogg, - data/sfx/scorpion-miss1.ogg, data/sfx/short-sword-hit1.ogg, - data/sfx/short-sword-miss1.ogg, data/sfx/shroom-hit1.ogg, - data/sfx/slime-hit1.ogg, data/sfx/Makefile.AM, - data/sfx/CMakeLists.txt: Added a lot of sound effects by Cosmostrator. - -2006-11-30 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/maps/Makefile.am: Fixed small trailing slash issue. - * src/player.cpp: Optimized setSex and setWeapon by first loading the - new sprite and then deleting the old one (prevents potentially - unnecessary reload). - * src/net/beinghandler.cpp: Optimized handling of player walk - messages, by first setting the gender right and then setting the - equipment. Gets rid of reload of complete equipment in the case of - female. - -2006-11-30 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, tmw.cbp: Updated project files. - -2006-11-29 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/monster.cpp: Small fix to resource path. - -2006-11-29 Philipp Sehmisch <tmw@crushnet.org> - - * src/resources/equipment.h: Made getSprite return a constant - reference. - * src/resources/monsterdb.cpp, src/resources/monsterdb.h, - src/resources/monsterinfo.cpp, src/resources/monsterinfo.h, - src/Makefile.AM, src/CMakeLists.txt, src/main.cpp: - Added the MonsterDB namespace that reads the monsters.xml - and maps monster IDs to names, sprite definitions and sound effects. - * src/monster.cpp: Get sprite definition filenames from MonsterDB. - * src/engine.cpp: Show monster name when targeting a monster. - * data/monsters.xml, data/graphics/sprites/Makefile.AM, - data/graphics/sprites/CMakeLists.txt, data/graphics/sprites/monster*: - Renamed all monster sprites to more associative names (whew, we got to - train some monkeys for tasks like that). - -2006-11-27 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * tmw.cbp: Updated Code::Blocks project file. - -2006-11-27 Philipp Sehmisch <tmw@crushnet.org> - - * src/log.cpp, src/util/wingettimeofday.h: Added implementation of - gettimeofday() for windows machines. - -2006-11-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/log.cpp: Higher precision log timestamps. - * src/graphics.cpp, src/gui/gui.cpp, src/openglgraphics.cpp, - src/main.cpp, src/resources/equipmentdb.cpp, - src/resources/resourcemanager.cpp: Added some additional log - statements. - * src/resources/itemdb.cpp: Removed usage of READ_PROP in favour of - XML::getProperty and updated log statements. - * src/resources/image.cpp: Added support for loading TGA images. - -2006-11-26 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/resources/resourcemanager.cpp: Remove unnecessary check for - file existance, loading will just fail with the correct error message. - -2006-11-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/being.cpp, src/net/beinghandler.cpp, src/being.h: - Made Being::mDirection protected, forcing the use of setDirection. - * src/npc.cpp, src/player.cpp, src/animatedsprite.h, src/monster.cpp, - src/resources/resourcemanager.h: Defaulted variant argument to 0 since - this is the most common situation. - * src/resources/spritedef.cpp, src/resources/spritedef.h: Some - refactoring, splitting up the loading into several methods, in - preparation of adding support for including other sprites. - * src/main.cpp: ItemDB needs to be unloaded before deleting the - resource manager instance, since ItemInfo refers to an Image. - -2006-11-26 Philipp Sehmisch <tmw@crushnet.org> - - * src/being.cpp, src/being.h, src/engine.cpp, src/main.cpp, - src/player.cpp, src/player.h, src/resources/equipmentdb.h, - src/resources/equipmentdb.cpp, src/resources/equipmentinfo.h, - src/resources/itemdb.cpp, src/resources/itemdb.h, - data/graphics/images/error.png, data/graphics/sprites/error.xml: - Added the EquipmentDB namespace that reads the equipment.xml, maps - equipment IDs to sprite definition files and thus allows gender - specific equipment sprites. - * data/graphics/sprites/chest-leather-female.png, - data/graphics/sprites/chest-leather-male.png, - data/graphics/sprites/chest-leather-female.xml, - data/graphics/sprites/chest-leather-male.xml, - data/equipment.xml: Added and defined male and female leather shirt as - proof of concept of the gender specific equipment. - * data/graphics/images/Makefile.am, data/graphics/sprites/Makefile.am, - data/Makefile.am, src/Makefile.am, - data/graphics/images/CMakeLists.txt, - data/graphics/sprites/CMakeLists.txt, data/CMakeLists.txt, - src/CMakeLists.txt: Updated Makefiles and CMake Lists. - -2006-11-24 Philipp Sehmisch <tmw@crushnet.org> - - * src/engine.cpp, src/floor_item.cpp, src/item.h, src/main.cpp, - src/gui/buy.cpp, src/gui/popupmenu.cpp, src/gui/sell.cpp, - src/gui/shop.cpp, src/net/inventoryhandler.cpp, - src/resources/itemdb.cpp, src/resources/itemdb.h, - src/resources/iteminfo.h, src/resources/itemmanager.cpp, - src/resources/itemmanager.h: Refactored the Itemmanager class to an - ItemDB namespace. - -2006-11-23 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, tmw.cbp: Updated project files. - -2006-11-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/setup_joystick.cpp: Fixed joystick option to show enabled - when the joystick is enabled. - * src/localplayer.cpp, src/game.cpp, src/action.h, src/action.cpp, - src/player.cpp, src/animatedsprite.h, src/being.cpp, src/animation.h, - src/monster.cpp, src/CMakeLists.txt, src/player.h, - src/animatedsprite.cpp, src/localplayer.h, src/animation.cpp, - src/Makefile.am, src/being.h, src/resources/resourcemanager.cpp, - src/resources/spritedef.cpp, src/resources/resourcemanager.h, - src/resources/spriteset.h, src/resources/spritedef.cpp: Separated - sprite definition from playback. - -2006-11-17 Björn Steinbrink <B.Steinbrink@gmx.de> - - * data/graphics/sprites/CMakeLists.txt: Fixed some filenames. - -2006-11-17 Wai Ling Tsang <simotsa@gmail.com> - - * src/gui/gui.cpp: Added mouse following ability/feature under - logic(). - * src/gui/gui.h: Added mouseMotion(), mouseRelease() and private - variables for mouse following. - -2006-11-15 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/Woodland_village.png, - data/graphics/tiles/Woodland_village_x2.png, - data/graphics/tiles/Woodland_x2.png, - data/graphics/tiles/Makefile.AM, - data/graphics/tiles/CMakeList.txt, - data/maps/new_9-1.tmx.gz, data/maps/new_14-1.tmx.gz, - data/maps/new_15-1.tmx.gz, data/maps/new_16-1.tmx.gz, - data/maps/new_17-1.tmx.gz, data/maps/new_18-1.tmx.gz, - data/maps/new_19-1.tmx.gz, data/maps/CMakeList.txt, - data/maps/Makefile.AM: - Added woodland village outdoor tileset and maps. Modified gates on - the nearby maps. - -2006-11-15 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/animatedsprite.h, src/CMakeLists.txt, src/animatedsprite.cpp, - src/utils/xml.cpp, src/utils/xml.h, src/Makefile.am, - src/resources/mapreader.cpp: Separated getProperty method to an XML - utility namespace. - -2006-11-15 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, tmw.cbp: Updated project files. - * The Mana World.dev, tmw.cbp: Fixed dynamic linking of libcurl. - -2006-11-14 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/action.h, src/action.cpp, src/animation.h, src/CMakeLists.txt, - src/animatedsprite.cpp, src/animation.cpp, src/Makefile.am: Separated - Action class to its own module. - * src/action.h, src/action.cpp, src/animatedsprite.h, src/animation.h, - src/animatedsprite.cpp, src/animation.cpp: Resolve Image* of animation - phase at load time instead of storing just the spriteset index and - looking it up later (checking validity should still be added). Also - calculate animation length during loading instead of summing it up - each time it is requested. - -2006-11-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/map.cpp, src/map.h: Made pathfinding algorithm cope better with - beings blocking the road. This is done by allowing walking over other - beings, but at an additional cost so that it is preferable to walk - around them. - * src/game.cpp: Worked around a Guichan exception thrown for mice with - many buttons (patch by Roel van Dijk). - -2006-11-09 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/main.cpp, src/net/network.cpp, src/net/network.h, - The Mana World.dev, tmw.cbp: Fixed a conflict with Windows headers and - updated project files. - -2006-11-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/trade.cpp: Fixed money field to no longer hide below the - bottom of the window. - * src/CMakeLists.txt: Added shoplistbox.h/cpp files. - * src/gui/updatewindow.cpp: Fixed percentage indicator of update - window. - * src/main.cpp, src/net/beinghandler.cpp, src/net/skillhandler.cpp, - src/net/network.cpp: Changed some printf statements to log statements. - -2006-11-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/images/login_wallpaper.png: Reverted to standard - wallpaper. - * src/resources/resourcemanager.cpp: More useful logging about - resources that are being loaded (including source). - * src/graphics.cpp, src/gui/window.cpp, src/gui/button.cpp, - src/gui/widgets/dropdown.cpp, src/gui/textfield.cpp, - src/gui/playerbox.cpp, src/gui/progressbar.cpp, - src/gui/scrollarea.cpp, src/graphics.h, src/CMakeLists.txt, - src/Makefile.am, src/graphic, src/graphic/imagerect.h: Merged the - definition of ImageRect into graphics.h. - -2006-11-05 Yohann Ferreira <bertram@cegetel.net> - - * src/Makefile.am, src/gui/buy.cpp, src/gui/buy.h, src/gui/shop.h, - src/gui/shop.cpp, src/gui/sell.cpp, src/gui/shoplistbox.h, - src/gui/shoplistbox.cpp: Added pictures to items in buy dialogs. - Also too expensive items are highlighted in gray and can't be - selected. - * src/gui/shop.cpp, src/gui/shop.h, src/gui.sell.h, src/gui/sell.cpp, - src/net/buysellhandler.cpp, src/gui/shoplistbox.h, - src/gui/shoplistbox.cpp: Added item's pictures in sell dialogs, and - precisions about the total money in it. - * src/gui/shop.h, src/gui/shop.cpp, src/gui/sell.cpp: Fixes to Sell - dialog. - * src/gui/sell.cpp: Fixes the money value after selling something. - -2006-11-05 Björn Steinbrink <B.Steinbrink@gmx.de> - - * data/graphics/sprites/Makefile.am: Use tabs instead of spaces as - required by automake (AFAIK). - -2006-11-05 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/weapon0.png, - data/graphics/sprites/weapon2.png, - data/graphics/sprites/weapon-bow.xml, - data/graphics/sprites/weapon-dagger.xml, - data/graphics/sprites/weapon-fist.xml, - data/graphics/sprites/weapon-scythe.xml, - data/graphics/items/weapon-polearm-scythe.png, src/player.cpp, - src/player.h, src/being.cpp, src/being.h, data/items.xml: Added scythe - as a permanent weapon (ID: 623) - -2006-11-04 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/updatewindow.cpp, src/gui/updatewindow.h: Removed useless - addRow method. - -2006-11-04 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/maps/new_1-1.tmx.gz, data/maps/new_10-1.tmx.gz, - data/maps/new_11-1.tmx.gz, data/maps/new_14-1.tmx.gz, - data/maps/new_15-1.tmx.gz, data/maps/new_16-1.tmx.gz, - data/maps/new_3-1.tmx.gz, data/maps/new_7-1.tmx.gz, - data/maps/new_9-1.tmx.gz: Reverted Halloween map versions, except for - map 10 and 11 which include the latest fixes by Crush but now have - their night layer removed. - -2006-11-04 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_17-1.tmx.gz, - data/graphics/images/minimap_new_17-1.png, - data/graphics/images/Makefile.am, - data/graphics/images/CMakeLists.txt: - Added music and minimap to woodland cave level 2. - * data/maps/new_10-1.tmx.gz, maps/new_11-1.tmx.gz: - Fixed some map bugs (please update server sided walkmap) - -2006-11-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/updatewindow.cpp, src/main.cpp: Updated to the new default - updatehost. - -2006-11-01 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/gui.cpp, src/gui/browserbox.cpp, - data/graphics/gui/rpgfont_wider.png, - data/graphics/gui/browserfont.png, data/graphics/gui/fixedfont.png: - Added support for Ã¥ and Ã… (with help of HÃ¥kan Rönn). - -2006-10-31 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/desert1.png, data/graphics/tiles/desert_x2.png: - Adding a bunch of graphical improvements made by VxD. - -2006-10-31 Frode Lindeijer <f.lindeijer@gmail.com> - - * data/graphics/sprites/item011.png, - data/graphics/sprites/item011.xml, data/graphics/sprites/item012.png, - data/graphics/sprites/item018.xml, - data/graphics/sprites/monster21.xml: Fixed some graphical issues, - mostly a cosmetic update. - -2006-10-30 Yohann Ferreira <bertram@cegetel.net> - - * debian/changelog: Updated the package's version. - -2006-10-30 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_9-1.tmx.gz: Removed the night effect that accidentally - sneaked in with the last map change. - -2006-10-30 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/tmw.rc: Updated Windows binary version. - * data/help/header.txt, NEWS, README: Fixed some release dates and - versions. - * data/graphics/items/armor-head-axehat.png, - data/graphics/items/armor-head-bandana.png, - data/graphics/items/armor-head-circlet.png, - data/graphics/items/armor-head-eyepatch.png, - data/graphics/items/armor-head-goggles.png, - data/graphics/items/armor-head-leathergoggles.png, - data/graphics/items/armor-head-piratehat.png, - data/graphics/items/armor-head-pumpkinhelmet.png, - data/graphics/items/Makefile.am, data/items.xml: Added new items. - * data/graphics/sprites/Makefile.am, - data/graphics/sprites/monster21.png, - data/graphics/sprites/monster21.xml, - data/graphics/sprites/monster22.png, - data/graphics/sprites/monster22.xml: Added new monsters. - * data/graphics/sprites/item011.png, data/graphics/sprites/item011.xml, - data/graphics/sprites/item012.png, data/graphics/sprites/item012.xml, - data/graphics/sprites/item013.png, data/graphics/sprites/item013.xml, - data/graphics/sprites/item014.png, data/graphics/sprites/item014.xml, - data/graphics/sprites/item015.png, data/graphics/sprites/item015.xml, - data/graphics/sprites/item016.png, data/graphics/sprites/item016.xml, - data/graphics/sprites/item017.png, data/graphics/sprites/item017.xml, - data/graphics/sprites/item018.png, data/graphics/sprites/item018.xml, - data/graphics/sprites/Makefile.am: Added new visible equipments. - * data/graphics/images/login_wallpaper.png, data/maps/new_1-1.tmx.gz, - data/maps/new_10-1.tmx.gz, data/maps/new_11-1.tmx.gz, - data/maps/new_14-1.tmx.gz, data/maps/new_15-1.tmx.gz, - data/maps/new_16-1.tmx.gz, data/maps/new_3-1.tmx.gz, - data/maps/new_7-1.tmx.gz, data/maps/new_9-1.tmx.gz: Halloween related - contents. - * data/graphics/items/Makefile.am: Fixed wrong filename. - * data/graphics/sprites/Makefile.am: Fixed wrong filenames. - * data/graphics/sprites/weapon0.png: Replaced knife with scythe. - -2006-10-30 Björn Steinbrink <B.Steinbrink@gmx.de> - - * data/graphics/items/CMakeLists.txt: Synced with autotools config. - * data/graphics/items/CMakeLists.txt: Added new items to CMake config. - * src/being.cpp: Properly initialize sprite vector. - -2006-10-29 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac, The Mana World.dev, CMakeLists.txt, - data/help/header.txt, NEWS: Set version to 0.0.21.1. - * src/player.cpp: Fixed excessive unnecessary reloading of sprites. - -2006-10-28 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/main.c: Reload wallpaper after updates are fetched. - * data/graphics/sprites/Makefile.am: Added monster20. - -2006-10-28 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/monster20.png, - data/graphics/sprites/monster20.xml, - data/graphics/sprites/CMakeLists.txt: - Added pumpkin ghost monster for halloween event. - * data/maps/new_9-1.tmx.gz: Fixed a map discrepancy between - new_9-1 and new_14-1 (no new walkmap required). Thanks to QOAL - for reporting. - -2006-10-24 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/images/ambient/night.png: added graphic for night - ambient effect. - -2006-10-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac: Added zlib check before PhysFS check. The PhysFS check - was failing on MSYS because of a missing -lz. - -2006-10-22 Björn Steinbrink <B.Steinbrink@gmx.de> - - * CMakeLists.txt, src/CMakeLists.txt: Add PACKAGE_VERSION support. - * CMakeLists.txt, src/CMakeLists.txt: Setup the binary dir in the main - CMakeLists.txt file. - * src/main.h: Include config.h only when we have it. - * src/CMakeLists.txt: Properly set build flags for the tmw target. - -2006-10-18 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/CMakeLists.txt, data/graphics/tiles/CMakeLists.txt, - data/graphics/items/CMakeLists.txt, data/graphics/gui/CMakeLists.txt, - data/graphics/images/ambient/CMakeLists.txt, - data/graphics/images/CMakeLists.txt, - data/graphics/sprites/CMakeLists.txt, data/maps/CMakeLists.txt, - data/sfx/CMakeLists.txt, data/help/CMakeLists.txt, - data/icons/CMakeLists.txt, data/CMakeLists.txt, CMakeLists.txt: Add - TMW_DATADIR definition. - -2006-10-16 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/CMakeLists.txt: Adjusted path for Windows. - -2006-10-16 Björn Steinbrink <B.Steinbrink@gmx.de> - - * CMakeLists.txt: Enable OpenGL by default. - * CMake/Modules/FindLibcurl.cmake: Fix libcurl library not being - marked as advanced option. - * CMakeLists.txt, src/CMakeLists.txt: Add OpenGL option. - * data/CMakeLists.txt: Adjust data destination for Windows. - * src/CMakeLists.txt: Adjust binary destination for Windows. - * src/CMakeLists.txt, data/graphics/tiles/CMakeLists.txt, - data/graphics/items/CMakeLists.txt, data/graphics/gui/CMakeLists.txt, - data/graphics/images/ambient/CMakeLists.txt, - data/graphics/images/CMakeLists.txt, - data/graphics/sprites/CMakeLists.txt, data/graphics/CMakeLists.txt, - data/maps/CMakeLists.txt, data/sfx/CMakeLists.txt, - data/help/CMakeLists.txt, data/icons/CMakeLists.txt, - data/CMakeLists.txt, CMakeLists.txt: Add CMake install support. - * CMake/Modules/FindGuichan.cmake, CMake/Modules/FindLibXml2.cmake, - CMake/Modules/FindLibcurl.cmake, CMakeLists.txt, src/CMakeLists.txt: - Add basic CMake support for building tmw. - -2006-10-12 Yohann Ferreira <bertram@cegetel.net> - - * debian/rules, debian/tmw-data.install, debian/tmw-data.dirs, - debian/tmw-music.install, debian/changelog: Updating Debian files for - bug fixing. - -2006-10-12 Frode Lindeijer <f.lindeijer@gmail.com> - - * /data/graphics/sprites/npcs.png: Updated the clothes salesman, - it was way out of date. - -2006-10-12 Cédric Borgese <cedric.borgese@gmail.com> - - * data/graphics/tiles/Woodland_x3.png: Enlarge the trunk and the - base of the trees in the woodland tileset. - -2006-10-09 Yohann Ferreira <bertram@cegetel.net> - - * src/gui/buysell.cpp, src/gui/buy.cpp : A little tweak to the buy - dialogs. - -2006-10-07 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/resources/mapreader.cpp: Added support for gzip compressed map - layers. - * configure.ac, The Mana World.dev: Increased version to 0.0.22. - * src/map.cpp: Removed unused setSize method. Also introduced - initializeOverlays method and removed the confusing setOverlay (which - actually added one). - * src/properties.h: Added convenience method to read a property as a - float. - * src/map.cpp, src/resources/ambientoverlay.cpp, - src/resources/ambientoverlay.h: Resolved some weirdness involving - the terms scroll and speed. - -2006-10-07 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, tmw.cbp: Updated project files. - -2006-10-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/sprites/item006.xml, - data/graphics/sprites/item007.xml, - data/graphics/sprites/item008.xml, - data/graphics/sprites/item009.xml, - data/graphics/sprites/item006.png, - data/graphics/sprites/item007.png, - data/graphics/sprites/item008.png, - data/graphics/sprites/item009.png, - data/graphics/sprites/item010.xml, - data/graphics/sprites/item010.png: Removed empty frames from - headgears. - -2006-10-03 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/map.cpp, src/map.h, src/Makefile.am, - src/resources/mapreader.cpp, src/resources/ambientoverlay.cpp, - src/resources/ambientoverlay.h: Turned AmbientOverlay into a class. - Cleaned up the associated code. - -2006-10-01 Eugenio Favalli <elvenprogrammer@gmail.com> - - * tools/Purger.java: Added a tool to purge old accounts from eAthena's - database files. - -2006-10-01 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/gui/trade.cpp, src/gui/inventorywindow.cpp: - Accepted patches by GDO and VictorSan that fix problems with hiding - windows using h and problems with trade window positioning. - -2006-09-28 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/map.cpp: Fix random crashes when map tiles are missing. - -2006-09-28 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/maps/new_2-1.tmx.gz: Matt Howe fixed up cave map. - -2006-09-26 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/maps/new_6-1.tmx.gz: Alderan fixed a map issue. - -2006-09-25 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/sprites/hairstyle*.png, - data/graphics/sprites/hairstyle*.xml, tools/Reorganize.java: Removed - unused frames from the hairsets. - * src/resources/image.h: Defined NO_SDL_GLEXT to prevent a - redefinition when gl.h also tries to define OpenGL extensions (patch - accepted from Rogier Polak). - -2006-09-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/maps/new_5-1.tmx.gz: Accepted new version by Matt Howe, fixing - several mapping issues. - -2006-09-21 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/tiles/Makefile.am: Added missing tileset. - * src/gui/updatewindow.cpp, src/gui/updatewindow.h: Made canceling the - update process non-blocking (Patch by VictorSan). - -2006-09-21 Philipp Sehmisch <tmw@crushnet.org> - - * src/animation.cpp, src/animation.h, src/animatedsprite.cpp, - src/animatedsprite.h: Removed some obsolete code and implemented - the posibility to define an <end /> token in the <animation>s - that allows to define an animation that doesn't loop and returns - to the STAND animation when finished. - * data/graphics/sprites/hairstyle*.xml, - data/graphics/sprites/item0*.xml, - data/graphics/sprites/monster*.xml, - data/graphics/sprites/weapons.xml: Used the <end /> token for all - attack animations fixing the problem with looping monster attack - animations. - -2006-09-20 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/items/generic-whitefur.png, - data/graphics/items/generic-cavesnakelamp.png, - data/graphics/items/generic-hardspike.png, - data/graphics/items/generic-pinkantennae.png, - data/graphics/items/Makefile.am, data/items.xml: Added drops for new - monsters. - * src/gui/setup.cpp, src/gui/setup_video.cpp, - src/gui/setup_video.h: Added a slider for controlling the overlay - detail to the video setup dialog based on a patch by VictorSan. - * data/maps/new_14-1.tmx.gz, data/maps/new_16-1.tmx.gz: Added cloud - effect and minimap. - * data/images/Makefile.am: Updated makefile. - -2006-09-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/sprites/Makefile.am: Added missing monster19 sprite. - -2006-09-17 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/maps/Makefile.am: Added missing maps. - * data/maps/new_10-1.tmx.gz: Disabled layer compression. - -2006-09-18 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_9-1.tmx.gz: Fixed some mapping bugs (new walkmap - required). - -2006-09-17 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/maps/new_10-1.tmx.gz: Fixed transparent snow issue (Fix by - Pajarico). - -2006-09-17 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp: Stop using the sticky window attribute which is - unneeded for the current implementation, instead adjust the set of - affected windows by the 'hide' shortcut. - -2006-09-17 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_14-1.tmx.gz, data/maps/new_15-1.tmx.gz, - data/maps/new_16-1.tmx.gz: fixed some mapping errors. - -2006-09-16 Philipp Sehmisch <tmw@crushnet.org> - - * src/animatedsprite.cpp, src/animatedsprite.h: Fixed the crash when - attacking without a weapon, some additional stability improvements and - more descriptive variable names in the parsing algorithmn. - -2006-09-16 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/help/changes.txt, data/help/header.txt, NEWS, README, - src/tmw.rc: Updated release infos. - -2006-09-14 Philipp Sehmisch <tmw@crushnet.org> - - * src/animation.h, src/animatedsprite.h, - data/graphics/sprites/weapon.xml: Some modifications at the animation - system. No more "undefined action foo" warnings in the tmw.log. Not - visible actions must now be declared explicitly. - * data/graphics/images/ambient/sandstorm.png, - data/graphics/images/ambient/clouds.png: Improved quality of the overlay - graphics. - -2006-09-14 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/char_select.cpp: Remove debug output. - * src/gui/char_select.cpp, src/main.cpp: Fix the character name - matching loop and add support for saving the last used character - (based on a patch by Andrew Harrison). - * src/gui/char_select.cpp, src/gui/char_select.h, src/main.cpp: Clean - up the player selection stuff, it's a bit nicer now. - * src/main.cpp: Fix up the player selection command line option. - -2006-09-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/game.h: Simplified fps limiting a bit and added - some comments. Now based on ConfigListener so that the fpslimit option - doesn't need to be queried the whole time. - * NEWS: Updated with some items. - -2006-09-11 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp: Fixed more fps issues. - -2006-09-09 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/gui.cpp: Removed easy targeting functionality since it - interferes with walking around too much. Targeting can still be rather - conveniently done with 'a' or the middle mouse button. - -2006-09-07 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/resources/image.cpp: Fixed a typo. - * src/resources/image.cpp: Worked around a memory leak when using - OpenGL. - -2006-09-06 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/item010.png, data/graphics/sprites/item010.xml, - data/graphics/sprites/Makefile.am: Added santa hat sprites and updated - makefile. - -2006-09-06 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp, src/gui/setup_video.cpp, src/main.cpp: Fixed fps - limiter issues and increased default limit to 60. - * src/game.cpp: Fixed fps limiter when disabled. - -2006-09-05 Philipp Sehmisch <tmw@crushnet.org> - * data/graphics/tiles/Woodland_ground.png, - data/graphics/tiles/Woodland_x2.png, - data/graphics/tiles/Woodland_x3.png: Some minor improvements and - additions at my tilesets. - * data/graphics/sprites/monster0.xml, - data/graphics/sprites/monster1.xml, - data/graphics/sprites/monster2.xml, - data/graphics/sprites/monster3.xml, - data/graphics/sprites/monster4.xml, - data/graphics/sprites/monster5.xml, - data/graphics/sprites/monster6.xml, - data/graphics/sprites/monster8.xml, - data/graphics/sprites/monster9.xml, - data/graphics/sprites/monster11.xml, - data/graphics/sprites/monster13.xml, - data/graphics/sprites/monster0.xml: Adjusted the animation speed of - several monsters. - -2006-09-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/floor_item.cpp, src/gui/equipmentwindow.cpp, src/gui/sell.cpp, - src/gui/trade.cpp, src/gui/inventorywindow.h, - src/gui/selectionlistener.h, src/gui/itemcontainer.h, - src/gui/inventorywindow.cpp, src/gui/buy.cpp, - src/gui/itemcontainer.cpp, src/gui/popupmenu.cpp, src/item.h, - src/net/inventoryhandler.cpp, src/Makefile.am, - src/resources/itemmanager.h, src/resources/iteminfo.cpp, - src/resources/iteminfo.h, src/resources/itemmanager.cpp: Introduced - SelectionListener to fix updating problem in inventory window (should - also be used to fix similar problem in trade, buy and sell dialogs). - Made the ItemInfo be passed around as a reference instead of a pointer, - since it is never NULL. - * src/gui/trade.cpp, src/gui/trade.h: Fixed updating of labels in - trade window. - * src/gui/sell.cpp, src/gui/listbox.h, src/gui/inventorywindow.h, - src/gui/buy.h, src/gui/buy.cpp, src/gui/sell.h, src/gui/listbox.cpp: - Fixed updating of labels in buy and sell dialogs. Also made our - listbox respond to mouse dragging to change the selection. - -2006-09-02 Bernard Lidicky <bernard@matfyz.cz> - - * src/game.cpp, src/beingmanager.h, src/gui/gui.cpp, - src/beingmanager.cpp, src/localplayer.h, README, - data/help/commands.txt, NEWS: Added targeting nearest monster with - either keyboard or mouse. Also made clicking beings in general a bit - easier (patch applied by Bjørn Lindeijer). - -2006-09-01 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/monster19.png, - data/graphics/sprites/monster19.xml, data/graphics/tiles/arena.png, - data/graphics/tiles/cave.png, data/maps/new_17-1.tmx.gz, - data/maps/new_6-1.tmx.gz: Added new big cave map, lamp-snake monster, - improved arena map. - -2006-08-30 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/item007.png, - data/graphics/sprites/item007.xml, data/graphics/sprites/item009.png, - data/graphics/sprites/item009.xml: - Added sprites for miners helm and standard headband. - -2006-08-29 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/map.cpp, src/beingmanager.h, src/gui/minimap.cpp, - src/engine.cpp, src/beingmanager.cpp: It's better to use a reference - when you don't need a pointer. - * NEWS: Updated with addition of config file option. - -2006-08-29 Andrew Harrison <atharris@users.sourceforge.net> - - * src/main.cpp: Added command line option to specify which - configuration file to use (patch applied by Bjørn Lindeijer). - -2006-08-29 Matthias Hartmann <hartmann.matthias@gmail.com> - - * data/graphics/sprites/item006.png, - data/graphics/sprites/item006.xml, data/graphics/sprites/item008.xml: - Fixed fancy hat + silk headband positions. - -2006-08-29 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/item008.png, - data/graphics/sprites/item008.xml, data/graphics/sprites/Makefile.am: - Added fancy hat sprite. - -2006-08-28 Philipp Sehmisch <tmw@crushnet.org> - - * src/gui/setup_video.cpp: Modified the ranges of the ScrollLaziness - and ScrollRadius sliders. - -2006-08-28 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/items/*: Changed svn properties. - * data/graphics/sprites/item001.xml, data/graphics/sprites/item002.xml, - data/graphics/sprites/item003.xml, data/graphics/sprites/item004.xml, - data/graphics/sprites/item005.xml, data/graphics/sprites/item006.png, - data/graphics/sprites/item006.xml, data/graphics/sprites/Makefile.am: - Added headband and fixed svn properties. - -2006-08-27 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/net/inventoryhandler.cpp: Applied patch by Andrew Harrison that - adds item pickup messages to the chat window. - * NEWS: Updated with some recently added and fixed issues. Doesn't - mention any of the recent content updates yet. - -2006-08-26 Pascal Ganaye <pascalganaye@users.sourceforge.net> - - * src/joystick.h, src/joystick.cpp, src/gui/setup.cpp, - src/gui/setup_joystick.h, src/gui/setup_video.cpp, - src/gui/setup_joystick.cpp, src/gui/setup_video.h: Added sliders to - the video section of the setup window to configure the laziness and - radius of the scrolling behaviour. Added a checkbox to the joystick - section to allow enabling/disabling the joystick (patch applied by - Bjørn Lindeijer). - -2006-08-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/ministatus.cpp, src/gui/ministatus.h: Applied patch by mrha - (Herbi), adding experience bar to the ministatus in the top left. - * configure.ac, data/graphics/items/Makefile.am, - data/graphics/Makefile.am: Added Makefile.am to make sure the item - icons are installed. - * src/player.cpp, src/animation.h, src/player.h, - src/animatedsprite.cpp, src/animation.cpp: Applied patch by Bahamut81 - which implements resetting of Animation, Action and AnimatedSprite. - This fixes the animation synchronization issues. - -2006-08-25 Matthias Hartmann <hartmann.matthias@gmail.com> - - * src/gui/char_select.cpp, src/gui/char_select.h, src/main.cpp: Added - --playername command line option for selecting the character you want - to play with (patch applied by Bjørn Lindeijer). - -2006-08-25 Philipp Sehmisch <tmw@crushnet.org> - - * src/engine.cpp, src/map.h, src/map.cpp: Addded new config variable - "OverlayDetail" to control the number of drawn overlays. - 2 (or more) = all (default), 1 = only the first one, 0 = none. - -2006-08-24 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/help/commands.txt, README, src/game.cpp, src/gui/chat.cpp, - src/gui/window.cpp, src/gui/window.h: Added support for sticky windows - as discussed with doener. Patch by Andrew Harrison. - * data/items.xml: Added jeans shorts. - -2006-08-24 Philipp Sehmisch <tmw@crushnet.org> - - * src/engine.cpp: Scrolling speed no longer affected by framerate. - * src/map.cpp, scr/map.h: Overlay speed no longer affected by - framerate. - * data/maps/new_1-1.tmx.gz, data/graphics/new_7-1.tmx.gz, - data/graphics/images/ambient/sandstorm.png: Redone sandstorm effect - (larger and more transparent image, tripple layer parallax scrolling) - -2006-08-24 Frode Lindeijer <f.lindeijer@gmail.com> - - * data/graphics/sprites/item004.png, - data/graphics/sprites/item005.png, data/graphics/sprites/Makefile.am, - data/graphics/items/armor-legs-cottonshorts, - data/graphics/items/armor-legs-jeanshorts: Added the equip graphics of - the short jeans and the cotton shorts and an inventory icon of the - cotton shorts. Also added all added files to the makefile. - -2006-08-23 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_7-1.tmx.gz: Fixed a minor mapping bug reported on the - forum (no new walkmap required). - * data/maps/new_9-1.tmx.gz: Fixed two minor mapping bugs (new walkmap - required). - -2006-08-22 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac, data/graphics/images/ambient, - data/graphics/images/ambient/Makefile.am, - data/graphics/images/Makefile.am: Updated makefiles to account for new - ambient images and changed the version from 0.0.20.1 to 0.0.21. - -2006-08-21 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, tmw.cbp: Updated project files. - -2006-08-21 Philipp Sehmisch <tmw@crushnet.org> - - * src/mapreader.cpp: Added logic for initialisation of the overlays. - * src/map.cpp, src/map.h: Code for updating and drawing the overlays. - * src/engine.cpp, src/engine.h: Added smooth scrolling and the call - to draw the overlays. - * data/maps/new_1-1.tmx.gz, data/graphics/new_7-1.tmx.gz, - data/graphics/images/ambient/sandstorm.png: Added sandstorm effect - to the desert maps outside of the city (feedback, please). - * data/maps/new_2-1.tmx.gz, data/maps/new_4-1.tmx.gz, - data/maps/new_5-1.tmx.gz, data/graphics/images/ambient/spotlight.png - Added spotlight effect to the cave maps (feedback, please) - * data/graphics/maps/new_9-1.tmx.gz, - data/graphics/images/ambient/clouds.png: - Added cloudshadow effect to the woodland map (feedback, please). - -2006-08-20 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac: Moved libpng check before SDL_image check, since the - latter requires the former. - -2006-08-20 Yohann Ferreira <bertram@cegetel.net> - - * data/graphics/sprites/Makefile.am: Following the splitting from - Philipp, moved out the items.png file from the Makefile.am. - * debian/control, debian/tmw-data.install: Updated debian package - creation process. - * src/Makefile.am: Added iteminfo.cpp to avoid an undefined reference - with gcc 4.1.2. Happy to be back :) - -2006-08-17 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/items/*: Splitted the items.png into separate images - with more distinctive names. (no, i won't list all 114) - * src/itemmanager.cpp, data/items.xml: Replaced indices on the item - spriteset with filenames. added names and descriptions for all missing - items. Changed names and descriptions of some items. - * src/engine.cpp: Removed global item spriteset. - * src/floor_item.cpp, src/floor_item.h, src/iteminfo.cpp, - src/iteminfo.h, src/equipmentwindow.cpp, src/equipmentwindow.h, - src/itemcontainer.cpp, src/itemcontainer.h: The iteminfo class now - provides a pointer to the item icon image instead of providing the - index on the item spriteset. - * data/graphics/tiles/trans_desert-woodland.png: Added transmission - tileset between desert and woodland. - -2006-08-13 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/Makefile.am, - data/graphics/sprites/monster18.png, - data/graphics/sprites/monster18.xml, - data/graphics/sprites/npcs.png: Added new monster and npcs. - * src/gui.cpp, tmw.cbp, The Mana World.dev: Fixed Guichan 0.5.0 - compilation issues. - -2006-08-13 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/openglgraphics.cpp, src/game.cpp, src/main.cpp, - src/gui/buddywindow.cpp, src/gui/connection.cpp, src/gui/sell.cpp, - src/gui/trade.cpp, src/gui/char_server.cpp, src/gui/window.cpp, - src/gui/login.cpp, src/gui/skill.h, src/gui/gui.cpp, - src/gui/item_amount.h, src/gui/setup_audio.h, src/gui/newskill.cpp, - src/gui/register.h, src/gui/setup.cpp, src/gui/npclistdialog.h, - src/gui/updatewindow.cpp, src/gui/char_select.cpp, src/gui/login.h, - src/gui/item_amount.cpp, src/gui/setup_audio.cpp, - src/gui/npc_text.cpp, src/gui/chat.h, src/gui/setup_joystick.h, - src/gui/setup_video.cpp, src/gui/ok_dialog.cpp, src/gui/textfield.cpp, - src/gui/inventorywindow.h, src/gui/newskill.h, src/gui/box.h, - src/gui/ministatus.cpp, src/gui/buy.h, src/gui/setup.h, - src/gui/confirm_dialog.cpp, src/gui/debugwindow.cpp, src/gui/vbox.cpp, - src/gui/chat.cpp, src/gui/setup_joystick.cpp, src/gui/updatewindow.h, - src/gui/char_select.h, src/gui/buysell.h, src/gui/tabbedcontainer.cpp, - src/gui/inventorywindow.cpp, src/gui/help.cpp, src/gui/status.h, - src/gui/npc_text.h, src/gui/setup_video.h, src/gui/menuwindow.cpp, - src/gui/ok_dialog.h, src/gui/buy.cpp, src/gui/buddywindow.h, - src/gui/sell.h, src/gui/trade.h, src/gui/char_server.h, - src/gui/skill.cpp, src/gui/buysell.cpp, src/gui/confirm_dialog.h, - src/gui/debugwindow.h, src/gui/status.cpp, src/gui/register.cpp, - src/gui/scrollarea.cpp, src/gui/tabbedcontainer.h, - src/gui/npclistdialog.cpp, src/gui/help.h, src/net/tradehandler.cpp, - src/net/playerhandler.cpp, src/Makefile.am, - src/resources/sdlimageloader.cpp, src/resources/sdlimageloader.h, - src/resources/openglsdlimageloader.cpp, - src/resources/resourcemanager.cpp, - src/resources/openglsdlimageloader.h, src/resources/resourcemanager.h: - Updated TMW to be compatible with Guichan 0.5.0 (merged from - guichan-0.5.0 branch). - * INSTALL, docs/INSTALL/win32.txt: Updated required Guichan to version - 0.5.0. - * configure.ac: Moved some basic checks above the checks on the - libraries we depend on, in order to get rid of the confusing - rpl_realloc error. - * src/resources/openglsdlimageloader.cpp, src/player.cpp: Fixed - several compiler warnings and a linker error when compiling without - OpenGL support. - -2006-08-12 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_9-1.tmx.gz, data/maps/new_14-1.tmx.gz, - data/maps/new_15-1.tmx.gz, data/maps/new_16-1.tmx.gz: Fixed some - inaccessible areas. - -2006-08-07 Philipp Sehmisch <tmw@crushnet.org> - * data/maps/new_9-1.tmx.gz, data/maps/new_14-1.tmx.gz, - data/maps/new_15-1.tmx.gz, data/maps/new_16-1.tmx.gz, - data/graphics/images/minimap_new_9-1.png, - data/graphics/images/minimap_new_14-1.png, - data/graphics/images/minimap_new_15-1.png, - data/graphics/images/minimap_new_16-1.png: Added minimaps for woodland - maps. - -2006-08-07 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_1-1.tmx.gz, data/maps/new_14-1.tmx.gz, - data/maps/new_15-1.tmx.gz, data/maps/new_16-1.tmx.gz: - Added a new woodland map and a connection map between desert and - woodland. - * data/graphics/woodland_ground.png: Added some new rocks. - -2006-08-07 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/gui/chat.h, src/gui/chat.cpp, src/main.cpp: A - bunch of cleanups. - -2006-08-05 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/configuration.cpp, src/game.cpp, src/engine.cpp, src/player.cpp, - src/being.cpp, src/resources/mapreader.cpp, - src/resources/itemmanager.cpp: Some cleanups, mostly lowering - indentation. - * src/being.cpp: Small code cleanup. - -2006-08-04 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/animatedsprite.cpp: Fix enum being treated as string. - * src/animation.cpp: Small code cleanups. Removed unused headers. - * src/animatedsprite.cpp: Small code cleanup/lower indentation. - -2006-08-04 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/animatedsprite.cpp: Fixed presence of NULL actions. This is - doener's version of the fix, because it was more efficient in the more - common case. - -2006-08-04 Frode Lindeijer <f.lindeijer@gmail.com> - - * data/graphics/tiles/desert_x3.png: Replaced the old cactus with - a nice new high-res one. - -2006-08-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/player.cpp, src/being.cpp, src/being.h: Removed three - setDirection(mDirection) calls by instead specifically setting the - current direction on the newly added animated sprite. The same might - be done for the action later. - * src/animatedsprite.h, src/animatedsprite.cpp: Since this class isn't - subclassed and has no virtual functions, make protected members - private. Also added a start of a reset function which could be a - solution to unsynchronized animated sprites. - * src/net/network.cpp: Fixed two delete/delete[] errors. - -2006-08-01 Philipp Sehmisch <tmw@crushnet.org> - - * src/animation.h, src/animation.cpp, src/animatedsprite.h, - src/animatedsprite.cpp, src/being.cpp: Animations and directions - are now passed and stored as enums and no longer as strings. - -2006-07-30 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/animatedsprite.h, src/animatedsprite.cpp: Unified the play - methods. - -2006-07-30 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_5-1.tmx.gz: Fixed two minor mapping errors (no new - walkmap required). - -2006-07-29 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/animatedsprite.h, src/animatedsprite.cpp, src/animation.cpp: A - bunch of cleanups. - * src/animation.h, src/animatedsprite.cpp: Moved included from header - to source file. - -2006-07-28 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/npc.cpp, src/player.cpp, src/animatedsprite.h, src/animation.h, - src/being.cpp, src/main.cpp, src/monster.cpp, src/animatedsprite.cpp, - src/animation.cpp, src/Makefile.am, src/being.h: Moved AnimatedSprite - into its own files, removed useless includes. - * src/engine.cpp: Removed an unused var. - -2006-07-26 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/Makefile.am, data/graphics/tiles/Makefile.am, - data/maps/Makefile.am, data/maps/new_13-1.tmx.gz: Added map with - inside of snow village buildings and fixed makefiles. - * src/being.cpp, src/being.h, src/player.cpp: Fixed direction and - action issues when changing appeareance, frames are still out of sync. - * data/maps/Makefile.am, data/maps/new_14-1.tmx.gz, - data/maps/new_9-1.tmx.gz: Added new woodland map by Crush and fixed - connection with the old one. - -2006-07-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/maps/new_4-1.tmx.gz: Fixes to the collision layer. - -2006-07-26 Frode Lindeijer <f.lindeijer@gmail.com> - - * data/graphics/tiles/snowset.png, data/graphics/tiles/snow_x2.png, - data/graphics/tiles/snow_x3.png: Moved the lamppost, the rock and the - bench to seperate tall tilebitmaps. - * data/maps/new_11-1.tmx.gz: Improved the snow village map, main - changes are that the player can now walk better behind houses, - lampposts, rocks and benches. - * data/graphics/sprites/item003.png, data/graphics/sprites/item003.xml: - Added the leather shirt - -2006-07-25 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/log.cpp, src/log.h: Added support for writing log to standard - output. - * src/gui/updatewindow.cpp: Fixed updating on Windows. - -2006-07-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/main.cpp: Fixed the loading of updates and made skipping the - update process also skip the loading of updates. - -2006-07-24 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/localplayer.cpp, src/being.cpp: Fixed setDirection() semantics. - Removed a printf-leftover. - -2006-07-24 Frode Lindeijer <f.lindeijer@gmail.com> - - * data/graphics/sprites/npcs.png: Added the organdealer to the NPCs. - * data/graphics/sprites/player_male_base.png, - data/graphics/sprites/player_female_base.png: Fixed some transparency - issues. - -2006-07-24 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/being.cpp, src/being.h, src/localplayer, The Mana World.dev, - tmw.cbp: Removed unused code, fixed "change direction when not - walking" bug, updated project files. - * data/graphics/sprites/monster1.xml: Slowed down scorpions. - * data/graphics/sprites/monster2.xml: Red scorpions have got the same - problem. - * data/graphics/sprites/player_female_base.xml: Fixed female playerset - animation definition. - * data/help/about.txt, data/help/changes.txt, data/help/commands.txt, - data/help/header.txt, data/help/index.txt, data/help/skills.txt, - data/help/support.txt, data/help/team.txt: Forced to use UNIX end of - line character. - * src/net/equipmenthandler.cpp: Equipments now use real slot - positions. - -2006-07-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/floor_item.cpp, src/animation.h, src/being.cpp, src/main.cpp, - src/gui/equipmentwindow.cpp, src/gui/playerbox.cpp, - src/gui/itemcontainer.cpp, src/engine.cpp, src/tileset.h, - src/animation.cpp, src/Makefile.am, src/resources/mapreader.cpp, - src/resources/resourcemanager.cpp, src/resources/spriteset.cpp, - src/resources/resourcemanager.h, src/resources/spriteset.h, - src/being.h, src/graphic/spriteset.cpp, src/graphic/spriteset.h, - data/graphics/sprites/npc.xml, data/graphics/sprites/weapons.xml: - Implemented caching of spritesets, including a lot of cleanups to the - new animation system. Action now refers to the Spriteset directly and - AnimatedSprite refers to the current Action directly instead of using - the std::map with a std::string constantly. Some methods and - parameters are marked as const. The READ_PROP macro was replaced by - static methods. Warnings are logged when unnamed actions are defined - or when actions refer to undefined imagesets. Code is more tolerant - towards missing actions. - * NEWS: Rearranged some items. - -2006-07-21 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/animation.cpp, src/animation.h: Removed unused code, fixed a - numeric conversion, used a more meaningful speed. - -2006-07-20 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/help/header.txt, data/help/skills.txt, docs/FAQ.txt, README: - Updated some docs for the 0.0.20 release. - * NEWS: Added new features of 0.0.20. - * data/items.xml: Added shorts. - * src/tmw.rc, The Mana World.dev, tmw.cbp: Added a resource script to - let both Dev-Cpp and Code::Blocks share the same binary icon and - version infos. - * data/graphics/sprites/player_female_base.xml, - data/graphics/sprites/player_male_base.xml, src/animation.cpp, - src/animation.h, src/being.cpp: Fixed left bow attack animation, - made the attack animation stay in sync with attack speed. - -2006-07-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/minimap.cpp: Fixed dot size of local player. - * src/engine.cpp: Fixed color of "[TARGET]". - * src/resources/mapreader.cpp, src/resources/mapreader.h, - data/maps/new_12-1.tmx.gz, data/maps/new_3-1.tmx.gz, - data/maps/new_4-1.tmx.gz, data/maps/new_5-1.tmx.gz, - data/maps/new_6-1.tmx.gz, data/maps/new_7-1.tmx.gz, - data/maps/new_8-1.tmx.gz, data/maps/new_9-1.tmx.gz, - data/maps/new_1-1.tmx.gz, data/maps/new_10-1.tmx.gz, - data/maps/new_11-1.tmx.gz, data/maps/new_2-1.tmx.gz: Implemented - loading for the way Tiled saves properties since version 0.6.0 and - updated all current maps. - -2006-07-19 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/item001.png, data/graphics/sprites/item001.xml, - data/graphics/sprites/item002.png, data/graphics/sprites/item002.xml, - data/graphics/sprites/item1202.png, data/graphics/sprites/Makefile.am, - docs/INSTALL/win32.txt, src/animation.cpp, src/being.cpp, src/being.h, - src/gui/equipmentwindow.cpp, src/gui/newskill.cpp, src/main.cpp, - src/net/beinghandler.cpp, src/net/charserverhandler.cpp, - src/player.cpp, src/player.h: Merged trunk changes r2381:2397 into - new_animation branch. - * tmw.cbp: Updated Code::Blocks project file. - * src/gui/char_select.cpp: Fixed next/previous buttons behaviour in - character selection dialog. - * data/graphics/sprites/Makefile.am: Alphabetically correct. - -2006-07-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * tmw.cbp: Added Code::Blocks project file. - -2006-07-18 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/updatewindow.cpp, src/gui/updatewindow.h, src/main.cpp, - src/resources/resourcemanager.cpp, src/resources/resourcemanager.h: - Updated the updating system. It will now only load those updates - specified in the downloaded resources.txt file, and in the order - in which they are mentioned (the top one being the most - significant). - -2006-07-17 Frode Lindeijer <f.lindeijer@gmail.com> - - * data/graphics/sprites/items.png: Added shorts' icon to items.png - -2006-07-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/newskill.cpp: Fixed up a string comparison that caused a - warning with GCC 4.2. - -2006-07-12 Frode Lindeijer <f.lindeijer@gmail.com> - - * data/graphics/sprites/item001.png: Completed the cotton shirt - equipment graphic. - -2006-07-06 Philipp Sehmisch <tmw@crushnet.org> - - * src/animation.cpp, src/animation.h, src/being.cpp, src/being.h, - src/monster.cpp, src/npc.cpp, src/player.cpp: - Fixed some minor bugs, cleaned up general code style and added more - comments. - -2006-07-05 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/monster.cpp, src/npc.cpp, src/player.cpp: Fixed broken paths. - * data/graphics/sprites/Makefile.am: Added new files. - * src/animation.cpp: Added missing return value... - * src/Makefile.am: Added new files. - -2006-07-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/sprites/monster0.xml: Fixed frame size of maggot. - * src/being.h: drawName should be virtual, lest we want names to be - drawn. - -2006-07-03 Philipp Sehmisch <tmw@crushnet.org> - - * src/spriteset.cpp, src/spriteset.h: Spriteset::get() doesn't crash - anymore when requesting a sprite outside of the spriteset. (it returns - NULL instead and logs a warning). - -2006-07-03 Philipp Sehmisch <tmw@crushnet.org> - - * src/being.cpp: Fixed a compiler issue reported by Pajarico. - -2006-07-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * tools/Reorganize.java: Added tool used for reorganizing and - auto-cropping the monster spritesets. - -2006-07-03 Philipp Sehmisch <tmw@crushnet.org> - - * src/main.cpp, src/engine.cpp: Removed some no longer required old - style spritesets. - * src/being.h, src/being.cpp: Removed some no longer needed member - variables. - * src/monster.cpp: Monsters are now drawed with the new animation - system. - * src/npc.cpp, data/graphics/sprites/npcs.xml: NPCs are now drawed - with the new animation system. - * src/being.h, src/being.cpp, src/npc.cpp, src/npc.h, src/monster.cpp, - src/monster.h: Moved all drawing code from the Being based classes - into Being. - * data/graphics/sprites/monster*.png: Resized and reorganized the - monster spritesets to fit the new animation system (thanks, Bjørn). - * data/graphics/sprites/monster*.xml: Added animation files for all - monsters. - * src/animation.cpp: The offset values of the Frames of animated - sprites are now modified so every frame is drawn centered. - * data/graphics/sprites/hairstyle*.xml: Retuned the offsets of the - hair sprites. - * src/animation.cpp: Small stability fix. - * src/being.cpp, src/being.h: weapon animation now uses the new - animation system. - * data/graphics/sprites/player_male_base.xml - data/graphics/sprites/player_female_base.xml - data/graphics/sprites/hairstyle*.xml: Tuned walk speed and added bow - animations. - -2006-07-03 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/being.cpp: Removed an unnecessary parameter. - -2006-07-03 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/sprites/Makefile.am: Updated to new xml files. - -2006-07-02 Philipp Sehmisch <tmw@crushnet.org> - - * src/localplayer.cpp: Fixed the "walking against walls" bug. - * src/animation.cpp src/animation.h: fixed the "sliding" bug and - removed some unused variables. - -2006-07-01 Philipp Sehmisch <tmw@crushnet.org> - - * src/being.cpp, src/being.h, src/player.cpp, src/player.h, - src/localplayer.cpp: Sprites are now stored in a vector instead of a - list, so they can be replaced a lot easier; added female playerset; - added hairstyles and colors. - * src/animation.cpp, src/animation.h: added support for variations, - variations are animations stored in the same spriteset with the same - layout and sequence but starting at another index. - * data/graphics/sprites/player_female_base.xml: Added xml file for - female characters. - * data/graphics/sprites/hairstyle0.xml, - data/graphics/sprites/hairstyle1.xml, - data/graphics/sprites/hairstyle2.xml, - data/graphics/sprites/hairstyle3.xml, - data/graphics/sprites/hairstyle4.xml, - data/graphics/sprites/hairstyle5.xml, - data/graphics/sprites/hairstyle6.xml, - data/graphics/sprites/hairstyle7.xml: Added xml files for all - hairstyles (these xml files are using the new variation feature). - * src/being.cpp, src/being.h, src/localplayer.cpp, src/player.cpp: The - beings now haven't got one, but a list of animated sprites (named - mSprites). At the moment it contains the hair and the base sprite. - * src/animation.cpp, src/animation,h: Fixed a crash when substituting - an undefined direction; renamed completeDirections method to - substituteAction. - * data/graphics/sprites/hairstyle0.xml: Made a xml file for the hair - animation. - -2006-06-29 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/items.xml, src/being.cpp, src/being.h src/net/beinghandler.cpp, - src/player.cpp: Clients get notified of equipping visible items. - * src/net/beinghandler.cpp: GCC 4 fix. - -2006-06-28 Philipp Sehmisch <tmw@crushnet.org> - - * src/animation.cpp, src/animation.h: Parser now works like described - on the wiki; the single animation phases are now stored in structures; - drawing call for animatiedSprites moved into the animatiedSprite - class. - * src/being.cpp, src/being.h, src/localplayer.cpp, src/player.cpp: - Renamed mAnimatedSprite to mBaseSprite to distinct it from hair-equip - and other sprites that will also be part of the class. - * src/player.cpp: Drawing call for animatiedSprites moved into the - animatiedSprite class; time now correctly passed in ms to the - animatedSprite class. - * src/graphic/spriteset.cpp, src/graphic/spriteset.h: Width and height - of the subimages is now saved in the spritesheet class. - * src/graphics.cpp: Added an additional check to avoid crashes when - passing a NULL pointer as image argument. - * data/graphics/sprites/player_male_base.xml: Animation file now has - the syntax described on the wiki. - -2006-06-27 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/Makefile.am, - data/graphics/sprites/player_male_base.xml, src/being.cpp, - src/being.h, src/engine.cpp, src/localplayer.cpp, src/main.cpp, - src/net/beinghandler.cpp, src/net/playerhandler.cpp, - src/resources/itemmanager.cpp, The Mana World.dev: Added a beginning - of a new animation system to slow down player walking. - * src/animation.cpp, src/animation.h: Forgot 2 files. - * src/being.cpp, src/gui/equipmentwindow.cpp, src/player.cpp: - Equipment window now show all the slots, and adapted visible shirts to - head (middle) equipments. - -2006-06-27 Frode Lindeijer <f.lindeijer@gmail.com> - - * /tmw/trunk/data/graphics/sprites/player_male_base.png: - Fixed transparency issue with the north punching frames - -2006-06-26 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/net/messagein.cpp: Fixed the readString method (synchronized - with the server version by Guillaume Melquiond). - -2006-06-21 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/Makefile.am, - data/graphics/sprites/monster11.png, - data/graphics/sprites/monster17.png: Fixed attack animation of monster - 11 and added a new monster. - * data/graphics/sprites/Makefile.am, - data/graphics/sprites/player_female_base.png, src/being.cpp, - src/being.h, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/playerbox.cpp, src/gui/playerbox.h, src/gui/register.cpp, - src/main.cpp, src/net/beinghandler.cpp, src/net/charserverhandler.cpp, - src/player.cpp: Added female players. - -2006-06-19 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/sprites/monster16.png: added the little pink monster - -2006-05-22 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/tiles/icecave.png, data/graphics/tiles/Makefile.am, - data/maps/Makefile.am, data/maps/new_10-1.tmx.gz, - data/maps/new_11-1.tmx.gz, data/maps/new_4-1.tmx.gz, - data/maps/new_5-1.tmx.gz, src/resources/itemmanager.cpp: A bunch of - updates to the world and disabled art and type xml parser checks since - they're not used. - -2006-05-21 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Updated dev-cpp project file. - -2006-05-17 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/npcs.png, data/graphics/tiles/Makefile.am, - data/graphics/snow_building.png, data/graphics/tiles/snowset.png, - data/maps/Makefile.am, data/maps/new_11-1.tmx.gz: New NPCs, new snow - tiles and village. - -2006-05-15 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/item_amount.cpp: Set slider range to the real values instead - of mapping the amount between [0,1] and [1,max] all the time. - -2006-05-13 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/openglgraphics.cpp: Set color back to current color instead of - setting it to white. Fixes white rectangles in equipment window. - * src/being.cpp, src/being.h, src/player.cpp: Specify the color in - which speech and names are supposed to be drawn. Removed unused - mSpeechColor member. - -2006-05-12 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.cpp: Fixed initialization order in Being ctor. - -2006-05-12 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/item1202.png, - data/graphics/sprites/Makefile.am, src/being.cpp, src/being.h, - src/localplayer.cpp, src/localplayer.h, src/main.cpp, src/player.cpp, - The Mana World: You can now see the shirt when equipping a top - equipment. - -2006-05-05 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/setup_video.cpp: Fixed some numeric conversions. - -2006-05-03 Eugenio Favalli <elvenprogrammer@gmail.com> - - * configure.ac, src/game.cpp, src/graphics.cpp, src/main.cpp, - src/openglgraphics.cpp, The Mana World: Increased fps limit - granularity and cleaned some code, fixed some xml library name in - Dev-C++ project file, switched version to 0.0.20. - * src/game.cpp, src/gui/setup.cpp, src/gui/setup_video.cpp, - src/gui/setup_video.h, src/main.cpp: FPS limit can now be set in setup - dialog. Default value for FPS is 50. (Code based on peoro's patch). - -2006-05-02 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/localplayer.cpp: Fixed the delay last move bug. - -2006-04-29 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/tiles/cave.png: Added tiles by yosuhara. - -2006-04-28 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/Woodland_ground.png: Graphical update of the - woodland tileset. Paths improved, and tiles that were redunant - replaced by new dirt tiles. - * data/maps/new_9.1.tmx.gz: Modified because of changes in the tileset - layout (no new server sided walkmap required). - * data/graphics/sprites/monster11.png: Improved the shading of the - mushroom monster. - * data/graphics/sprites/monster15.png: Added dropshadow to the bat - monster (note that the version 0.0.19 live update overrides the - changed file). - -2006-04-04 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * ChangeLog: Converted to UTF-8. - * NEWS: Spelling correction. - * docs/INSTALL/debian.txt, docs/INSTALL/win32.txt: Updated with - respect to the move from CVS to Subversion. - -2006-03-25 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/window.cpp: Added window resize patch by peoro. - -2006-03-21 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Updated project. - -2006-03-20 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp: Fixed a crash on map change. - -2006-03-20 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/char_select.cpp: Fixed an include. - -2006-03-19 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/register.h, src/gui/register.cpp: Fixed a memory leak and - removed some whitespace noise. - * src/lockedarray.h, src/game.cpp, src/gui/gui.cpp, - src/gui/browserbox.cpp, src/gui/register.cpp, - src/resources/resourcemanager.cpp: Removed some useless null pointer - checks. - * src/gui/login.cpp, src/gui/setup_audio.h, src/gui/setup.cpp, - src/gui/setup_audio.cpp, src/gui/setup_video.cpp, - src/gui/setup_video.h: Removed some duplicated initializations. - * src/gui/setup_audio.h, src/gui/setup.cpp, src/gui/setup_audio.cpp, - src/gui/setup_joystick.h, src/gui/setup_video.cpp, src/gui/setuptab.h, - src/gui/setup.h, src/gui/setup_joystick.cpp, src/gui/setup_video.h, - src/Makefile.am: Splitted setup window into manageable pieces - according to their tabs in the window. Fixed some memory leaks along - the way. Also fixed two settings not being stored on "apply". - -2006-03-18 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/chat.cpp, src/gui/menuwindow.cpp, src/gui/skill.cpp, - src/gui/status.cpp: Use the window container instead of the graphics - class to calculate window positions. - * src/utils/dtor.h: Fixed indentation. - * src/configuration.cpp, src/log.cpp, src/main.cpp, src/being.cpp, - src/monster.cpp, src/gui/equipmentwindow.cpp, src/gui/sell.cpp, - src/gui/trade.cpp, src/gui/char_server.cpp, src/gui/setup.cpp, - src/gui/updatewindow.cpp, src/gui/char_select.cpp, - src/gui/ministatus.cpp, src/gui/debugwindow.cpp, - src/gui/tabbedcontainer.cpp, src/gui/inventorywindow.cpp, - src/gui/buy.cpp, src/gui/itemcontainer.cpp, src/gui/inttextbox.cpp, - src/gui/debugwindow.h, src/gui/status.cpp, src/gui/register.cpp, - src/net/chathandler.cpp, src/engine.cpp, src/utils/tostring.h, - src/Makefile.am: Added a toString conversion function. - -2006-03-15 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.h, src/main.cpp, src/gui/equipmentwindow.cpp, - src/gui/window.cpp, src/gui/login.cpp, src/gui/listbox.h, - src/gui/chat.h, src/gui/ministatus.cpp, src/gui/chat.cpp, - src/gui/help.cpp, src/gui/itemcontainer.cpp, src/gui/listbox.cpp, - src/gui/checkbox.cpp, src/engine.cpp, src/resources/image.cpp: A bunch - of cosmetic changes. - * src/net/network.cpp: Fixed connection not being shut down completely - in case of an error. - -2006-03-13 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/main.cpp: Fixed skip update option. - -2006-03-13 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_7.1.tmx.gz: Fixed some map bugs (update of server - sided walkmap required!) - -2006-03-11 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/hairstyle1.png, - data/graphics/sprites/hairstyle2.png, - data/graphics/sprites/hairstyle3.png, - data/graphics/sprites/hairstyle4.png, - data/graphics/sprites/hairstyle6.png, - data/graphics/sprites/hairstyle7.png, - data/graphics/sprites/Makefile.am: Fixed some hair positions, added a - new style, updated makefile. - -2006-03-09 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/utils/dtor.h: Added guards. - * src/game.cpp, src/main.cpp, src/gui/connection.cpp, - src/gui/menuwindow.cpp, src/net/tradehandler.cpp, - src/net/playerhandler.cpp: Made all local action listeners structs and - moved them into anonymous namespaces. - * src/gui/connection.cpp, src/gui/newskill.cpp, - src/gui/chargedialog.cpp, src/gui/updatewindow.cpp, - src/gui/progressbar.h, src/gui/ministatus.cpp, - src/gui/progressbar.cpp, src/gui/status.cpp: Removed coordinate - arguments from ProgressBar ctor. - * src/openglgraphics.cpp, src/localplayer.cpp, src/game.cpp, - src/map.cpp, src/log.cpp, src/being.cpp, src/monster.cpp, src/sound.h, - src/graphics.cpp, src/gui/equipmentwindow.cpp, src/gui/sell.cpp, - src/gui/trade.cpp, src/gui/char_server.cpp, src/gui/window.cpp, - src/gui/login.cpp, src/gui/inttextbox.h, src/gui/chargedialog.h, - src/gui/focushandler.h, src/gui/skill.h, src/gui/gui.cpp, - src/gui/newskill.cpp, src/gui/register.h, src/gui/popupmenu.h, - src/gui/setup.cpp, src/gui/npclistdialog.h, src/gui/chargedialog.cpp, - src/gui/playerbox.h, src/gui/char_select.cpp, src/gui/login.h, - src/gui/focushandler.cpp, src/gui/chat.h, src/gui/inventorywindow.h, - src/gui/newskill.h, src/gui/ministatus.cpp, src/gui/buy.h, - src/gui/playerbox.cpp, src/gui/setup.h, src/gui/itemcontainer.h, - src/gui/debugwindow.cpp, src/gui/chat.cpp, src/gui/char_select.h, - src/gui/inventorywindow.cpp, src/gui/help.cpp, src/gui/status.h, - src/gui/buy.cpp, src/gui/itemcontainer.cpp, src/gui/equipmentwindow.h, - src/gui/sell.h, src/gui/trade.h, src/gui/ministatus.h, - src/gui/inttextbox.cpp, src/gui/char_server.h, src/gui/window.h, - src/gui/skill.cpp, src/gui/debugwindow.h, src/gui/status.cpp, - src/gui/register.cpp, src/gui/popupmenu.cpp, src/gui/minimap.cpp, - src/gui/npclistdialog.cpp, src/gui/help.h, src/net/buysellhandler.cpp, - src/net/beinghandler.cpp, src/net/charserverhandler.cpp, - src/net/maploginhandler.cpp, src/net/playerhandler.cpp, - src/engine.cpp, src/localplayer.h, src/beingmanager.cpp, src/map.h, - src/log.h, src/sound.cpp, src/resources/itemmanager.h, - src/resources/buddylist.cpp, src/resources/buddylist.h, - src/resources/image.cpp, src/resources/image.h, - src/resources/itemmanager.cpp, src/being.h, src/player.cpp: Made all - class members named like mClassMember. - * src/floor_item.cpp, src/map.cpp, src/being.cpp, - src/gui/equipmentwindow.cpp, src/gui/playerbox.cpp, - src/gui/itemcontainer.cpp, src/graphic/spriteset.cpp, - src/graphic/spriteset.h, src/player.cpp: Added Spriteset::get() and - Spriteset::size() to hide the member vector and remove the weird - mySpriteset->spriteset stuff. - * src/gui/buddywindow.cpp, src/gui/connection.cpp, src/gui/sell.cpp, - src/gui/trade.cpp, src/gui/char_server.cpp, src/gui/login.cpp, - src/gui/button.h, src/gui/newskill.cpp, src/gui/setup.cpp, - src/gui/updatewindow.cpp, src/gui/button.cpp, src/gui/char_select.cpp - ,src/gui/item_amount.cpp, src/gui/npc_text.cpp, src/gui/ok_dialog.cpp, - src/gui/confirm_dialog.cpp, src/gui/debugwindow.cpp, - src/gui/tabbedcontainer.cpp, src/gui/inventorywindow.cpp, - src/gui/help.cpp, src/gui/menuwindow.cpp, src/gui/buy.cpp, - src/gui/skill.cpp, src/gui/buysell.cpp, src/gui/status.cpp, - src/gui/register.cpp, src/gui/npclistdialog.cpp: Made the Button ctor - accept eventId and action listener. - * src/localplayer.cpp, src/game.cpp, src/gui/trade.cpp, - src/gui/inventorywindow.cpp, src/gui/trade.h, src/localplayer.h, - src/game.h: Use std::auto_ptr in some places. - * src/lockedarray.h: Use fill_n instead of for-loop. - * src/gui/browserbox.cpp: Make the MouseOverLink functor dynamic and - use a STL algorithm in one more place. - -2006-03-08 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/browserbox.h, src/gui/menuwindow.cpp, src/gui/buysell.cpp: - Some fixes for compiling with pedantic compiler settings and const - char* checks. - * data/graphics/sprites/player_male_base.png: Use two rows for each - direction in order to make the texture less wide so that it stays - within the 1024 texture limit for OpenGL mode. - -2006-03-08 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/map.cpp, src/main.cpp, src/gui/button.cpp, - src/gui/textfield.cpp, src/gui/playerbox.cpp, - src/gui/windowcontainer.cpp, src/gui/skill.cpp, - src/gui/scrollarea.cpp, src/engine.cpp, src/beingmanager.cpp, - src/utils, src/utils/dtor.h, src/Makefile.am, - src/flooritemmanager.cpp, src/graphic/spriteset.cpp: Added a 'dtor' - helper functor to delete objects in arrays and containers using STL - algorithms. - * src/resources/image.cpp: Removed some conditional code. - * src/localplayer.cpp, src/gui/gui.cpp: Reverted changes from r2225, - it broke walking code as I missed the differences between tile and - being collisions. - * src/gui/itemcontainer.cpp, src/inventory.cpp: Made Inventory use STL - algorithms and fixed getLastUsedSlot semantics. - * src/engine.cpp, src/engine.h: Moved a variable definition into the - right place and made getCurrentMap inline. - * src/equipment.cpp, src/equipment.h: Use STL algorithms and make - destructor inline. - * src/localplayer.cpp, src/gui/gui.cpp: Let the LocalPlayer decide - whether it can walk to a destination. - -2006-03-07 Yohann Ferreira <bertram@cegetel.net> - - * debian/rules, debian/changelog, ChangeLog: Updating Debian files for - 0.0.19 release. - -2006-03-07 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/tiles/Makefile.am, data/graphics/tiles/Woodland.png: - Removed unused tileset. - -2006-03-06 Björn Steinbrink <B.Steinbrink@gmx.de> - - * configure.ac: Version changed to 0.0.19. - -2006-03-06 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_9.1.tmx.gz: Fixed some mapping bugs. - -2006-03-06 Eugenio Favalli <elvenprogrammer@gmail.com> - - * AUTHORS, NEWS, README, data/help/changes.txt, data/help/header.txt, - data/help/team.txt: A bunch of updates to docs, ready for 0.0.19. - * data/help/changes.txt, src/main.cpp: Small fixes before releasing. - -2006-03-05 Björn Steinbrink <B.Steinbrink@gmx.de> - - * data/graphics/sprites/Makefile.am: Remove trailing whitespace. - * src/engine.cpp: Re-add main.h header, Windows build needs it. - -2006-03-05 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/player_male_base.png: Added pants. - -2006-03-02 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/weapon1.png: Added missing frames. - * src/player.cpp: Fixed north shooting hair position. - * data/graphics/sprites/Makefile.am: Added new graphics. - * data/graphics/sprites/monster15.png: Added bat monster. - -2006-03-01 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Enabled -Wall switch. - * data/graphics/sprites/monster9.png: Fixed fire goblin north walking - animation. - * data/graphics/sprites/hairstyle1.png, - data/graphics/sprites/hairstyle2.png, - data/graphics/sprites/hairstyle3.png, - data/graphics/sprites/hairstyle4.png, - data/graphics/sprites/hairstyle5.png, - data/graphics/sprites/hairstyle6.png, - data/graphics/sprites/player_male_base.png, - data/graphics/sprites/weapon0.png, - data/graphics/sprites/weapon1.png: New graphics for hair styles, - player and weapons. - * src/being.cpp, src/being.h, src/engine.cpp, src/gui/playerbox.cpp, - src/localplayer.cpp, src/main.cpp, beinghandler.cpp, player.cpp, - src/resources/image.cpp: Hacked code to support the new playerset. - -2006-02-25 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/beingmanager.cpp, src/beingmanager.h, src/engine.cpp, - src/main.h, src/sound.h: Added a logic method to the being manager. - -2006-02-24 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.cpp, src/being.h, src/configuration.cpp, - src/configuration.h, src/engine.cpp, src/map.cpp, src/map.h, - src/properties.h, src/gui/browserbox.cpp, src/gui/browserbox.h, - src/gui/chat.cpp, src/gui/chat.h, src/gui/gccontainer.cpp, - src/gui/gccontainer.h, src/gui/minimap.cpp, - src/gui/tabbedcontainer.cpp, src/gui/tabbedcontainer.h, - src/net/network.cpp, src/net/network.h, src/resources/itemmanager.cpp, - src/resources/itemmanager.h: Another bunch of cosmetic cleanups, i.e. - mostly typedefs... - -2006-02-23 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.cpp, src/being.h, src/beingmanager.cpp, - src/beingmanager.h, src/engine.cpp, src/inventory.cpp, - src/inventory.h, src/logindata.h, src/main.cpp, src/main.h, - src/openglgraphics.cpp, src/gui/equipmentwindow.h, - src/gui/minimap.cpp, src/gui/minimap.h, src/gui/windowcontainer.cpp, - src/gui/windowcontainer.h, src/net/loginhandler.cpp: A bunch of mostly - cosmetic cleanups. - -2006-02-23 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_4.1.tmx.gz: I remapped the hermits cave. It looks much - more natural now. A new server sided walkmap is required. - -2006-02-22 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/cave.png: fixed two almost invisible pixel - errors - -2006-02-21 Philipp Sehmisch <tmw@crushnet.org> - - * data/maps/new_9.1.tmx.gz: fixed another map bug. - -2006-02-05 Yohann Ferreira <bertram@cegetel.net> - - * src/resources/itemmanager.cpp: Added warnings when parameters are - missing in the items xml file. - -2006-02-16 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/browserbox.cpp, src/gui/browserbox.h, src/gui/gui.cpp: Use - Widget::mFont instead of browerFont for drawing, fixes the "gui - needs to be valid real early" issue. - -2006-02-07 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.cpp, src/being.h, src/game.cpp, src/localplayer.cpp, - src/localplayer.h, src/monster.cpp, src/player.cpp, - src/net/messagein.cpp, src/net/protocol.cpp: Made the being directions - being stored in a bitfield. - -2006-02-06 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/Woodland_ground.png, - data/graphics/tiles/Woodland_x2.png, data/maps/new_9.1.tmx.gz: added - dynamic grass that covers the lower area of sprites (doesn't work for - flower beds yet). - -2006-02-06 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/net/tradehandler.cpp: Updated Dev-Cpp project - file, fixed a gcc 3.4 issue. - * src/net/tradehandler.cpp: Undone last changes because Bertram - already fixed the compiler issue. - -2006-02-06 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/game.cpp, src/joystick.cpp, src/joystick.h, - src/gui/setup.cpp, src/gui/setup.h: Added a Joystick class. - * src/being.cpp, src/being.h, src/monster.cpp, src/npc.cpp: Unify some - of the drawing code for beings. - * src/being.cpp, src/being.h, src/localplayer.h, src/player.cpp, - src/player.h: Use virtual methods instead of getType() checks. - * data/graphics/gui/browserfont.png, - data/graphics/gui/fixedfont.png, data/graphics/gui/rpgfont_wider.png, - data/graphics/gui/sansserif8.png, src/Makefile.am, src/engine.cpp, - src/floor_item.cpp, src/floor_item.h, src/flooritemmanager.cpp, - src/flooritemmanager.h, src/game.cpp, src/gui/gui.cpp, - src/net/itemhandler.cpp: Introduced a FloorItemManager class. - -2006-02-05 Yohann Ferreira <bertram@cegetel.net> - - * data/graphics/gui/rpgfont_wider.png, - data/graphics/gui/fixedfont.png,data/graphics/gui/browserfont.png, - data/graphics/gui/sansserif8.png: Adding è accents mostly to the font - images. - * src/engine.cpp, src/being.h, src/being.cpp, src/player.cpp, - src/gui/char_select.h, src/gui/char_select.cpp: Made the nickname and - emotions displayed above every layers. Made the delete and ok buttons - be disabled once the character is selected at login. - * src/net/tradehandler.cpp, src/resources/itemmanager.cpp: Fixed a gcc - 4.0 issue in the tradehandler. Strengthen the xml parser in the - itemmanager so tmw doesn't crash anymore if an item lacks some - parameters. - -2006-02-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * INSTALL: Updated dependencies in response to patch by Hanno Braun. - -2006-02-05 Björn Steinbrink <B.Steinbrink@gmx.de> - - * data/graphics/tiles/Makefile.am: Added the new tilesets. - * src/localplayer.cpp, src/localplayer.h, src/gui/gui.cpp: Made the - player walk to items prior to picking them up. - -2006-02-04 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/Woodland.png: new path design - * data/graphics/tiles/Woodland_ground.png, - data/graphics/tiles/Woodland_x2.png, - data/graphics/tiles/Woodland_x3.png: splitted the tileset into three - tilesets with different tile sizes - (i kept the original tileset for backward compatiblity) - * data/maps/new_9.1.tmx.gz: remapped with the oversized tile - technology. made the forests less regular. made the unwalkable map - borders more visual appealing - -2006-02-04 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/localplayer.h, src/logindata.h, src/main.cpp, src/main.h, - src/gui/char_select.cpp, src/gui/char_server.cpp, - src/gui/char_server.h, src/net/charserverhandler.cpp, - src/net/charserverhandler.h, src/net/loginhandler.cpp, - src/net/loginhandler.h, src/net/network.cpp, src/net/network.h: Unify - the gui code for the various logins to use LoginData. - -2006-02-03 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/logindata.h, src/main.cpp, src/gui/login.cpp, src/gui/login.h: - Made the login dialog work on LoginData only, without playing with the - config, it's not its job to do so. - * src/net/protocol.cpp, src/net/protocol.h: Removed some unused code. - -2006-02-02 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/desert1.png, data/graphics/tiles/desert2.png, - data/graphics/tiles/desert_x2.png, data/graphics/tiles/desert_x3.png: - Replaced the old sand tile with Irucards new one. Added new crates. - Made some minor corrections. - -2006-02-01 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/game.h, src/main.cpp: Created a Game class. - * src/gui/passwordfield.cpp: Removed duplicated code. - * src/Makefile.am, src/main.cpp, src/gui/error.cpp, src/gui/error.h: - Replaced ErrorDialog by OkDialog + listener. - * src/Makefile.am, src/game.cpp, src/gui/buysell.cpp, - src/gui/char_select.cpp, src/gui/confirm_dialog.cpp, - src/gui/confirm_dialog.h, src/gui/login.cpp, src/gui/login.h, - src/gui/menuwindow.cpp, src/gui/ok_dialog.cpp, src/gui/ok_dialog.h, - src/gui/register.cpp, src/gui/requesttrade.cpp, - src/gui/requesttrade.h, src/gui/setup.cpp, src/net/playerhandler.cpp, - src/net/tradehandler.cpp: Made the OkDialog and ConfirmDialog classes - proxies for their buttons' events. Removed the RequestTradeWindow - class, replaced with a plain ConfirmDialog. Fixed a memory leak along - the way. - - * src/gui/buysell.cpp, src/gui/menuwindow.cpp: Simplified button - creation code. - * src/gui/npc_text.cpp: Fixed a bug where the game crashes if there's a - message dialog from a npc that no longer exists. - * src/properties.h: Reverted properties to private. - -2006-01-31 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/setup.cpp: Cleanup. - * src/gui/requesttrade.cpp, src/gui/requesttrade.h: Made - RequestTradeDialog inherit from ConfirmDialog. - * src/Makefile.am, src/gui/buy.cpp, src/gui/buy.h, src/gui/sell.cpp, - src/gui/sell.h, src/gui/shop.cpp, src/gui/shop.h: Created a ListModel - for ShopItems. - * src/floor_item.cpp, src/graphics.h, src/map.cpp, src/map.h, - src/properties.h, src/sprite.h, src/gui/login.cpp, - src/gui/scrollarea.cpp, src/gui/windowcontainer.cpp, - src/resources/sdlimageloader.cpp: Various small cleanups. - * src/resources/resource.cpp, src/resources/resourcemanager.cpp, - src/resources/resource.h, src/resources/resourcemanager.h: Made - ResourceManager a friend of Resource to avoid looping over decRef, - which returns void now. - -2006-01-30 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/char_select.cpp, src/gui/confirm_dialog.cpp, - src/gui/confirm_dialog.h, src/gui/error.cpp, src/gui/error.h, - src/gui/ministatus.cpp, src/gui/ok_dialog.cpp, src/gui/ok_dialog.h, - src/gui/setup.cpp, src/net/charserverhandler.cpp: A few cleanups and - simplifications. - -2006-01-26 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/game.h, src/main.cpp: Moved some setup code out of - the game loop into the setup functions. Setup functions are now called - from the outside. - -2006-01-22 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/main.cpp: Updated Dev-Cpp project file, fixed - a GDI issue. - -2006-01-22 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/net/network.cpp: Make dispatchMessages actually - handle more than one message per call. - * src/main.cpp: Remove obsoleted action listeners. - * src/main.cpp: Use generic error method for sound failure. - * src/main.cpp, src/net/charserverhandler.cpp, - src/net/loginhandler.cpp, src/net/maploginhandler.cpp, - src/net/network.cpp: Unify some network stuff in the main loop and fix - a bug in the network class that triggers when a handlers survives the - network object. - -2006-01-21 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/browserbox.cpp: Applied a patch by Ar2ro that works around - the problems with line wrapping in the chatbox. Note though that this - while code should be properly rewritten later. - -2006-01-20 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Updated Dev-Cpp project file. - -2006-01-20 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/equipment.h, src/game.cpp, src/game.h, src/main.h, - src/gui/buddywindow.cpp, src/gui/buddywindow.h, - src/gui/chargedialog.h, src/gui/connection.cpp, src/gui/connection.h, - src/gui/equipmentwindow.cpp, src/gui/equipmentwindow.h, - src/gui/linkhandler.h, src/gui/ministatus.h, src/gui/register.h, - src/net/protocol.h, src/resources/mapreader.h: Header, class - declaration and include cleanup. - * src/localplayer.cpp, src/localplayer.h, src/gui/requesttrade.cpp, - src/net/tradehandler.cpp: Made the local player object care about its - trading state, later this could be used for different stuff, like the - player setting itself to auto-decline trade offers without messing up - the code in the tradehandler. Removed message sending code from the - trade handler. - * src/npc.cpp, src/npc.h: Added the files for real this time. - * src/npc.cpp, src/npc.h, src/Makefile.am, src/being.cpp, - src/beingmanager.cpp, src/beingmanager.h, src/engine.cpp, - src/engine.h, src/game.cpp, src/game.h, src/localplayer.cpp, - src/localplayer.h, src/map.cpp, src/gui/buy.cpp, src/gui/buysell.cpp, - src/gui/buysell.h, src/gui/gui.cpp, src/gui/minimap.cpp, - src/gui/npc.cpp, src/gui/npc.h, src/gui/npc_text.cpp, - src/gui/npc_text.h, src/gui/npclistdialog.cpp, - src/gui/npclistdialog.h, src/gui/popupmenu.cpp, - src/gui/requesttrade.cpp, src/gui/requesttrade.h, src/gui/sell.cpp, - src/gui/setup.cpp, src/gui/skill.cpp, src/gui/skill.h, - src/gui/status.cpp, src/gui/status.h, src/net/buysellhandler.cpp, - src/net/charserverhandler.cpp, src/net/chathandler.cpp, - src/net/equipmenthandler.cpp, src/net/npchandler.cpp, - src/net/playerhandler.cpp, src/net/protocol.cpp, - src/net/tradehandler.cpp: Added a class for NPCs. Removed network - stuff from a bunch of gui dialog classes. Cleaned up some gui class - declarations and checked a bunch of includes for being useless. - -2006-01-19 Eugenio Favalli <elvenprogrammer@gmail.com> - - * INSTALL, README, The Mana World.dev, data/help/support.txt, - docs/INSTALL/debian.txt, docs/INSTALL/win32.txt, docs/progression.txt: - Updated infos on new irc channel. - -2006-01-14 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/main.cpp, src/main.h, src/gui/char_server.cpp, - src/gui/char_server.h: Moved network code out of the - ServerSelectDialog. - * src/gui/char_select.cpp, src/gui/char_select.h: Change setPlayerInfo - to updatePlayerInfo, as there's now a convenient wrapper around the - plain data. - * src/Makefile.am, src/lockedarray.cpp, src/lockedarray.h, - src/main.cpp, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/net/charserverhandler.cpp, - src/net/charserverhandler.h, src/net/network.cpp, src/net/network.h: - Created a single CharServerHandler. Created a LockedArray class to - "synchronize" access to arrays. Moved a bunch of networking out of the - char server related gui classes. - * src/Makefile.am, src/logindata.h, src/main.cpp, src/main.h, - src/gui/login.cpp, src/gui/login.h, src/gui/register.cpp, - src/gui/register.h: Removed network code from login and register - dialogs. - * src/gui/login.cpp, src/gui/login.h: Removed unused var. - * src/main.cpp, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/char_server.h, - src/gui/connection.cpp, src/gui/connection.h, src/gui/error.cpp, - src/gui/error.h, src/gui/login.cpp, src/gui/login.h, - src/gui/register.cpp, src/gui/register.h, src/gui/updatewindow.cpp, - src/gui/updatewindow.h: Removed the pre-game input handlers and - unified them in main.cpp. Some header and class cleanups. - * src/net/maploginhandler.cpp, src/net/maploginhandler.h, - src/Makefile.am, src/engine.cpp, src/engine.h, src/game.cpp, - src/main.cpp, src/gui/connection.cpp, src/gui/connection.h, - src/net/playerhandler.cpp: Made changeMap() care about sending the - map-loaded message. Removed network stuff from connection dialog. - -2006-01-13 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/gui/login.cpp, src/gui/login.h, - src/gui/register.cpp, src/net/loginhandler.cpp, - src/net/loginhandler.h: Remove duplicated code by unifying the message - handlers for login and register. - * src/gui/char_server.cpp, src/gui/char_server.h: Removed the polling - loop. - * src/gui/char_select.cpp, src/gui/char_select.h: Remove destructor - again, no idea why the compiler complained earlier. - * src/gui/char_select.cpp, src/gui/char_select.h: Created a message - handler for character creation and cleaned up the header file. - * src/gui/register.cpp, src/gui/register.h: Added a message handler - and removed the polling loop. - * src/net/network.cpp: Add recognition of disconnects. - * src/gui/connection.cpp, src/gui/connection.h, - src/net/playerhandler.cpp: Removed the polling loop and the duplicate - login message handler. - * src/gui/login.cpp, src/gui/login.h: Remove polling loop, the new - network code takes care of all that. - * src/net/network.cpp: Make sure that we don't send anything when not - connected. - * src/gui/login.cpp: Added a handler for network messages. - * src/game.cpp, src/net/beinghandler.cpp, src/net/beinghandler.h, - src/net/buysellhandler.cpp, src/net/buysellhandler.h, - src/net/chathandler.cpp, src/net/chathandler.h, - src/net/equipmenthandler.cpp, src/net/equipmenthandler.h, - src/net/inventoryhandler.cpp, src/net/inventoryhandler.h, - src/net/itemhandler.cpp, src/net/itemhandler.h, - src/net/messagehandler.cpp, src/net/messagehandler.h, - src/net/npchandler.cpp, src/net/npchandler.h, - src/net/playerhandler.cpp, src/net/playerhandler.h, - src/net/skillhandler.cpp, src/net/skillhandler.h, - src/net/tradehandler.cpp, src/net/tradehandler.h: Reverted the patch - to make the handlers register themselves, this just cannot work. - * src/game.cpp: Small cleanup. - * src/game.cpp, src/localplayer.cpp, src/localplayer.h: Made emote() a - method of the LocalPlayer class. - -2006-01-12 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/main.cpp, src/net/beinghandler.cpp, - src/net/beinghandler.h, src/net/buysellhandler.cpp, - src/net/buysellhandler.h, src/net/chathandler.cpp, - src/net/chathandler.h, src/net/equipmenthandler.cpp, - src/net/equipmenthandler.h, src/net/inventoryhandler.cpp, - src/net/inventoryhandler.h, src/net/itemhandler.cpp, - src/net/itemhandler.h, src/net/messagehandler.cpp, - src/net/messagehandler.h, src/net/npchandler.cpp, - src/net/npchandler.h, src/net/playerhandler.cpp, - src/net/playerhandler.h, src/net/skillhandler.cpp, - src/net/skillhandler.h, src/net/tradehandler.cpp, - src/net/tradehandler.h: Added a constructor parameter to the - MessageHandler class to support it self-registering to a network. - * src/game.cpp, src/net/beinghandler.cpp, src/net/network.cpp, - src/net/network.h, src/net/playerhandler.cpp: Moved the last few - messages out of the game loop into handlers. Added logging of - unhandled messages to the network class. - * src/Makefile.am, src/game.cpp, src/net/skillhandler.cpp, - src/net/skillhandler.h: Added a dedicated handler for skill messages. - * src/game.cpp, src/net/beinghandler.cpp: Moved some messages into the - being message handler. - * src/net/playerhandler.cpp: Fixed death listener. - * src/Makefile.am, src/game.cpp, src/net/playerhandler.cpp, - src/net/playerhandler.h: Added a dedicated handler for player - messages. - * src/game.cpp, src/net/chathandler.cpp: Moved WHO answer and some MVP - thing into the chat handler. - * src/Makefile.am, src/game.cpp, src/net/npchandler.cpp, - src/net/npchandler.h: Added a dedicated handler for npc messages. - * src/Makefile.am, src/game.cpp, src/net/itemhandler.cpp, - src/net/itemhandler.h: Added a dedicated handler for item messages. - * src/net/messagehandler.cpp, src/Makefile.am, src/game.cpp, - src/gui/char_select.cpp, src/gui/char_server.cpp, - src/gui/connection.cpp, src/net/messagehandler.h, src/net/network.cpp, - src/net/tradehandler.cpp, src/net/tradehandler.h: Made the - MessageHandler class aware of the network it is listening to and - unregistering itself. - * src/Makefile.am, src/beingmanager.cpp, src/beingmanager.h, - src/engine.cpp, src/game.cpp, src/net/beinghandler.cpp, - src/net/beinghandler.h: Added a dedicated handler for being messages. - Made the beingManager care about map changes. - * src/net/network.cpp: Removed some debug output. - * src/Makefile.am, src/game.cpp, src/net/inventoryhandler.cpp, - src/net/inventoryhandler.h: Added a dedicated handler for inventory - messages. - * src/game.cpp, src/inventory.cpp, src/inventory.h, - src/localplayer.cpp, src/localplayer.h, src/gui/trade.cpp, - src/net/buysellhandler.cpp, src/net/equipmenthandler.cpp, - src/net/tradehandler.cpp: Added delegation methods for inventory stuff - to the LocalPlayer class. Removed some unneeded includes. - * src/Makefile.am, src/game.cpp, src/net/equipmenthandler.cpp, - src/net/equipmenthandler.h: Added a dedicated handler for equipment - messages. - * src/game.cpp, src/localplayer.h: Removed unions, array are indexed - by the existing enums now. - * src/Makefile.am, src/game.cpp, src/net/buysellhandler.cpp, - src/net/buysellhandler.h: Added a dedicated handler for buy and sell - messages. - * src/Makefile.am, src/game.cpp, src/net/chathandler.cpp, - src/net/chathandler.h, src/net/tradehandler.cpp: Added a dedicated - handler for chat messages. - -2006-01-11 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/game.cpp, src/game.h, src/gui/popupmenu.cpp, - src/gui/requesttrade.h, src/net/messagehandler.h, src/net/network.cpp, - src/net/network.h, src/net/tradehandler.cpp, src/net/tradehandler.h: - Added a dedicated handler for trade messages. - * gui/char_select.cpp, gui/char_server.cpp, gui/connection.cpp, - net/messagehandler.h, net/network.cpp: Fixed a memory leak. - * src/Makefile.am, src/game.cpp, src/localplayer.cpp, src/main.cpp, - src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/char_server.h, - src/gui/connection.cpp, src/gui/connection.h, src/gui/gui.cpp, - src/gui/popupmenu.cpp, src/net/messagehandler.h, src/net/network.cpp, - src/net/network.h, src/net/protocol.cpp, src/net/protocol.h: Fixed - networking thread. Made skip calls queuable. Added MessageHandler base - class and added derived message handlers for some stuff. - * src/being.h, src/beingmanager.cpp, src/beingmanager.h, - src/game.cpp, src/game.h, src/localplayer.cpp, src/localplayer.h, - src/main.cpp, src/gui/buy.cpp, src/gui/buy.h, src/gui/buysell.cpp, - src/gui/buysell.h, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/char_server.h, src/gui/chat.cpp, - src/gui/chat.h, src/gui/connection.cpp, src/gui/connection.h, - src/gui/gui.cpp, src/gui/login.cpp, src/gui/login.h, src/gui/npc.cpp, - src/gui/npc.h, src/gui/npc_text.cpp, src/gui/npc_text.h, - src/gui/popupmenu.cpp, src/gui/register.cpp, src/gui/register.h, - src/gui/requesttrade.cpp, src/gui/requesttrade.h, src/gui/sell.cpp, - src/gui/sell.h, src/gui/skill.cpp, src/gui/skill.h, - src/gui/status.cpp, src/gui/status.h, src/gui/trade.cpp, - src/gui/trade.h, src/net/messageout.cpp, src/net/messageout.h, - src/net/network.cpp, src/net/network.h, src/net/protocol.cpp, - src/net/protocol.h: Created a network class. - -2006-01-10 Philipp Sehmisch <tmw@crushnet.org> - - * data/graphics/tiles/Woodland.png: color modifications - * data/maps/new_9-1.tmx.gz: some more errors fixed - -2006-01-09 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp: Fixed canceled/cancelled inconsistency. - -2006-01-08 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/floor_item.cpp, src/floor_item.h, src/game.cpp, - src/localplayer.cpp, src/localplayer.h, src/gui/gui.cpp, - src/gui/popupmenu.cpp, src/net/protocol.cpp, src/net/protocol.h: Made - find_floor_item_by_cor return the item instead of its id. Made pickUp - a method of the LocalPlayer class. - * equipment.cpp, equipment.h, game.cpp, inventory.cpp, inventory.h, - localplayer.cpp, localplayer.h, gui/equipmentwindow.cpp, - gui/inventorywindow.cpp, gui/item_amount.cpp, gui/popupmenu.cpp: Made - inventory and equipment properties of the LocalPlayer class. - * src/game.cpp, src/game.h, src/gui/connection.cpp: Removed some - globals. - -2006-01-07 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/localplayer.cpp, src/localplayer.h: Created a walk - method for LocalPlayer. - -2006-01-07 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/maps/new_9-1.tmx.gz: Crush fixed the issues reported on wiki. - * The Mana World.dev, src/game.cpp, src/gui/setup.cpp, src/gui/setup.h, - src/main.cpp: Removed --skipupdate option from Dev.Cpp project file, - splitted the setup window into 3 tabs and added a joystick calibration - tool. - -2006-01-06 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/localplayer.cpp: Changed semantics for auto - target. The player now keeps attacking the select target till he - selects an other one, and not just by running into another one. - * src/being.cpp, src/beingmanager.cpp, src/beingmanager.h, - src/game.cpp, src/localplayer.h, src/gui/char_select.cpp, - src/gui/char_server.cpp: Fix local player id being wrongly assigned - causing various issues. - * src/gui/status.cpp: Fix attributes not being shown. - * src/Makefile.am, src/being.cpp, src/being.h, src/beingmanager.cpp, - src/beingmanager.h, src/engine.cpp, src/game.cpp, src/game.h, - src/localplayer.cpp, src/localplayer.h, src/main.cpp, src/map.cpp, - src/monster.cpp, src/monster.h, src/player.cpp, src/player.h, - src/playerinfo.h, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/chargedialog.cpp, src/gui/chat.cpp, - src/gui/gui.cpp, src/gui/inventorywindow.cpp, src/gui/minimap.cpp, - src/gui/ministatus.cpp, src/gui/popupmenu.cpp, src/gui/skill.cpp, - src/gui/status.cpp, src/gui/status.h, src/net/protocol.cpp, - src/net/protocol.h: Created subclasses of the Being class to move - specific code there. Added a BeingManager to remove use of globals. - Moved PLAYERINFO stuff into the new LocalPlayer class. - -2006-01-05 Björn Steinbrink <B.Steinbrink@gmx.de> - - * engine.cpp, engine.h, game.cpp, game.h, gui/buysell.h, - gui/chargedialog.h, gui/debugwindow.cpp, gui/debugwindow.h, gui/gui.h, - gui/ministatus.h, gui/npc_text.h, gui/sell.h, gui/setup.h: Remove some - useless code. - -2006-01-04 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/Makefile.am, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/confirm_dialog.cpp, - src/gui/confirm_dialog.h, src/gui/ok_dialog.cpp, src/gui/ok_dialog.h, - src/gui/trade.cpp, src/playerinfo.h: Reverted r0nny changes, enabled 3 - slots to create players, smoothed player deletion. - -2006-01-04 Icy <icywolf@web.de> - - * src/game.cpp, src/main.cpp, src/main.h: FreeBSD fixes to The Mana - World. - -2006-01-03 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp, src/gui/chat.cpp, src/gui/chat.h, src/gui/login.cpp, - src/gui/trade.cpp: Really disabled /commands and added proper message - when logging in and banned. - * src/game.cpp, src/gui/chat.cpp, src/gui/chat.h, src/net/protocol.h: - Enabled some /commands. - * src/main.cpp: Fixed a compile warning with GCC 4.1. - -2006-01-02 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/login.cpp, src/gui/register.cpp: - Smoothed also character creation, buttons are now disabled during - connection/data phase. - -2006-01-01 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/login.cpp, src/gui/login.h: Remove tracking of OkDialog, the - garbage collection stuff takes care of deletion and breaks manual - tracking. - -2006-01-01 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/main.cpp: Applied patch by pclouds that allows for a faster - login sequence by providing the username and password from the command - line, and allowing the client to choose the default server and - character. - -2005-12-30 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/gui/chat.cpp, src/gui/chat.h: Applied patch by pclouds to have - the chat window temporarily become visible when chatting while it is - hidden. - -2005-12-30 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, data/graphics/sprites/items.png, - data/items.xml, src/Makefile.am, src/gui/char_select.cpp, - src/gui/char_server.cpp, src/gui/login.cpp, src/gui/login.h, - src/main.cpp, src/main.h, src/net/network.cpp, src/net/network.h, - src/gui/register.cpp, src/gui/register.h: Added a new item, improved - smooth login sequence, added a registration window (a lot of - duplicated code to be removed). - -2005-12-29 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, data/maps/new_10-1.tmx.gz, - src/gui/char_select.cpp, src/gui/char_select.h, src/gui/char_server.cpp, - src/gui/char_server.h, src/gui/connection.cpp, src/gui/connection.h, - src/gui/login.cpp, src/gui/login.h, src/net/network.h: Restored Dev-Cpp - default execution options, updated walkmap in snow map, smoothed login - sequence. - -2005-12-29 Jan-Fabian Humann <malastare@gmx.net> - - * src/gui/gui.cpp: Added rather ugly workaround to prevent a on-start - crash by Doener. Fixed GCC 3.3.6 and 4.x paranthesis problem, patch - by r0nny. Fixed popupMenu not showing on items. - -2005-12-29 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/gui/popupmenu.cpp, src/net/protocol.cpp: Remove - duplicated code for picking up items as patched by pclouds. - * src/game.cpp, src/gui/gui.cpp, src/gui/gui.h, - src/gui/inventorywindow.cpp, src/gui/popupmenu.h: Added popup support - to the Gui and moved the according code there to get rid of some nasty - hack that made them disappear. - * src/game.cpp, src/gui/gui.cpp, src/gui/gui.h, - src/gui/inventorywindow.cpp, src/gui/popupmenu.h, - src/net/protocol.cpp, src/net/protocol.h: Moved all mouse input code - into the Gui class. - -2005-12-26 Duane Bailey <nayryeliab@gmail.com> - - * src/main.h: Fixed define problems with The_Mana_World_private.h. - -2005-12-25 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/being.cpp: Small fix to prevent other stuff than the damage - numbers from fading out. - -2005-12-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/map.cpp: Worked around fringe layer drawing bug at the bottom. - * src/main.cpp: When compiling with OpenGL support, it'll default to - using OpenGL on only Windows and Mac. These systems are known to have - stable acceleration most of the time. - * NEWS, configure.ac, The Mana World.dev: Updated in preparation of - release 0.0.18.1. - -2005-12-20 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac: Changed version to 0.0.18. - -2005-12-18 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/maps/new_10-1.tmx.gz, src/main.cpp: Removed unused code and - added changes to snowy map by Bertram. - -2005-12-15 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp: Fixed setup window behaviour. - -2005-12-13 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/items.xml: Changed item properties according to eAthena scripting - capabilities. - * src/being.cpp: Enabled monster emotions. - -2005-12-12 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, data/graphics/tiles/Makefile.am, data/items.xml, - data/maps/Makefile.am, data/graphics/tiles/Woodland.png, - data/graphics/tiles/snowset.png, data/maps/new_9-1.tmx.gz, - data/maps/new_10-1.tmx.gz: Cleaned Dev-Cpp project file, added new - items definitions and new maps and tilesets. - -2005-12-08 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/graphics/sprites/monster11.png, - data/graphics/sprites/monster12.png, data/graphics/sprites/monster13.png, - data/graphics/sprites/monster14.png, data/graphics/sprites/Makefile.am, - data/graphics/sprites/items.png, data/graphics/sprites/npcs.png,: Added - new monsters, items and npcs. - -2005-12-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - * src/gui/char_server.cpp: Avoid crashing on trying to log the name - of a non-existing character. - * src/main.h, src/main.cpp: Display TMW version on Windows too. - -2005-11-13 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Updated Dev-Cpp project file. - -2005-11-13 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/maps/new_1-1.tmx.gz, data/maps/new_3-1.tmx.gz, - data/maps/new_7-1.tmx.gz: Made the three desert maps use the fringe - layer for objects. Reveals bug with objects disappearing at the bottom - and still some draw order problems. - -2005-10-24 Ferreira Yohann <Bertram@cegetel.net> - - * src/main.cpp: Add version displaying at startup. - * docs/INSTALL/debian.txt: Updated Debian Install Doc. - -2005-10-20 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/item_amount.cpp: Fix scrollbar not being updated when the - amount is changed using the buttons. - * src/gui/buddywindow.cpp, src/gui/buddywindow.h, src/gui/buy.cpp, - src/gui/buy.h, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/chat.cpp, src/gui/help.cpp, - src/gui/help.h, src/gui/inventorywindow.cpp, - src/gui/inventorywindow.h, src/gui/item_amount.cpp, src/gui/npc.cpp, - src/gui/npc.h, src/gui/npc_text.cpp, src/gui/npc_text.h, - src/gui/scrollarea.cpp, src/gui/scrollarea.h, src/gui/sell.cpp, - src/gui/sell.h, src/gui/setup.cpp ,src/gui/skill.cpp, - src/gui/trade.cpp, src/gui/updatewindow.cpp: Add garbage collection to - the ScrollArea class. - * src/gui/confirm_dialog.cpp, src/gui/confirm_dialog.h, - src/gui/connection.cpp, src/gui/connection.h, src/gui/debugwindow.cpp, - src/gui/debugwindow.h, src/gui/item_amount.cpp, src/gui/item_amount.h, - src/gui/menuwindow.cpp, src/gui/menuwindow.h, src/gui/ok_dialog.cpp, - src/gui/ok_dialog.h: Various cleanups and refactorisations. - * data/help/index.txt: Fix typo, remove spaces on empty lines. - -2005-10-19 Duane Bailey <nayryeliab@gmail.com> - - * data/help/index.txt: Added SDL_net reference. - -2005-10-19 Yohann Ferreira <bertram@cegetel.net> - - * debian/rules, debian/tmw.install, debian/copyright, debian/compat, - debian/changelog, debian/control, debian/docs, debian/tmw.menu: - Updated Debian files to get tmw ready for official ITP. - -2005-10-19 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/resources/resourcemanager.cpp: Fix empty lines not being read - from text files. - * src/gui/browserbox.cpp, src/gui/browserbox.h: Code cleanup. - * src/gui/gccontainer.cpp: Remove debug output. - -2005-10-18 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/gui/buddywindow.cpp, src/gui/buddywindow.h, - src/gui/buy.cpp, src/gui/buy.h, src/gui/buysell.cpp, - src/gui/buysell.h, src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/char_server.h, - src/gui/chargedialog.cpp, src/gui/chargedialog.h, src/gui/chat.cpp, - src/gui/confirm_dialog.cpp, src/gui/confirm_dialog.h, - src/gui/connection.cpp, src/gui/connection.h, src/gui/debugwindow.cpp, - src/gui/debugwindow.h, src/gui/error.h, src/gui/hbox.cpp, - src/gui/hbox.h, src/gui/help.cpp, src/gui/inttextbox.cpp, - src/gui/inttextbox.h, src/gui/inventorywindow.cpp, - src/gui/item_amount.cpp, src/gui/item_amount.h, src/gui/login.cpp, - src/gui/login.h, src/gui/menuwindow.cpp, src/gui/menuwindow.h, - src/gui/ministatus.cpp, src/gui/ministatus.h, src/gui/newskill.cpp, - src/gui/newskill.h, src/gui/npc.cpp, src/gui/npc_text.cpp, - src/gui/ok_dialog.cpp, src/gui/popupmenu.cpp, src/gui/popupmenu.h, - src/gui/requesttrade.cpp, src/gui/requesttrade.h, src/gui/sell.cpp, - src/gui/setup.cpp, src/gui/skill.cpp, src/gui/status.cpp, - src/gui/status.h, src/gui/tabbedcontainer.cpp, src/gui/trade.cpp, - src/gui/updatewindow.cpp, src/gui/vbox.cpp, src/gui/vbox.h, - src/gui/window.cpp, src/gui/window.h, src/gui/windowcontainer.cpp: - Added automatic widget cleanup to the window class. - * src/gui/connection.cpp, src/gui/connection.h, src/gui/error.cpp, - src/gui/status.cpp, src/gui/window.h: Header, whitespace and - indentation cleanups. - -2005-10-16 Duane Bailey <nayryeliab@gmail.com> - - * src/main.cpp: OpenGL is now default for mac, win, and those who - define USE_OPENGL - * src/gui/setup.cpp: made it so those who use and go to fullscreen - requires a restart (texture/context baddies) - -2005-10-16 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.cpp, src/game.cpp, src/inventory.cpp, src/gui/buy.cpp, - src/gui/buysell.cpp, src/gui/char_select.cpp, src/gui/char_server.cpp, - src/gui/chat.cpp, src/gui/connection.cpp, src/gui/login.cpp, - src/gui/npc.cpp, src/gui/npc_text.cpp, src/gui/popupmenu.cpp, - src/gui/requesttrade.cpp, src/gui/sell.cpp, src/gui/skill.cpp, - src/gui/status.cpp, src/gui/trade.cpp, src/net/messagein.cpp, - src/net/messagein.h, src/net/messageout.cpp, src/net/messageout.h, - src/net/protocol.cpp: Rename {read,write}{Byte,Short,Long} to - {read,write}Int{8,16,32}. - * src/being.cpp, src/engine.cpp, src/engine.h, src/game.cpp, - src/main.cpp, src/gui/equipmentwindow.cpp, src/gui/itemcontainer.cpp, - src/resources/resourcemanager.cpp, src/resources/resourcemanager.h: - Use the ResourceManager to get spritesets. - * src/being.cpp: Reduce code duplication in the findNode functions and - use a functor to do the search. - * src/map.cpp: Some code improvements. - * src/Makefile.am: Added two missing files. - -2005-10-16 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/game.cpp, src/gui/char_select.cpp, - src/gui/char_server.cpp, src/gui/char_server.h, src/gui/connection.cpp, - src/gui/connection.h, src/gui/login.cpp, src/gui/login.h, src/main.cpp, - src/main.h, src/net/network.cpp, src/net/network.h, - src/net/protocol.cpp, src/net/protocol.h: The connection should be - non-blocking now and fixed the problem with sound not being played at - startup. - -2005-10-15 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp: Moved some variables into the conditional block - where they are used. - * src/being.cpp: A few changes that make the code look nicer. - * src/openglgraphics.cpp, src/resources/image.cpp, - src/resources/image.h: Some small cleanups. - * src/engine.cpp: Removed some legacy debug code. - -2005-10-13 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp: Prevent Alt+p/s/f from appearing in chatbox. - * src/Makefile.am: Some updates for added/removed headers. - * src/being.cpp: Changed char to signed char for GNU/Linux PPC. - -2005-10-13 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp, src/gui/browserbox.cpp, src/gui/gui.cpp, - src/gui/gui.h: Use gcn::Font instead of gcn::ImageFont where the - former is sufficient. - -2005-10-10 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/being.cpp, src/being.h, src/game.cpp: Always compile with debug - window and hide it on startup. Also added fading out effect on damage - font (only works in OpenGL). - * src/Makefile.am: Don't include debugwindow.h/cpp twice. - * data/graphics/gui/browserfont.png, data/graphics/gui/fixedfont.png, - data/graphics/gui/rpgfont_wider.png, src/gui/browserbox.cpp, - src/gui/gui.cpp: Pajarico added more international characters to the - fixed font and rpg font. - * src/game.cpp, README, data/helps/commands.txt: Introduced new window - shortcuts. - * src/gui/status.cpp: Corrected position of job XP bar. - * src/data/graphics/tiles/Makefile.am: Forgot to add new tilesets - here. - * src/map.cpp: Another small fix to sprite rendering. - -2005-10-09 Yohann Ferreira <bertram@cegetel.net> - - * src/gui/browserbox.cpp, src/gui/ministatus.cpp, - src/gui/debugwindow.h, src/gui/debugwindow.cpp, src/game.cpp, - src/engine.cpp, src/Makefile.am: Corrected the white browser font - bug and the black hp/mp bug which were linked. Added a debug window - -2005-10-09 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/being.cpp, src/being.h, src/engine.cpp, src/engine.h, - src/floor_item.cpp, src/floor_item.h, src/map.cpp, src/map.h, - src/sprite.h: Made Sprite into an interface implemented by both - FloorItem and Being, which hook themselves into the map on - construction. The improved fringe layer is working as expected now. - * src/equipment.cpp, src/equipment.h, src/game.cpp, src/game.h, - src/graphics.cpp, src/guichanfwd.h, src/inventory.h, - src/openglgraphics.cpp, src/sound.cpp, src/gui/chargedialog.cpp, - src/gui/chargedialog.h, src/gui/chat.cpp, src/gui/chat.h, - src/gui/equipmentwindow.cpp, src/gui/equipmentwindow.h, - src/gui/gui.cpp, src/gui/help.cpp, src/gui/inventorywindow.cpp, - src/gui/item_amount.cpp, src/gui/itemcontainer.cpp, - src/gui/itemcontainer.h, src/gui/linkhandler.h, src/gui/login.cpp, - src/gui/menuwindow.cpp, src/gui/newskill.cpp, src/gui/npc_text.cpp, - src/gui/popupmenu.cpp, src/gui/popupmenu.h, src/gui/progressbar.cpp, - src/gui/progressbar.h, src/gui/scrollarea.cpp, src/gui/scrollarea.h, - src/gui/skill.cpp, src/gui/status.cpp, src/gui/trade.h, - src/gui/window.cpp, src/gui/window.h, src/net/messagein.cpp, - src/net/packet.cpp, src/net/packet.h, src/resources/image.cpp, - src/resources/image.h, src/resources/iteminfo.cpp, - src/resources/iteminfo.h, src/resources/music.cpp, - src/resources/music.h, src/resources/soundeffect.cpp, - src/resources/soundeffect.h: Made sure TMW compiles without warnings - even when using "-Wconversion -Wshadow -Wcast-qual -Wwrite-strings - -ansi -pedantic", lots of cleanups. - * src/data/maps/new_3-1.tmx.gz, src/graphics/tiles/desert_x2.png, - src/graphics/tiled/desert_x3.png: Added two new small tilesets that - contain the desert tiles that are twice and three times the height of - a normal tile. One well in new_3-1 has been converted to use the new - double tiles for testing purposes. - * src/being.cpp, src/game.cpp, src/engine.cpp: Fixed map switch - crashing the client, display of [TARGET], Alt keys for toggling - windows and names to overlap other players. - -2005-10-06 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/being.cpp: Modified finding NPC as by timonator's suggestion in - order to allow NPCs to be clicked on their heads too. - * src/engine.cpp, src/engine.h, src/floor_item.cpp, src/floor_item.h, - src/game.cpp, src/map.cpp, src/sprite.h: Added a Sprite class that - represents something on the map. The map will make sure to draw the - sprites top to bottom, at the same time as the fringe layer tiles. - This is currently still only used by the floor items. - * src/item.cpp, src/item.h: Changed formatting and added - documentation. - * src/properies.h: Separated properties class from Map class, in order - to simplify Map class and to allow properties to be used by other - classes. - -2005-10-06 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.cpp, src/being.h, src/game.cpp: Use integer types from SDL - and along the way fixed some long vs. int issues. - * src/inventory.cpp: Return NULL when no valid item index is given to - getItem() to bail out early. - -2005-10-05 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/engine.cpp, src/main.cpp, src/gui/char_select.cpp, - src/gui/skill.cpp, src/net/messagein.cpp: Fixed some resource cleanup - and memory leaks. - * src/resources/resource.h, src/resources/resourcemanager.cpp: - Changed the way dangling references to resources are reported to be - more informative. - -2005-10-04 Yohann Ferreira <bertram@cegetel.net> - - * src/game.cpp, src/gui/menuwindow.cpp, src/gui/inventorywindow.cpp, - src/gui/equipmentwindow.cpp: Move to top the requested window with - shortcuts or with menu button, also corrected the default position - of equipment and inventory windows. - * src/gui/chat.cpp: Fixed the Chat Window scrolling bug. - * src/gui/status.cpp, src/gui/ministatus.cpp: Changed the font used - in mini-status. Dynamised previously statically placed widgets in - status win to avoid some label over-drawings. - * src/gui/setup.cpp: Enable the OpenGL Checkbox only if tmw has been - compiled with its support. - -2005-10-02 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac, src/Makefile.am: Added check for pthread library and - removed manual -lpthread and -lguichan linker flags. - * src/map.cpp: A small start on supporting other tile height than the - default (map) tile height. - * src/gui/window.cpp, src/gui/window.h, src/resources/buddylist.cpp, - src/resources/buddylist.h: Some cleanups (void argument list was - something you had to do in C times, not necessary in C++). - -2005-09-30 Yohann Ferreira <bertram@cegetel.net> - - * src/gui/inventorywindow.cpp, src/gui/inventorywindow.h, - src/gui/window.h src/gui/window.cpp src/gui/setup.cpp: Made the - inventory Win behave normally when resized by default size functions. - -2005-09-29 Yohann Ferreira <bertram@cegetel.net> - - * src/game.cpp, src/gui/window.h, src/gui/window.cpp, src/gui/setup.h, - src/gui/setup.cpp, src/gui/chat.cpp, src/gui/inventorywindow.h, - src/gui/inventorywindow.cpp, src/gui/skill.cpp, - src/gui/equipmentwindow.cpp, src/gui/menuwindow.cpp, - src/gui/ministatus.cpp, src/gui/minimap.cpp, src/gui/status.cpp: - Improved a lot windows reset to default size and pos. Also corrected - a few the default win position. And moved the setposition from game to - each win, to clarify the code. - -2005-09-29 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/map.cpp, src/map.h, src/tileset.h, src/resources/mapreader.cpp, - src/resources/mapreader.h: Moved tileset management into the map class - and made sure the tilesets are cleaned up properly on switching maps. - -2005-09-28 Yohann Ferreira <bertram@cegetel.net> - - * src/gui/updaterwindow.cpp: Fixed the scroll bug in the update window. - * src/gui/ministatus.h, src/gui/ministatus.cpp: Added HP, MP Display - in mini-status window. - * src/gui/window.h, src/gui/window.cpp, src/gui/skill.cpp, - src/gui/status.cpp, src/gui/equipmentwindow.cpp, src/gui/help.cpp, - src/gui/inventorywindow.cpp, src/gui/minimap.cpp, src/gui/chat.cpp: - Added window internal name to later get X, Y, height and width be - saved. - * src/gui/window.h, src/gui/window.cpp, src/game.cpp: Load and save X, - Y, Width and Height of windows when useful. - * src/gui/setup.cpp, src/gui/setup.h; src/gui/minimap.h: Added a 'Reset - Windows to Default' Button in the Setup Window. - -2005-09-28 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/browserbox.cpp: Fix deletion of the gui font because of a - missing check. - * src/Makefile.am: Added -Werror to the CXXFLAGS to catch warnings - easier. - * src/gui/error.h: Removed unnecessary ambigous inheritance. - -2005-09-26 Yohann Ferreira <bertram@cegetel.net> - - * src/gui/char_select.cpp, debian/control, debian/rules, - debian/tmw.install, debian/changelog: Updated Debian files and fixed a - typo let by Elven. - -2005-09-26 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/Makefile.am, src/game.cpp, - src/gui/char_select.cpp, src/gui/char_server.cpp, src/gui/error.cpp, - src/gui/error.h, src/gui/gui.cpp, src/gui/login.cpp, - src/gui/updatewindow.cpp, src/main.cpp, src/main.h, - src/net/network.cpp: Added a nicer handling of when you get - disconnected from the server. - * src/gui/char_select.cpp, src/gui/skill.cpp, src/main.cpp, src/main.h, - src/net/network.cpp: Now error message is displayed properly when the - map server is offline. - -2005-09-25 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/openglgraphics.cpp: Fixed taking OpenGL screenshots and in - addition made it flip the image using just a line buffer instead of a - buffer for the complete image. Still needs testing on MacOS X. - -2005-09-24 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/being.cpp, src/engine.cpp, src/game.cpp, src/main.cpp, - src/map.cpp, src/sound.cpp, src/gui/char_select.cpp, - src/gui/char_select.h, src/gui/char_server.cpp, src/gui/char_server.h, - src/gui/chargedialog.cpp, src/gui/chargedialog.h, src/gui/chat.cpp, - src/gui/equipmentwindow.cpp, src/gui/login.h, src/gui/setup.cpp, - src/gui/setup.h, src/gui/status.cpp, src/gui/updatewindow.cpp, - src/gui/updatewindow.h, src/resources/iteminfo.cpp, - src/resources/iteminfo.h, src/resources/itemmanager.cpp, - src/resources/itemmanager.h: Merged most of the changes in - biggeruniverse's second memory cleanup patch. - -2005-09-23 Duane Bailey <nayryeliab@gmail.com> - - * src/openglgraphics.cpp: Totally redid the OpenGL screenshot method. - Needs to be tested on lil endian systems. Also made it smoother on - OpenGL MacOSX. - -2005-09-23 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/resources/imagewriter.cpp: Reverted the last change that broke - the screenshots facility. - -2005-19-22 Duane Bailey <nayryeliab@gmail.com> - - * src/net/win2mac.h, src/net/win2mac.cpp: Removed - * src/net/network.h, src/net/messagein.h, src/net/messageout.h: - Removed references to win2mac.h - * src/net/messagein.cpp, src/net/messageout.cpp, src/net/network.cpp: - Changed byte swapping support to SDL_endian - -2005-09-21 Andrej Sinicyn <andrej4000@gmail.com> - - * src/gui/chat.cpp: Show time of the messages in the chat window. - * The Mana World.dev: Removed reference to src/gui/stats.* since they - are in the attic now. - -2005-09-20 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/game.cpp, src/gui/ok_dialog.cpp, src/gui/ok_dialog.h, - src/gui/window.cpp: Enter is used to dismiss dialogs currently, - removed the hacks for use in combination with non-modal dialogs that - made the game crash. - * src/openglgraphics.cpp: Changed glColor4f to glColor4ub. - -2005-09-19 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * configure.ac: Replaced custom function FIND_PATH with AC_PATH_PROG, - used for finding sdl-config. - * src/Makefile.am: Removed -lphysfs which should be added - automatically already. - * src/engine.cpp, src/game.h, src/game.cpp, src/openglgraphics.h, - src/gui/popupmenu.cpp, src/net/messagein.cpp, src/net/messageout.cpp, - src/net/win2mac.h, src/net/win2mac.cpp: Some cleanups. - * src/game.cpp: Actually show the overweight message, and only show it - once for each time weight goes above half the max weight (apparently - this code wasn't even tested once). - * src/graphics.cpp: Surfaces passed to SDL_BlitSurface shouldn't be - locked according to the manual. - * src/main.cpp: Minimal fps limit is now 10 fps. - * src/gui/updatewindow.cpp: Reverted change by Bertram that hardcoded - the updatehost value. - -2005-09-19 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp, src/gui/trade.cpp, src/gui/updatewindow.cpp, - src/inventory.cpp: Removed useless flush() calls. - * src/being.cpp, src/game.cpp, src/gui/buy.cpp, src/gui/buysell.cpp, - src/gui/char_select.cpp, src/gui/char_server.cpp, src/gui/chat.cpp, - src/gui/login.cpp, src/gui/npc.cpp, src/gui, npc_text.cpp, - src/gui/popipmenu.cpp, src/gui/requesttrade.cpp, src/gui/sell.cpp, - src/gui/skill.cpp, src/gui/status.cpp, src/gui/trade.cpp, - src/inventory.cpp, src/net/messageout.cpp, src/net/network.cpp, - src/net/network.h, src/net/protocol.cpp: Got rid of writeSet() calls. - * data/graphics/sprites/monster2.png: Fixed some non very bright pixels. - -2005-09-18 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/gui/npc.cpp: Updated dev-cpp project file to - last changes, and fixed the bug with npc lists I introduced earlier. - * data/items.xml: Updated the defense value of fancy hat as pointed out - by xand. - * src/game.cpp, src/gui/gui.cpp, src/gui/updatewindow.cpp, - src/main.cpp, src/resources/mapreader.cpp: Applied biggeruniverse's - patch to fix memory leaks. - * src/game.cpp, src/main.cpp: Increased joypad tolerance which is safer - and simplifyed joypad state reset code. - -2005-09-18 Duane Bailey <nayryeliab@gmail.com> - - * game.cpp: Added weight notice; now notifies person when they - are carrying more then half their weight - -2005-09-18 Yohann Ferreira <bertram@cegetel.net> - - * src/game.cpp, src/graphics.cpp, src/graphics.h, - src/resources/imagewriter.cpp, src/resources/imagewriter.h: - Made the saveScreenShot makes its screenshots under user home dir in - *nices, made it more C++ way to avoid a leak, and made it check - for existence of a file with same name before writing; In that - case the screenshot's number is incremented until it finds - an adequate name. - * src/gui/updatewindow.cpp: Corrected a bug in the determination - of the update host I had. - * src/gui/updatewindow.cpp, src/playerinfo.h, debian/control, - debian/changelog: Corrected a range value bug for derived stats. - Fixed the percentage of the update win, updated debian information. - * src/gui/status.cpp: As m[a]tt noticed, made the status win a - little more wide, and resizable. - -2005-09-18 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp, src/graphics.cpp, src/graphics.h: Move the writing - logic out of the Graphics class once again... Some cleanups in the - screenshot filename selection code. - * src/resources/imagewriter.cpp: Small cleanups. - * src/Makefile.am, src/game.cpp, src/graphics.cpp, src/graphics.h, - src/openglgraphics.cpp, src/openglgraphics.h: Changed saveScreenshot - function in Graphics to getScreenshot. We now use the ImageWriter to - save that screenshot. - * src/resources/imagewriter.cpp, src/resources/imagewriter.h: Added - ImageWriter class that provides a function to save a SDL surface as - png. - -2005-09-17 Duane Bailey <nayryeliab@gmail.com> - - * src/net/messagin.cpp, src/net/messageout.cpp, src/net/network.cpp: - removed replaced MACOSX defines with big endian defines - * src/graphics.cpp, src/graphics.h: added screenshot method - * src/game.cpp: added code, so that when one presses 'alt-p' (for - picture), it takes a screenshot and saves it to a png - * src/Makefile.am, config.ac: added png library stuff - -2005-09-17 Matthias Hartmann <hartmann.matthias@gmail.com> - - * src/engine.cpp: [TARGET] text over player - * src/game.cpp, src/game.h: PVP - * src/gui/popupmenu.cpp: Added "attack" option to the popupmenu - * src/net/protocol.cpp: findPlayer - -2005-09-17 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/engine.cpp, src/game.cpp: Indent properly. - -2005-09-17 Björn Steinbrink <B.Steinbrink@gmx.de> - - * configure.ac: Fix typo. - * src/Makefile.am: Remove useless (duplicate) -lpng. - * src/graphics.cpp: Add missing cstdarg header. - * src/net/messagein.cpp: Fix some funny looking preprocessor - statement. - * src/net/messageout.cpp: Readd SDLnet header, for changed - preprocessor stuff. - * src/game.h: Remove inclusion of being.h, there was a forward - declaration of class Being anyways... - * src/openglgraphics.cpp: Use gl{Push,Pop}Matrix instead of - calculating offsets, cause the values are stored as float and aren't - accurate enough. - -2005-09-17 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/gui/skill.cpp: Updated to last changes, and - wrong names fixes. - * src/being.cpp, src/game.cpp, src/gui/buy.cpp, src/gui/buysell.cpp, - src/gui/char_select.cpp, src/gui/char_server, src/gui/chat.cpp, - src/gui/npc.cpp, src/gui/npc_text.cpp, src/gui/popupmenu.cpp, - src/gui/requesttrade.cpp, src/gui/sell.cpp, src/gui/skill.cpp, - src/gui/status.cpp, src/gui/trade.cpp, src/inventory.cpp, - src/net/messageout.cpp, src/net/network.cpp, src/net/network.h, - src/net/protocol.cpp, src/net/protocol.h: Completed transition to use - MessageOut. - -2005-09-17 Yohann Ferreira <bertram@cegetel.net> - - * src/game.cpp, src/gui/ministatus.cpp, src/gui/ministatus.h, - src/gui/menuwindow.h, src/gui/menuwindow.cpp, src/gui/status.cpp, - src/gui/status.h: Improving General Layout. - * src/games.cpp, src/playerinfo.h, src/gui/char_server.cpp, - src/gui/char_select.cpp, src/gui/ministatus.cpp, src/gui/skill.cpp, - src/gui/status.cpp, src/gui/status.h: Now the derived stats values - are got from the server, and then, are correct ones. - * src/gui/minimap.cpp: Only shows the Minimap Window if there's - actually a minimap to the current map. - * src/gui/status.cpp, src/game.cpp: The derived stats are now updated - correctly upon equipping/unequipping. - -2005-09-16 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/resources/image.cpp: Report which error occured when loading of - an image fails. - -2005-09-14 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp: Fix missing parentheses in a negated check. - * src/engine.cpp, src/engine.h, src/game.cpp: Moved Map management - code completely into engine.cpp. - * src/net/messagein.cpp, src/net/messagein.h, src/net/messageout.cpp, - src/net/messageout.h: Added stream operators for char, short and long - reading and writing. - * src/game.cpp, src/log.cpp, src/main.cpp, src/gui/char_select.cpp, - src/gui/char_server.cpp, src/gui/login.cpp, src/net/messageout.cpp, - src/net/messageout.h, src/net/network.cpp, src/net/network.h, - src/net/packet.cpp, src/net/protocol.cpp: Header cleanups. - * src/gui/popupmenu.cpp, src/gui/sell.cpp: Use cassert instead of - assert.h. - * src/net/network.cpp: Add missing cassert header, remove some unused - headers. - * src/net/messagein.cpp: Add missing cassert header. - * src/being.cpp, src/being.h, src/game.cpp: Made Being::setDamage - accept a short instead of a string. - * src/game.cpp, src/game.h, src/gui/char_select.cpp: Converted - map_path from char array to std::string. - -2005-09-13 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Updated to last changes. - * The Mana World.dev: Added latest changes to the proper branch. - * src/gui/login.cpp, src/net/messageout.cpp, src/net/messageout.h, - src/net/network.cpp, src/net/network.h: Started to use MessageOut to - send login data. - -2005-09-13 Björn Steinbrink <B.Steinbrink@gmx.de> - - * ChangeLog, The Mana World.dev, configure.ac, src/Makefile.am, - src/being.cpp, src/being.h, src/engine.cpp, src/floor_item.cpp, - src/floor_item.h, src/game.cpp, src/game.h, src/inventory.cpp, - src/log.h, src/main.cpp, src/playerinfo.h, src/serverinfo.h, - src/gui/buy.cpp, src/gui/buysell.cpp, src/gui/char_select.cpp, - src/gui/char_server.cpp, src/gui/chargedialog.cpp, src/gui/chat.cpp, - src/gui/inventorywindow.cpp, src/gui/login.cpp, src/gui/npc.cpp, - src/gui/npc.h, src/gui/npc_text.cpp, src/gui/npc_text.h, - src/gui/popupmenu.cpp, src/gui/requesttrade.cpp, - src/gui/requesttrade.h, src/gui/sell.cpp, src/gui/skill.cpp, - src/gui/stats.cpp, src/gui/status.cpp, src/gui/status.h, - src/gui/trade.cpp, src/net/messagein.cpp, src/net/messagein.h, - src/net/messageout.cpp, src/net/messageout.h, src/net/network.cpp, - src/net/network.h, src/net/packet.cpp, src/net/packet.h, - src/net/protocol.cpp, src/net/protocol.h, src/net/win2linux.h, - src/net/win2mac.cpp, src/net/win2mac.h: Merged with SDL_NET_TEST - branch. - * src/being.cpp, src/being.h, src/game.cpp: Simplify remove_node. - * src/being.cpp, src/being.h, src/game.cpp: Merged createBeing and - add_node into createBeing. - * src/main.cpp, src/main.h, src/gui/char_select.cpp, - src/gui/login.cpp: Removed some globals. - * src/main.cpp, src/main.h, src/gui/char_select.cpp, - src/gui/char_select.h, src/gui/char_server.cpp, src/gui/char_server.h, - src/gui/login.cpp, src/gui/login.h, src/gui/updatewindow.cpp, - src/gui/updatewindow.h: Unified the loops for the various dialogs that - are shown before the actual game starts. - * src/gui/login.cpp: Removed a close_session call i missed. - * src/gui/login.cpp: Close the session only when it was opened. - -2005-09-13 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/floor_item.cpp, src/floor_item.h, src/engine.cpp, - popupmenu.cpp: Made members private and provided more convenient - constructor. - * src/net/messageout.cpp: Fixed bug in destructor. - * src/net/network.cpp: Initialize buffers and enforce only a single - session at a time. - * src/game.cpp, src/net/protocol.h: Converted all incoming messages - handled in game.cpp to use the MessageIn class. This is a huge change - so please test if everything is still working correctly. - * src/gui/npc.cpp, src/gui/npc.h, src/gui/npc_text.cpp, - src/gui/npc_text.h: Changed argument from char* to std::string for - convenience. - * src/gui/setup.cpp, src/gui/setup.h: Enabled OpenGL checkbox and - added messagebox informing the user that apply this change requires - restarting the client. - * src/gui/updatewindow.cpp: Start displaying file progress at 0% and - some small fixes. - -2005-09-12 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/gui/browserbox.cpp, src/gui/gui.cpp, - src/resources/resourcemanager.cpp, src/resources/resourcemanager.h, - src/resources/sdlimageloader.cpp, src/resources/sdlimageloader.h: - Added SDLImageLoader to make guichan support physfs. Removed - ResourceManager::getRealPath() because it's no longer needed. - -2005-09-12 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * data/graphics/gui/hits_blue.png, data/graphics/gui/hits_red.png, - data/graphics/gui/hits_yellow.png: Made shadow translucent. - * data/graphics/images/minimap_new_7-1.png: Added this minimap. - * data/help/changes.txt, data/help/commands.txt: Added 0.0.16 changes. - * data/maps/new_7-1.tmx.gz: Fixed well being in the wrong layer. - -2005-09-11 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/net/network.cpp: Improved error reporting a bit and got rid of - loop for sending data, which shouldn't be necessary according to - SDL_net documentation. - * src/Makefile.am, src/being.cpp, src/being.h, src/engine.cpp, - src/game.cpp, src/main.cpp, src/playerinfo.h, src/gui/char_server.cpp, - src/gui/chargedialog.cpp, src/gui/chat.cpp, - src/gui/inventorywindow.cpp, src/gui/popupmenu.cpp, src/gui/skill.cpp, - src/gui/stats.cpp, src/gui/status.cpp, src/gui/status.h, - src/net/protocol.cpp: Changed char_info into the array it's used as - for character selection and introduced player_info as the pointer to - the player information. Should help towards support for multiple - characters on the same account. Also changed PLAYER_INFO name field to - a std::string. - * src/net/win2mac.cpp, src/net/win2mac.h: A bit of clean up. - * src/net/packet.h, src/net/packet.cpp, src/net/messagein.h, - src/net/messagein.cpp, src/net/messageout.h, src/net/messageout.cpp: - Added these packet reading/writing helpers, taken from the new server - in development. - * src/gui/char_select.cpp: Made new character message be parsed - using MessageIn. Many other incoming messages should be ready to be - ported similarly, simplifying the parsing of packets because of - automatic incrementation of the read position. - * src/game.cpp, src/game.h, src/gui/popupmenu.cpp, - src/gui/requesttrade.cpp, src/gui/requesttrade.h: Changed - tradePartnerName to std::string. - * src/net/win2linux.h: Removed because it became redundant with - the use of SDL_net. - * src/game.cpp, src/game.h, src/gui/char_select.cpp, - src/net/messagein.cpp, src/net/messagein.h, src/net/network.cpp, - src/net/network.h: Got rid of usage of Packet by MessageIn, - simplifying both its usage and implementation. Now also handling - response to character selection through MessageIn. - * src/main.cpp, src/serverinfo.h, src/gui/char_select.cpp, - src/gui/char_server.cpp, src/gui/login.cpp, src/net/network.cpp, - src/net/network.h, src/net/protocol.cpp, src/net/protocol.h: - Introduced get_next_message function to reduce duplication of that - process. Also now MessageIn is used for all incoming messages handled - during the login sequence. - * src/being.cpp, src/being.h, src/game.cpp, src/game.h, - src/inventory.cpp, src/serverinfo.h, src/gui/login.cpp, - src/gui/trade.cpp, src/net/messagein.cpp, src/net/messagein.h, - src/net/network.cpp, src/net/protocol.cpp, src/net/protocol.h: Added - readCoordinates and readCoordinatePair to MessageIn for reading the - specific ways eAthena sends sends those, and converted part of - game.cpp to use the MessageIn class. Also simplified cases where - flush() was still called in a loop for sending and added asserts to - MessageIn methods. - -2005-09-10 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/log.cpp: Committed patch by Nayr for displaying a messagebox - when an error occurs on MacOS. - -2005-09-10 Björn Steinbrink <B.Steinbrink@gmx.de> - - * configure.ac: Add check for SDL_net. - -2005-09-09 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/game.cpp: Fixes to dropped items network code - -2005-09-09 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/net/win2linux.h: Removed inclusion of malloc.h header as it - doens't seem necessary and was problematic on FreeBSD. - -2005-09-08 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp: Clean the floor items when the map changes. - -2005-08-30 Eugenio Favalli <elvenprogrammer@gmail.com> - - * README, The Mana World.dev, data/graphics/sprites/items.png, - data/graphics/sprites/npcs.png, data/help/header.txt, - data/help/skills.txt, data/items.xml, data/maps/new_8-1.tmx.gz: - Updated docs for release, fixed Dev-Cpp project file, added more items - and npcs, fixed the new map and added it to the makefile. - -2005-08-31 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/openglgraphics.cpp: Fix push/pop of clip area, we need to - translate using the x/y offset, not the x/y coordinates of the clip - area. This fixes the broken scrollareas. - -2005-08-30 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Updated project file. - * data/graphics/sprites/npcs.png, src/gui/sell.cpp: Added empty sprite - and reorganized spriteset, fixed a typo. - -2005-08-29 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/configlistener.cpp, src/configlistener.h: Made - the destructor inline, as it is an interface, we don't need a .cpp - file, thus it was removed. - * src/resources/image.cpp, src/resources/image.h, - src/resources/music.cpp, src/resources/music.h, - src/resources/resource.cpp, src/resources/resource.h, - src/resources/resourcemanager.cpp, src/resources/soundeffect.cpp, - src/resources/soundeffect.h: Removed the setIdPath() method from the - Resource class and added the idPath as a Constructor parameter, as - that value is not meant to be changed. - -2005-08-29 Eugenio Favalli <elvenprogrammer@gmail.com> - - * data/maps/new_8-1.tmx.gz: Some layer and walkability fixes. - -2005-08-28 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/openglgraphics.cpp, src/gui/browserbox.cpp, - src/gui/buddywindow.cpp, src/gui/buddywindow.h, src/gui/buysell.h, - src/gui/char_server.h, src/gui/chargedialog.h, src/gui/chat.cpp, - src/gui/chat.h, src/gui/confirm_dialog.h, src/gui/equipmentwindow.h, - src/gui/focushandler.h, src/gui/gui.cpp, src/gui/gui.h, - src/gui/help.h, src/gui/inttextbox.cpp, src/gui/inventorywindow.cpp, - src/gui/inventorywindow.h, src/gui/item_amount.h, - src/gui/itemcontainer.cpp, src/gui/listbox.cpp, src/gui/newskill.h, - src/gui/npc_text.h, src/gui/ok_dialog.h, src/gui/passwordfield.cpp, - src/gui/requesttrade.h, src/gui/setup.h, src/gui/stats.h, - src/gui/status.h, src/gui/textbox.cpp, src/gui/textfield.cpp, - src/gui/trade.h, src/gui/updatewindow.h: Add #include's that just - weren't necessary because the guichan folks don't provide clean - headers. This is preparatory for the case that they ever do. ;) - * src/gui/gui.cpp, src/gui/gui.h: Create a GuiConfigListener class. - * src/gui/window.h: Small cleanup. - * src/gui/window.cpp, src/gui/window.h: Create a static ConfigListener - for the Window class. (Fixes each Window listening to config changes, - although they only affect a static class member.) - -2005-08-27 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/npc.cpp: Fix a memory leak. - * src/game.cpp, src/gui/npc.cpp, src/gui/npc.h: Fix the bug when - sometimes the last entry in npc list windows is missing. The network - buffer isn't reset to all zeros, thus we can't rely on the received - string to be nul-terminated, instead we have to use the length - parameter we receive from eAthena (and this way we're also safe - against buffer overflows, because we can use strncpy()). - * src/gui/window.cpp: Bail out early if there's no window container. - * src/engine.cpp, src/game.cpp, src/gui/stats.cpp, src/gui/stats.h, - src/gui/status.cpp, src/gui/status.h: Update the stats and status - window contents only at a single location and let them do it - automagically. - * src/gui/updatewindow.cpp, src/gui/updatewindow.h: Small cleanups. - -2005-08-25 Ferreira Yohann <bertram@cegetel.net> - - * src/gui/buy.h, src/gui/buy.cpp, src/gui/sell.h, src/gui/sell.cpp, - src/gui/inventorywindow.h, src/gui/inventorywindow.cpp: Added effect - description to those each windows, and also made some improvements and - bugfixes as I was on it. - * data/maps/new_7-1.tmx.gz: Added eyecandy to the map 7-1. - -2005-08-26 Björn Steinbrink <B.Steinbrink@gmx.de> - - * ChangeLog: Fix indentation and line length. - * docs/HACKING.txt: Fix the example (OOPS!). - * src/configuration.cpp: Remove dependency on math.h. - * src/openglgraphics.cpp: Remove useless code. - * src/openglgraphics.cpp: Use glTranslatef instead of glTranslated. - Remove some useless code. - -2005-08-25 Ferreira Yohann <bertram@cegetel.net> - - * src/main.h, src/main.cpp, src/gui/login.cpp, - src/resources/buddylist.cpp, gui/char_select.cpp: Adding min and max - length check for password, more code cleanups in login and removing - possible buffer overflows by replacing some global char[] by - std::strings. - * src/items.h, src/items.cpp, src/resources/itemmanager.h, - src/resources/itemmanager.cpp, src/resources/iteminfo.h, - src/resources/iteminfo.cpp, data/items.xml, data/items.xsd: Added - Effects description to items. - -2005-08-25 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * ChangeLog: Fixed line length using tab size of 8. - * src/configuration.h, src/configuration.cpp: Removed some debug code - and updated documentation a bit. - * src/resources/resourcemanager.cpp: Removed unused (I think) headers - for Windows. - -2005-08-25 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/openglgraphics.cpp: Use the translation capabilities of OpenGL - instead of doing it ourselves all the time. - * src/graphics.cpp: Simplify the image rect drawing code a bit and - remove an obsolete included header. - * src/openglgraphics.cpp, src/openglgraphics.h: Reduce the code - duplication even further. - * src/engine.cpp, src/floor_item.cpp, src/floor_item.h: Move the - extern declaration for the floor item list into engine.cpp as it's - only used there. - * src/log.cpp: Lower indentation level. - * src/openglgraphics.cpp, src/openglgraphics.h: Reduce code - duplication. - * src/configuration.cpp: Fix compilation errors. - * src/graphics.cpp, src/openglgraphics.cpp, src/gui/button.cpp, - src/gui/checkbox.cpp, src/gui/equipmentwindow.cpp, - src/gui/itemcontainer.cpp, src/gui/minimap.cpp, - src/gui/passwordfield.cpp, src/gui/playerbox.cpp, - stc/gui/progressbar.cpp, src/gui/radiobutton.cpp, - src/gui/scrollarea.cpp, src/gui/slider.cpp, src/gui/textfield.cpp, - src/gui/window.cpp: Made our Graphics::drawImage() method respect the - clip area from the guichan part. Removed some obsolete code. - * src/gui/tabbedcontainer.h: Fix include path for guichanfwd.h. - * src/gui/tabbedcontainer.cpp, src/gui/tabbedcontainer.h: Added a new - container type, that allows switching between the contents through a - tab bar at the top of the container. - * ChangeLog: Fixed intendation and line length. - * docs/HACKING.txt: Added a notice about line length in ChangeLog and - an example for the ChangeLog format. - -2005-08-24 Ferreira Yohann <bertram@cegetel.net> - - * src/game.cpp: Simply don't show equipped items in sell dialog as it's - annoying. - * src/gui/login.h, src/gui/login.cpp: Code cleanups and improvements - to the login sequence. - -2005-08-23 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/shop.h: Fixed using a forward declaration for std::string, - where it was a class member. - * src/game.cpp, src/gui/sell.cpp, src/gui/sell.h: Made the sell dialog - accepts Items instead of looking them up in the inventory. - * src/gui/sell.cpp: Some code cleanups, simplifications and removal of - duplicate code. - * src/gui/buy.cpp, src/gui/sell.cpp, src/gui/shop.h: Avoid possible - buffer overflows by using a std::string instead of char[30]. - * src/gui/buy.cpp: Some code cleanups, simplifications and removal of - duplicate code. - -2005-08-22 Ferreira Yohann <bertram@cegetel.net> - - * src/gui/buy.cpp, src/gui/sell.cpp, src/game.cpp: Removed asserts as - they were not suitable for a stable implementation of buy/sell dialogs - and made some improvements on them. Still has to clean up code. - * src/gui/login.h, src/login.cpp: Code cleanups, little improvements of - the login function. - -2005-08-22 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/skill.cpp: Disabled use button in skill dialog since is still - not being used. - -2005-08-20 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/openglgraphics.cpp: Added some missing state changes and checks. - * src/gui/inventorywindow.cpp, src/gui/item_amount.cpp, - src/gui/item_amount.h, src/gui/popupmenu.cpp, src/gui/trade.cpp: Made - the item amount dialog work on a provided item, instead of having it - ask the inventory window itself. - -2005-08-19 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp, src/game.cpp: The engine isn't connected to all the - gui windows, so move creation from its constructor into the game.cpp - where most of them are actually used. - * src/log.cpp, src/log.h, src/main.cpp: Added support for parsing - command line options. Added option to skip the update process. Made - logger being created immediately after startup, because some - destructors use it. - -2005-08-18 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/game.cpp, src/gui/skill.h, src/gui/skill.cpp: - Updated reference to latest libxml, fixed a bug in updating skills, - updated skill names database. - -2005-08-18 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/graphics.cpp, src/graphics.h, src/main.cpp, - src/openglgraphics.cpp src/openglgraphics.h, src/gui/gui.cpp, - src/resources/image.h: Semi-separated OpenGL and SDL graphics classes, - improves OpenGL performance quite a bit, while rewriting a good bunch - of code provided by guichan (but maybe we'll diverge so much that we'd - need that anyways...) - -2005-08-17 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/configuration.cpp, src/resources/itemmanager.cpp, - src/resources/mapreader.cpp: Removed special #ifdefs for libxml2 - linking issues in Win32. - -2005-08-16 Ferreira Yohann <bertram@cegetel.net> - - * src/gui/window.h, src/gui/window.cpp: Bugfixing and simplifying - resize code. - * debian/*: Updates to the debian packaging files. (The actual update - was from a few days ago.) Now we have the tmw, tmw-data and tmw-music - packages. - * src/gui/setup.h, src/gui/setup.cpp: Now the setup (Config) windows - works as it should be. (The actual update was from a few days ago.) - -2005-08-16 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev, src/gui/status.cpp, src/gui/window.cpp, - src/gui/window.h, src/gui/windowcontainer.h, - data/graphics/gui/resize.png: Added a resize grip to resizable window, - fixed some compiling errors. - -2005-08-15 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp, src/gui/gui.cpp, src/gui/gui.h: Removed guiTop global - variable. - * src/graphics.cpp, src/graphics.h, src/main.cpp: Made the OpenGL - related code fully #ifdef'ed. - * src/main.cpp, src/gui/browserbox.cpp, src/gui/gui.cpp, - src/resources/image.cpp, src/resources/image.h: Fully faded out the - useOpenGL global. Image and Graphics keep track of the mode on their - own now (the latter will go away once we have separate classes...) - * src/graphics.cpp, src/graphics.h, src/main.cpp, src/main.h, - src/gui/browserbox.cpp, src/gui/gui.cpp, src/resources/image.cpp: - Started to fade out the useOpenGL global variable. - * src/engine.cpp, src/gui/char_select.cpp, src/gui/char_server.cpp, - src/gui/chat.cpp, src/gui/gui.cpp, src/gui/gui.h, src/gui/login.cpp, - src/gui/popupmenu.cpp, src/gui/setup.cpp, src/gui/updatewindow.cpp, - src/gui/window.cpp: Removed guiGraphics global pointer and removed - dependencies on gui.h in some places. - - -2005-08-14 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/graphics.cpp, src/graphics.h, src/resources/image.cpp, - src/resources/image.h: Moved the image drawing code into the graphics - class. - * src/being.cpp, src/engine.cpp, src/graphics.cpp, src/graphics.h: Made - the wrapper functions in the Graphics class conditional on whether we - compile with OpenGL support. - -2005-08-13 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/Makefile.am, src/being.cpp, src/being.h, src/configlistener.cpp, - src/configlistener.h, src/configuration.cpp, src/configuration.h, - src/engine.cpp, src/engine.h, src/equipment.cpp, src/equipment.h, - src/game.cpp, src/game.h, src/graphics.cpp, src/graphics.h, - src/guichanfwd.h, src/inventory.cpp, src/inventory.h, src/item.h, - src/log.cpp, src/log.h, src/main.cpp, src/main.h, src/map.cpp, - src/map.h, src/playerinfo.h, src/sound.cpp, src/sound.h, - src/graphic/imagerect.h, src/graphic/spriteset.cpp, - src/graphic/spriteset.h, src/gui/box.h, src/gui/browserbox.cpp, - src/gui/browserbox.h, src/gui/buddywindow.h, src/gui/button.cpp, - src/gui/button.h, src/gui/buy.cpp, src/gui/buy.h, src/gui/buysell.h, - src/gui/char_select.cpp, src/gui/char_select.h, - src/gui/char_server.cpp, src/gui/char_server.h, - src/gui/chargedialog.cpp, src/gui/chargedialog.h, src/gui/chat.cpp, - src/gui/chat.h, src/gui/chatinput.cpp, src/gui/checkbox.cpp, - src/gui/checkbox.h, src/gui/confirm_dialog.cpp, - src/gui/confirm_dialog.h, src/gui/equipmentwindow.cpp, - src/gui/equipmentwindow.h, src/gui/focushandler.h, src/gui/gui.cpp, - src/gui/gui.h, src/gui/help.cpp, src/gui/help.h, - src/gui/inttextbox.cpp, src/gui/inttextbox.h, - src/gui/inventorywindow.cpp, src/gui/inventorywindow.h, - src/gui/item_amount.cpp, src/gui/item_amount.h, - src/gui/itemcontainer.cpp, src/gui/itemcontainer.h, - src/gui/listbox.cpp, src/gui/listbox.h, src/gui/login.cpp, - src/gui/login.h, src/gui/minimap.cpp, src/gui/minimap.h, - src/gui/newskill.cpp, src/gui/newskill.h, src/gui/npc.h, - src/gui/npc_text.h, src/gui/ok_dialog.cpp, src/gui/ok_dialog.h, - src/gui/passwordfield.h, src/gui/playerbox.cpp, src/gui/playerbox.h, - src/gui/popupmenu.cpp, src/gui/popupmenu.h, src/gui/progressbar.cpp, - src/gui/progressbar.h, src/gui/radiobutton.cpp, src/gui/radiobutton.h, - src/gui/requesttrade.cpp, src/gui/requesttrade.h, - src/gui/scrollarea.cpp, src/gui/scrollarea.h, src/gui/sell.cpp, - src/gui/sell.h, src/gui/setup.cpp, src/gui/setup.h, src/gui/skill.h, - src/gui/slider.cpp, src/gui/slider.h, src/gui/stats.cpp, - src/gui/stats.h, src/gui/status.cpp, src/gui/status.h, - src/gui/textbox.cpp, src/gui/textbox.h, src/gui/textfield.cpp, - src/gui/textfield.h, src/gui/trade.cpp, src/gui/trade.h, - src/gui/updatewindow.cpp, src/gui/updatewindow.h, src/gui/window.cpp, - src/gui/window.h, src/gui/windowcontainer.h, src/net/protocol.cpp, - src/net/protocol.h, src/resources/buddylist.hm - src/resources/image.cpp, src/resources/image.h, - src/resources/itemmanager.cpp, src/resources/itemmanager.h, - src/resources/mapreader.cpp, src/resources/mapreader.h, - src/resources/music.h, src/resources/resource.cpp, - src/resources/resourcemanager.cpp, src/resources/resourcemanager.h, - src/resources/soundeffect.h: Huge header cleanup, removing nearly all - #include's from headers to reduce dependencies and compile time. - * src/engine.cpp, src/gui/char_select.cpp, src/gui/inventorywindow.cpp, - src/gui/skill.cpp, src/gui/skill.h, src/gui/stats.cpp, - src/gui/status.cpp: Another small header cleanup, should also solve - compilation problems on windows. - * src/gui/sell.cpp: Reset selection in the sell dialog if all items at - the selected slot are sold. - -2005-08-13 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/gui/status.h, src/gui/status.cpp: Reformatted status window - layout to avoid overlapping and lowered saturation of bars' colors. - * src/gui/status.cpp: Removed smooth color changing from xp bar which - was causing problems and doesn't act as the job xp bar. - * The Mana World.dev, src/game.cpp, src/playerinfo.h, - src/net/protocol.cpp, src/resources/itemmanager.cpp, - src/gui/inventorywindow.cpp: Updated dev-cpp project file, removed - unnecessary header, fixed some include paths. - -2005-08-12 Eugenio Favalli <elvenprogrammer@gmail.com> - - * src/buy.cpp, src/sell.cpp: Resetting quantity to 0 after selecting - other items in buy/sell dialogs. - -2005-08-11 Andrej Sinicyn <andrej4000@gmail.com> - - * src/resources/image.cpp: Little cleanup and simplification. - -2005-08-10 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp, src/graphics.cpp, src/graphics.h, - src/gui/browserbox.cpp, src/gui/gui.cpp, src/gui/listbox.cpp, - src/gui/minimap.cpp, src/gui/progressbar.cpp, src/gui/scrollarea.cpp: - Moved knowledge about whether we use OpenGL into the Graphics class (as - much as possible) - * src/game.cpp: Added helper function for being creation to reduce code - duplication. Some code simplifications. - -2005-08-09 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp: Adjust drawing offset to have the player centered in - higher resolutions as well. - -2005-08-04 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/main.cpp: Use "true" instead of "1" as bool argument. - * src/resources/resourcemanager.cpp, src/resources/resourcemanager.h: - Added a method to determine the real path of a file in the PhysFS - search path. - * src/gui/browserbox.cpp: Make use of then new resource manager method - to determine the real path of a file. - * src/gui/gui.cpp: Dynamically determine the path to graphic files - instead of using the try-catch fallback method. - -2005-08-03 Andrej Sinicyn <andrej4000@gmail.com> - - * src/game.cpp, src/game.h, src/gui/requesttrade.cpp, - src/gui/requesttrade.h: Moved my invented variable, since it makes more - sense. - * src/game.cpp, src/game.h, src/gui/requesttrade.cpp: Fix my previous - fix because it broke my own code. - -2005-08-03 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/main.cpp: Use PhysFS to determine user's home directory on unix - system. Removed an now unused header. - * src/game.cpp: Commented a switch case label that was left uncommented - though the rest was commented. - * src/resources/buddylist.cpp, src/main.h: Removed unneeded header from - main.h, added it to buddylist.cpp. - * src/engine.cpp: Converted two global variables to function-local - ones. - -2005-08-02 Andrej Sinicyn <andrej4000@gmail.com> - - * src/game.cpp: Fixed "Trade canceled" happening often. - -2005-08-02 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/engine.cpp: Cleanups in the drawing code. - * src/engine.cpp, src/game.cpp: Made autoTarget checks being handled at - a single location. - * src/being.cpp, src/being.h, src/engine.h: Small header cleanups. - * src/graphics.cpp, src/graphics.h, src/main.cpp, src/main.h, - src/gui/setup.cpp: Moved graphics setup code into the graphics class. - -2005-08-02 Marcel W. Wysocki <maci@satgnu.org> - - * tmw/src/gui/status.cpp: making setup dialog quitting when clicking - on setup button while dialog is opened - -2005-08-01 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/inventory.cpp, src/inventory.h, src/gui/itemcontainer.cpp, - src/gui/itemcontainer.h: Added a logic function to dynamically adjust - the size of the itemcontainer. - * src/game.cpp: Fixed autoTarget not being set to NULL on map change. - -2005-07-31 Andrej Sinicyn <andrej4000@gmail.com> - - * src/game.cpp, src/game.h, src/gui/popupmenu.cpp: Show the name of the - trade partner in the trade dialog. - -2005-07-31 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/listbox.cpp: Small cleanup of the drawing code. - * src/engine.cpp: Added a check to stop scrolling when we hit the map - border. - -2005-07-31 Andrej Sinicyn <andrej4000@gmail.com> - - * src/game.cpp: Don't allow more than one trade dialog or requesting it - at once; if a trade is canceled on the other side, close the trade - window. - -2005-07-30 Andrej Sinicyn <andrej4000@gmail.com> - - * src/main.cpp: Removed unnecessary value assignment to a variable. - -2005-07-30 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/main.cpp, src/resources/resourcemanager.h, - src/resources/resourcemanager.cpp: Fixed buggy check for the existence - of the updates directory. Extended the resource manager with some - physfs functions and moved the actual setup process from the resource - manager constructor into the main initialization. - -2005-07-29 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp: Fixed popup window not always being correctly hidden - when the player clicks somewhere else. - -2005-07-28 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/main.cpp, src/gui/update.cpp, src/resources/resourcemanager.cpp, - src/resources/resourcemanager.h: Added support for files downloaded - through the update manager to the resource manager. Changed directory - name for updates from "data" to "updates". - * src/game.cpp, src/gui/inventorywindow.cpp, src/gui/popupmenu.cpp, - src/gui/popupmenu.h: Cleaned up the showPopup() code, moved - "map"-related code into game.cpp, made the popup show up at mouse - coordinates instead of being aligned to tiles. - * src/being.cpp, src/being.h, src/engine.cpp, src/game.cpp, src/game.h, - src/gui/gui.cpp, src/net/protocol.cpp: Added an action enumeration to - the Being class and removed the old #define's. - * src/resources/resourcemanager.cpp: Fixed a location where a wrong - dir-separator was used. - * src/main.cpp: Fixed updates directory not being created on non-unix - systems. Started using PhysFS write support. - -2005-07-27 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * src/engine.cpp, src/game.cpp, src/graphics.cpp, src/graphics.h, - src/main.cpp, src/gui/browserbox.cpp, src/gui/button.cpp, - src/gui/gui.cpp, src/gui/listbox.cpp, src/gui/minimap.cpp, - src/gui/playerbox.cpp, src/gui/progressbar.cpp, - src/gui/scrollarea.cpp, src/gui/textfield.cpp, src/gui/window.cpp, - src/resources/image.cpp, src/resources/image.h, - src/resources/mapreader.h: Merged OpenGL/SDL merge patch by Andrej - Sinicyn, and his followup patch for fixing SDL-only build. - -2005-07-27 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/gui/gui.cpp, src/gui/gui.h: Removed continous mouse movement, - that implementation wasn't suitable for a release. - -2005-07-26 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.cpp, src/being.h, src/engine.cpp, src/game.cpp, - src/gui/minimap.cpp, src/gui/popupmenu.cpp, src/net/protocol.cpp: - Introduced a Being::Type enumeration. Added type-aware findNode() - function. - * src/being.cpp: Set font back to gui font after drawing speech. - Draw auto-target marker in engine instead of being. - * src/gui/popupmenu.cpp: Fixed empty popup window being shown when user - right clicks on an empty tile while the popup is visible. - -2005-07-26 Eugenio Favalli <elvenprogrammer@gmail.com> - - * The Mana World.dev: Updated release infos. - * data/graphics/sprites/emotions.png: Added Modanung's smilies. - * src/being.cpp, src/engine.cpp: Fixed text and smilies position. - * src/game.cpp: Cleanups. - * src/gui/skill.cpp: Added new skill names. - * src/main.cpp: Moved sound playback to update screen and changed song. - -2005-07-24 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/game.cpp: Made the key-event handler use switches instead of - if-else. - * src/gui/gui.cpp, src/gui/gui.h: Allow continous movement when holding - down the left mouse button. - -2005-07-23 Björn Steinbrink <B.Steinbrink@gmx.de> - - * src/being.h, src/being.cpp: Added a member to keep the current map, - restored setDestination. - * src/game.cpp, src/gui/gui.cpp: Change calls to Being::setPath() to - Being::setDestination(). - * src/map.h: Add a forward declaration for struct PATH_NODE. - -2005-07-23 Bjørn Lindeijer <bjorn@lindeijer.nl> - - * NEWS: Moved project news here. - * ChangeLog: Started standard ChangeLog file here. - * docs/HACKING.txt: Added info about member naming and ChangeLog - format. - * src/gui/updatewindow.h, src/gui/updatewindow.cpp: Changed member - names, set a 15 second timeout for connecting to update server and - restore some doxygen comments, improved size adaption and made the - window a shorter. - * data/graphics/images/login_wallpaper.png: New login wallpaper by - Momotaro. @@ -1,20 +1,20 @@ -How to compile and run Aethyra on your GNU/Linux Box +How to compile and run TMW on your GNU/Linux Box ================================================ -Homepage: http://www.aethyra.org/ -IRC: irc.freenode.net / #aethyra +Homepage: http://themanaworld.org/ +IRC: irc.freenode.net / #themanaworld 1) Requirements -2) Compiling Aethyra +2) Compiling And Installing The Mana World 3) Notes 1. Requirements =============== -You are expected to have either checked out Aethyra from git or you have downloaded -a source release. To get Aethyra to compile, you need a compiler -(GCC) and some libraries. The required libraries are: +You are expected to have either checked out TMW from Git or you have downloaded +a source release. To get The Mana World to compile, you need a compiler (GCC) +and some libraries. The required libraries are: * SDL http://www.libsdl.org/ * SDL_mixer http://www.libsdl.org/projects/SDL_mixer/ @@ -27,8 +27,7 @@ a source release. To get Aethyra to compile, you need a compiler * zlib 1.2.x http://www.gzip.org/zlib/ * libcurl http://curl.haxx.se/libcurl/ -If you cloned Aethyra from the Git repository, you will also need these tools to -compile: +If you've cloned the Git repository, you will also need these tools to compile: * GNU automake 1.9 http://www.gnu.org/software/automake/ * GNU autoconf http://www.gnu.org/software/autoconf/ @@ -39,8 +38,8 @@ Installing these dependencies is distributions-specific, and we'll leave it to you to figure this out. -2. Compiling And Installing Aethyra -=============================================== +2. Compiling And Installing The Mana World +========================================== 1) Go to the directory you have extracted the source to. 2) If you've cloned the Git repository, run "autoreconf -i" to generate @@ -49,21 +48,12 @@ you to figure this out. 4) Run "make" 5) Run "make install" as root -It should have installed Aethyra on your system now, and you can -run it with "aethyra". By default all files are installed to /usr/local, you can -pass a different prefix to configure as usual. +It should have installed The Mana World on your system now, and you can run it +with "tmw". By default all files are installed to /usr/local, you can pass a +different prefix to configure as usual. - NOTE: if the autobuild.sh fails - 1.) autoreconf -i - 2.) ./configure - 3.) make - 4.) su -c "make install" - you can get help from A.) IRC channel irc.freenode.net #aedev or #aethyra - B.) http://www.aethyra.org/forums/ - Make sure you record the output from the konsole window - - NOTE: It is possible to compile Aethyra without support for OpenGL rendering. + NOTE: It is possible to compile TMW without support for OpenGL rendering. To do this perform step 3 as follows: ./configure --without-opengl @@ -77,4 +67,4 @@ pass a different prefix to configure as usual. If you have any problems, you are welcome to post your questions on our forums, or talk about them in our IRC channel. -- Aethyra Dev Team +- The Mana World Dev Team diff --git a/LICENSE.rtf b/LICENSE.rtf deleted file mode 100644 index 2592d38a..00000000 --- a/LICENSE.rtf +++ /dev/null @@ -1,15 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf949 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\paperw11900\paperh16840\margl1440\margr1440\vieww9480\viewh8400\viewkind0 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural - -\f0\fs24 \cf0 The Mana World is released under the GPL - more info at www.themanaworld.org\ -\ -SDL is used under the LGPL - more info at www.libsdl.org\ -\ -SDL_image, SDL_ttf, SDL_mixer and SDL_net are used under the LGPL - more info at www.libsdl.org/libs\ -\ -physfs is used under the BSD license - more info at http://icculus.org/physfs/\ -\ -zlib is used under the BSD license - more info at www.zlib.net}
\ No newline at end of file diff --git a/Makefile.am b/Makefile.am index ae62a99b..2d7250cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = data docs po src desktopdir = $(datadir)/applications -desktop_DATA = aethyra.desktop +desktop_DATA = tmw.desktop # Extra files to include EXTRA_DIST = $(desktop_DATA) diff --git a/Aethyra.vcproj b/ManaWorld.vcproj index 7a42b19d..478a345c 100644 --- a/Aethyra.vcproj +++ b/ManaWorld.vcproj @@ -2,9 +2,9 @@ <VisualStudioProject ProjectType="Visual C++" Version="8,00" - Name="Aethyra" + Name="ManaWorld" ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}" - RootNamespace="Aethyra" + RootNamespace="ManaWorld" Keyword="Win32Proj" SignManifests="true" > @@ -65,11 +65,11 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="physfs.lib sdl.lib sdlmain.lib sdl_image.lib sdl_mixer.lib guichan.lib guichan_sdl.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib" - OutputFile="$(OutDir)/Aethyra.exe" + OutputFile="$(OutDir)/ManaWorld.exe" LinkIncremental="2" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/Aethyra.pdb" + ProgramDatabaseFile="$(OutDir)/ManaWorld.pdb" SubSystem="2" TargetMachine="1" /> @@ -144,7 +144,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="physfs.lib alleg.lib guichan.lib guichan_sdl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib" - OutputFile="aethyra.exe" + OutputFile="tmw.exe" LinkIncremental="1" IgnoreDefaultLibraryNames="LIBC.lib" GenerateDebugInformation="true" @@ -254,19 +254,11 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath=".\src\animatedsprite.cpp" + RelativePath=".\src\base64.cpp" > </File> <File - RelativePath=".\src\animatedsprite.h" - > - </File> - <File - RelativePath=".\src\animationparticle.cpp" - > - </File> - <File - RelativePath=".\src\animationparticle.h" + RelativePath=".\src\base64.h" > </File> <File @@ -278,18 +270,6 @@ > </File> <File - RelativePath=".\src\beingmanager.cpp" - > - </File> - <File - RelativePath=".\src\beingmanager.h" - > - </File> - <File - RelativePath=".\src\configlistener.h" - > - </File> - <File RelativePath=".\src\configuration.cpp" > </File> @@ -306,18 +286,6 @@ > </File> <File - RelativePath=".\src\equipment.cpp" - > - </File> - <File - RelativePath=".\src\equipment.h" - > - </File> - <File - RelativePath=".\src\extensions.h" - > - </File> - <File RelativePath=".\src\floor_item.cpp" > </File> @@ -342,66 +310,6 @@ > </File> <File - RelativePath=".\src\guichanfwd.h" - > - </File> - <File - RelativePath=".\src\imageparticle.cpp" - > - </File> - <File - RelativePath=".\src\imageparticle.h" - > - </File> - <File - RelativePath=".\src\inventory.cpp" - > - </File> - <File - RelativePath=".\src\inventory.h" - > - </File> - <File - RelativePath=".\src\item.cpp" - > - </File> - <File - RelativePath=".\src\item.h" - > - </File> - <File - RelativePath=".\src\itemshortcut.cpp" - > - </File> - <File - RelativePath=".\src\itemshortcut.h" - > - </File> - <File - RelativePath=".\src\joystick.cpp" - > - </File> - <File - RelativePath=".\src\joystick.h" - > - </File> - <File - RelativePath=".\src\keyboardconfig.cpp" - > - </File> - <File - RelativePath=".\src\keyboardconfig.h" - > - </File> - <File - RelativePath=".\src\localplayer.cpp" - > - </File> - <File - RelativePath=".\src\localplayer.h" - > - </File> - <File RelativePath=".\src\log.cpp" > </File> @@ -410,10 +318,6 @@ > </File> <File - RelativePath=".\src\logindata.h" - > - </File> - <File RelativePath=".\src\main.cpp" > </File> @@ -430,102 +334,6 @@ > </File> <File - RelativePath=".\src\monster.cpp" - > - </File> - <File - RelativePath=".\src\monster.h" - > - </File> - <File - RelativePath=".\src\npc.cpp" - > - </File> - <File - RelativePath=".\src\npc.h" - > - </File> - <File - RelativePath=".\src\openglgraphics.cpp" - > - </File> - <File - RelativePath=".\src\openglgraphics.h" - > - </File> - <File - RelativePath=".\src\particle.cpp" - > - </File> - <File - RelativePath=".\src\particle.h" - > - </File> - <File - RelativePath=".\src\particleemitter.cpp" - > - </File> - <File - RelativePath=".\src\particleemitter.h" - > - </File> - <File - RelativePath=".\src\party.cpp" - > - </File> - <File - RelativePath=".\src\party.h" - > - </File> - <File - RelativePath=".\src\player.cpp" - > - </File> - <File - RelativePath=".\src\player.h" - > - </File> - <File - RelativePath=".\src\player_relations.cpp" - > - </File> - <File - RelativePath=".\src\player_relations.h" - > - </File> - <File - RelativePath=".\src\properties.h" - > - </File> - <File - RelativePath=".\src\recorder.cpp" - > - </File> - <File - RelativePath=".\src\recorder.h" - > - </File> - <File - RelativePath=".\src\serverinfo.h" - > - </File> - <File - RelativePath=".\src\shopitem.cpp" - > - </File> - <File - RelativePath=".\src\shopitem.h" - > - </File> - <File - RelativePath=".\src\simpleanimation.cpp" - > - </File> - <File - RelativePath=".\src\simpleanimation.h" - > - </File> - <File RelativePath=".\src\sound.cpp" > </File> @@ -534,104 +342,20 @@ > </File> <Filter - Name="net" + Name="graphic" > <File - RelativePath=".\src\net\beinghandler.cpp" - > - </File> - <File - RelativePath=".\src\net\beinghandler.h" - > - </File> - <File - RelativePath=".\src\net\buysellhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\buysellhandler.h" - > - </File> - <File - RelativePath=".\src\net\charservhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\charservhandler.h" - > - </File> - <File - RelativePath=".\src\net\chathandler.cpp" - > - </File> - <File - RelativePath=".\src\net\chathandler.h" - > - </File> - <File - RelativePath=".\src\net\equipmenthandler.cpp" - > - </File> - <File - RelativePath=".\src\net\equipmenthandler.h" - > - </File> - <File - RelativePath=".\src\net\inventoryhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\inventoryhandler.h" - > - </File> - <File - RelativePath=".\src\net\itemhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\itemhandler.h" - > - </File> - <File - RelativePath=".\src\net\loginhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\loginhandler.h" - > - </File> - <File - RelativePath=".\src\net\maploginhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\maploginhandler.h" - > - </File> - <File - RelativePath=".\src\net\messagehandler.cpp" - > - </File> - <File - RelativePath=".\src\net\messagehandler.h" - > - </File> - <File - RelativePath=".\src\net\messagein.cpp" - > - </File> - <File - RelativePath=".\src\net\messagein.h" - > - </File> - <File - RelativePath=".\src\net\messageout.cpp" + RelativePath=".\src\graphic\spriteset.cpp" > </File> <File - RelativePath=".\src\net\messageout.h" + RelativePath=".\src\graphic\spriteset.h" > </File> + </Filter> + <Filter + Name="net" + > <File RelativePath=".\src\net\network.cpp" > @@ -641,30 +365,6 @@ > </File> <File - RelativePath=".\src\net\npchandler.cpp" - > - </File> - <File - RelativePath=".\src\net\npchandler.h" - > - </File> - <File - RelativePath=".\src\net\partyhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\partyhandler.h" - > - </File> - <File - RelativePath=".\src\net\playerhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\playerhandler.h" - > - </File> - <File RelativePath=".\src\net\protocol.cpp" > </File> @@ -673,19 +373,15 @@ > </File> <File - RelativePath=".\src\net\skillhandler.cpp" - > - </File> - <File - RelativePath=".\src\net\skillhandler.h" + RelativePath=".\src\net\win2linux.h" > </File> <File - RelativePath=".\src\net\tradehandler.cpp" + RelativePath=".\src\net\win2mac.cpp" > </File> <File - RelativePath=".\src\net\tradehandler.h" + RelativePath=".\src\net\win2mac.h" > </File> </Filter> @@ -709,19 +405,19 @@ > </File> <File - RelativePath=".\src\gui\button.cpp" + RelativePath=".\src\gui\buddywindow.cpp" > </File> <File - RelativePath=".\src\gui\button.h" + RelativePath=".\src\gui\buddywindow.h" > </File> <File - RelativePath=".\src\gui\buttonbox.cpp" + RelativePath=".\src\gui\button.cpp" > </File> <File - RelativePath=".\src\gui\buttonbox.h" + RelativePath=".\src\gui\button.h" > </File> <File @@ -797,35 +493,11 @@ > </File> <File - RelativePath=".\src\gui\connection.cpp" + RelativePath=".\src\gui\equipment.cpp" > </File> <File - RelativePath=".\src\gui\connection.h" - > - </File> - <File - RelativePath=".\src\gui\coulor.cpp" - > - </File> - <File - RelativePath=".\src\gui\coulor.h" - > - </File> - <File - RelativePath=".\src\gui\debugwindow.cpp" - > - </File> - <File - RelativePath=".\src\gui\debugwindow.h" - > - </File> - <File - RelativePath=".\src\gui\equipmentwindow.cpp" - > - </File> - <File - RelativePath=".\src\gui\equipmentwindow.h" + RelativePath=".\src\gui\equipment.h" > </File> <File @@ -837,14 +509,6 @@ > </File> <File - RelativePath=".\src\gui\gccontainer.cpp" - > - </File> - <File - RelativePath=".\src\gui\gccontainer.h" - > - </File> - <File RelativePath=".\src\gui\gui.cpp" > </File> @@ -877,11 +541,11 @@ > </File> <File - RelativePath=".\src\gui\inventorywindow.cpp" + RelativePath=".\src\gui\inventory.cpp" > </File> <File - RelativePath=".\src\gui\inventorywindow.h" + RelativePath=".\src\gui\inventory.h" > </File> <File @@ -901,22 +565,6 @@ > </File> <File - RelativePath=".\src\gui\itemshortcutcontainer.cpp" - > - </File> - <File - RelativePath=".\src\gui\itemshortcutcontainer.h" - > - </File> - <File - RelativePath=".\src\gui\itemshortcutwindow.cpp" - > - </File> - <File - RelativePath=".\src\gui\itemshortcutwindow.h" - > - </File> - <File RelativePath=".\src\gui\linkhandler.h" > </File> @@ -937,14 +585,6 @@ > </File> <File - RelativePath=".\src\gui\menuwindow.cpp" - > - </File> - <File - RelativePath=".\src\gui\menuwindow.h" - > - </File> - <File RelativePath=".\src\gui\minimap.cpp" > </File> @@ -953,14 +593,6 @@ > </File> <File - RelativePath=".\src\gui\ministatus.cpp" - > - </File> - <File - RelativePath=".\src\gui\ministatus.h" - > - </File> - <File RelativePath=".\src\gui\newskill.cpp" > </File> @@ -969,11 +601,11 @@ > </File> <File - RelativePath=".\src\gui\npclistdialogue.cpp" + RelativePath=".\src\gui\npc.cpp" > </File> <File - RelativePath=".\src\gui\npclistdialogue.h" + RelativePath=".\src\gui\npc.h" > </File> <File @@ -1033,11 +665,11 @@ > </File> <File - RelativePath=".\src\gui\register.cpp" + RelativePath=".\src\gui\requesttrade.cpp" > </File> <File - RelativePath=".\src\gui\register.h" + RelativePath=".\src\gui\requesttrade.h" > </File> <File @@ -1065,58 +697,6 @@ > </File> <File - RelativePath=".\src\gui\setup_audio.cpp" - > - </File> - <File - RelativePath=".\src\gui\setup_audio.h" - > - </File> - <File - RelativePath=".\src\gui\setup_colours.cpp" - > - </File> - <File - RelativePath=".\src\gui\setup_colours.h" - > - </File> - <File - RelativePath=".\src\gui\setup_joystick.cpp" - > - </File> - <File - RelativePath=".\src\gui\setup_joystick.h" - > - </File> - <File - RelativePath=".\src\gui\setup_keyboard.cpp" - > - </File> - <File - RelativePath=".\src\gui\setup_keyboard.h" - > - </File> - <File - RelativePath=".\src\gui\setup_players.cpp" - > - </File> - <File - RelativePath=".\src\gui\setup_players.h" - > - </File> - <File - RelativePath=".\src\gui\setup_video.cpp" - > - </File> - <File - RelativePath=".\src\gui\setup_video.h" - > - </File> - <File - RelativePath=".\src\gui\setuptab.h" - > - </File> - <File RelativePath=".\src\gui\shop.cpp" > </File> @@ -1125,14 +705,6 @@ > </File> <File - RelativePath=".\src\gui\shoplistbox.cpp" - > - </File> - <File - RelativePath=".\src\gui\shoplistbox.h" - > - </File> - <File RelativePath=".\src\gui\skill.cpp" > </File> @@ -1149,11 +721,11 @@ > </File> <File - RelativePath=".\src\gui\speechbubble.cpp" + RelativePath=".\src\gui\stats.cpp" > </File> <File - RelativePath=".\src\gui\speechbubble.h" + RelativePath=".\src\gui\stats.h" > </File> <File @@ -1165,30 +737,6 @@ > </File> <File - RelativePath=".\src\gui\tabbedcontainer.cpp" - > - </File> - <File - RelativePath=".\src\gui\tabbedcontainer.h" - > - </File> - <File - RelativePath=".\src\gui\table.cpp" - > - </File> - <File - RelativePath=".\src\gui\table.h" - > - </File> - <File - RelativePath=".\src\gui\table_model.cpp" - > - </File> - <File - RelativePath=".\src\gui\table_model.h" - > - </File> - <File RelativePath=".\src\gui\textbox.cpp" > </File> @@ -1229,14 +777,6 @@ > </File> <File - RelativePath=".\src\gui\viewport.cpp" - > - </File> - <File - RelativePath=".\src\gui\viewport.h" - > - </File> - <File RelativePath=".\src\gui\window.cpp" > </File> @@ -1252,59 +792,11 @@ RelativePath=".\src\gui\windowcontainer.h" > </File> - <Filter - Name="widgets" - > - <File - RelativePath=".\src\gui\dropdown.cpp" - > - </File> - <File - RelativePath=".\src\gui\dropdown.h" - > - </File> - <File - RelativePath=".\src\gui\gettext.h" - > - </File> - <File - RelativePath=".\src\gui\resizegrip.cpp" - > - </File> - <File - RelativePath=".\src\gui\resizegrip.h" - > - </File> - </Filter> </Filter> <Filter Name="resources" > <File - RelativePath=".\src\resources\action.cpp" - > - </File> - <File - RelativePath=".\src\resources\action.h" - > - </File> - <File - RelativePath=".\src\resources\ambiantoverlay.cpp" - > - </File> - <File - RelativePath=".\src\resources\ambiantoverlay.h" - > - </File> - <File - RelativePath=".\src\resources\animation.cpp" - > - </File> - <File - RelativePath=".\src\resources\animation.h" - > - </File> - <File RelativePath=".\src\resources\buddylist.cpp" > </File> @@ -1313,14 +805,6 @@ > </File> <File - RelativePath=".\src\resources\dye.cpp" - > - </File> - <File - RelativePath=".\src\resources\dye.h" - > - </File> - <File RelativePath=".\src\resources\image.cpp" > </File> @@ -1329,38 +813,6 @@ > </File> <File - RelativePath=".\src\resources\imageloader.cpp" - > - </File> - <File - RelativePath=".\src\resources\imageloader.h" - > - </File> - <File - RelativePath=".\src\resources\imageset.cpp" - > - </File> - <File - RelativePath=".\src\resources\imageset.h" - > - </File> - <File - RelativePath=".\src\resources\imagewriter.cpp" - > - </File> - <File - RelativePath=".\src\resources\imagewriter.h" - > - </File> - <File - RelativePath=".\src\resources\itemdb.cpp" - > - </File> - <File - RelativePath=".\src\resources\itemdb.h" - > - </File> - <File RelativePath=".\src\resources\iteminfo.cpp" > </File> @@ -1369,27 +821,19 @@ > </File> <File - RelativePath=".\src\resources\mapreader.cpp" + RelativePath=".\src\resources\itemmanager.cpp" > </File> <File - RelativePath=".\src\resources\mapreader.h" - > - </File> - <File - RelativePath=".\src\resources\monsterdb.cpp" + RelativePath=".\src\resources\itemmanager.h" > </File> <File - RelativePath=".\src\resources\monsterdb.h" - > - </File> - <File - RelativePath=".\src\resources\monsterinfo.cpp" + RelativePath=".\src\resources\mapreader.cpp" > </File> <File - RelativePath=".\src\resources\monsterinfo.h" + RelativePath=".\src\resources\mapreader.h" > </File> <File @@ -1401,14 +845,6 @@ > </File> <File - RelativePath=".\src\resources\npcdb.cpp" - > - </File> - <File - RelativePath=".\src\resources\npcdb.h" - > - </File> - <File RelativePath=".\src\resources\resource.cpp" > </File> @@ -1432,62 +868,6 @@ RelativePath=".\src\resources\soundeffect.h" > </File> - <File - RelativePath=".\src\resources\spritedef.cpp" - > - </File> - <File - RelativePath=".\src\resources\spritedef.h" - > - </File> - </Filter> - <Filter - Name="utils" - > - <File - RelativePath=".\src\utils\base64.cpp" - > - </File> - <File - RelativePath=".\src\utils\base64.h" - > - </File> - <File - RelativePath=".\src\utils\dtor.h" - > - </File> - <File - RelativePath=".\src\utils\fastsqrt.h" - > - </File> - <File - RelativePath=".\src\utils\minmax.h" - > - </File> - <File - RelativePath=".\src\utils\strprintf.cpp" - > - </File> - <File - RelativePath=".\src\utils\strprintf.h" - > - </File> - <File - RelativePath=".\src\utils\tostring.h" - > - </File> - <File - RelativePath=".\src\utils\trim.h" - > - </File> - <File - RelativePath=".\src\utils\xml.cpp" - > - </File> - <File - RelativePath=".\src\utils\xml.h" - > - </File> </Filter> </Filter> </Files> @@ -1,9 +1,18 @@ -0.0.27 (...) +0.0.28 (25 January 2009) +- Added support for animated map tiles +- Added support for internationalization, plus many translations +- Added support for TrueType fonts +- Trade window is now resizable +- Obscure precise home directory name when making screenshots +- Fixed follow-parent of nested and being-following particle emitters + +0.0.27 (9 December 2008) - Added support for showing map name above minimap - Added showing how long the ban is when banned - Added --data parameter for developers - Added particle effect for critical hits - Added support for dynamic skill names and hair colors +- Added support for status effects - Added ability to add equipment to the shortcut bar - Added ability to change configuration during login phase (from Aethyra) - Mouse cursor will now hide when not used for some time @@ -14,12 +23,14 @@ - Only require a restart to switch to full screen with OpenGL on Windows - Make sure news and update file list aren't cached (from Aethyra) - Made NPC dialogs resizable (from Aethyra) +- Made window shortcuts configurable - Fixed visibility of trade window on startup - Fixed a client input freeze when closing NPC script from server - Fixed dead players to lie on the ground instead of standing around - Fixed shortcuts being activated when trade window was visible - Fixed a crash when equipment window is open - Fixed money value on failing to buy (from Aethyra) +- Fixed crash in right-click menu when used after a being disappeared 0.0.26 (29 August 2008) - Added support for a newer version of eAthena server @@ -365,7 +376,7 @@ - Added 'enter' key support in login screen - Added RLE sprites for tiles - Added collision detection with beings -- Fix for mapserver segfault-bug in chatsystem (broken pipe for all users on +- Fix for mapserver segfault-bug in chatsystem (broken pipe for all users on screen) - Partially added TMW GUI to inventory - Added soundpool that can preload, play and remove items to/from ram @@ -1,14 +1,14 @@ -AETHYRA -=================== +THE MANA WORLD +============== - Version: 0.0.27 Date: 12/07/2008 + Version: 0.0.28 Date: 25/1/2009 Development team: - See AUTHORS file for a list Powered by: - - SDL, SDL_image, SDL_mixer (Media framework) + - SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_net (Media framework) - Guichan (GUI framework) - libxml2 (XML parsing and writing) - PhysFS (Data files) @@ -122,10 +122,9 @@ level 10: enables not used If you're having troubles, please first of all read the FAQ. If you can't find a solution to your problem, feel free to check our Bugs/Support section of the forum: -- http://www.aethyra.org/forums +- http://themanaworld.org/phpBB2/viewforum.php?f=3 or come visit us on our IRC channel: -- #aethyra @ irc.freenode.net -- #aedev @ irc.freenode.net +- #themanaworld @ irc.freenode.net Otherwise check the AUTHORS file to have a list of developers and how to contact them. diff --git a/Aethyra.dev b/The Mana World.dev index 6bfb1bfa..76728f25 100644 --- a/Aethyra.dev +++ b/The Mana World.dev @@ -1,13 +1,13 @@ [Project] -FileName=Aethyra.dev -Name=aethyra +FileName=The Mana World.dev +Name=tmw UnitCount=277 Type=0 Ver=1 ObjFiles= Includes= Libs= -PrivateResource=Aethyra_private.rc +PrivateResource=The_Mana_World_private.rc ResourceIncludes= MakeIncludes= Compiler= @@ -18,7 +18,7 @@ Icon= ExeOutput= ObjectOutput=obj OverrideOutput=1 -OverrideOutputName=aethyra.exe +OverrideOutputName=tmw.exe HostApplication= Folders=gui,gui/header,gui/source,header,header/widgets,net,net/header,net/source,resources,utils CommandLine= @@ -77,6 +77,16 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= +[Unit22] +FileName=src\gui\buddywindow.cpp +CompileCpp=1 +Folder=gui/source +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + [Unit25] FileName=src\gui\button.h CompileCpp=1 diff --git a/The Mana World.icns b/The Mana World.icns Binary files differnew file mode 100644 index 00000000..7230a099 --- /dev/null +++ b/The Mana World.icns diff --git a/WinReadMe.txt b/WinReadMe.txt deleted file mode 100644 index a77ce944..00000000 --- a/WinReadMe.txt +++ /dev/null @@ -1,22 +0,0 @@ -To run aethyra double click on aethyra.exe in this folder. - -There are a couple of known bugs you might run into first run... - -aethyra.exe might complain about not being able to create it's -configuration folder. If it crashes out just run it again. - -You may also have issues with the aethyra crashing with lots of -updates. Again just run it again and it should continue the update -from where it left off. - -To install the client, just copy this folder to your Program Files -folder and add a shortcut to aethyra.exe to your Start Menu. - -For any further questions pop onto the forums at http://www.aethyra.org/forums/ -especially the Windows Way forum, or pop onto the IRC channel #aethyra on the -FreeNode network - -If you don't have an IRC client you can still get to the -channel through this page: http://www.aethyra.com/ircchat.html - -Thanks for playing from the Aethyra team. diff --git a/aethyra.png b/aethyra.png Binary files differdeleted file mode 100644 index b3c128f7..00000000 --- a/aethyra.png +++ /dev/null diff --git a/autobuild.sh b/autobuild.sh deleted file mode 100755 index 7ebbeaad..00000000 --- a/autobuild.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# auto build script based on fedora but usable for other distros -#author=Blame <blame582@gmail.com> -#last modified date 2008-09-29 Blameu -# right now thes should be ok for testing -file=/etc/fedora-release -file1=/etc/lsb-release - -echo "Generating build information using aclocal, autoheader, automake and autoconf." -echo - -# Regerate configuration files -autoreconf -i - -echo -echo "Now you are ready to run ./configure" - -./configure - -echo -echo "now running make" - -make - -echo -echo "now running make install please input your root password"; -# we must test for fedora first otherwise we get an error -if [ -e $file ]; then - echo "Fedora found"; - su -c "make install"; - su -c "make clean"; - echo "Done"; - aethyra & - exit 1; -elif [ -e $file1 ];then - echo "ubuntu found"; - sudo make install; - aethyra & - exit 1; -else - echo "login as root and run make install" -fi -echo "done" - diff --git a/configure.ac b/configure.ac index 468a85d2..6162dca7 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ(2.59) -AC_INIT([Aethyra], [0.0.27.1], [irarice@gmail.com], [aethyra]) +AC_INIT([The Mana World], [0.0.28], [themanaworld-devel@lists.sourceforge.net], [tmw]) +AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS @@ -32,26 +33,44 @@ AC_CHECK_LIB([pthread], [pthread_create], , AC_MSG_ERROR([ *** Unable to find pthread library])) AC_CHECK_LIB([guichan], [gcnGuichanVersion], , -AC_MSG_ERROR([ *** Unable to find Guichan library (guichan.sf.net)])) +AC_MSG_ERROR([ *** Unable to find Guichan library (http://guichan.sf.net/)])) +AC_CHECK_HEADERS([guichan.hpp], , +AC_MSG_ERROR([ *** Guichan library found but cannot find headers (http://guichan.sf.net/)])) -#AC_CHECK_LIB([guichan_sdl], [gcnSDL], , -#AC_MSG_ERROR([ *** Unable to find Guichan SDL library (guichan.sf.net)])) +if test -n "$SDL_CONFIG"; then + LIBS="$LIBS `$SDL_CONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$SDL_CONFIG --cflags`" +fi +AC_CHECK_LIB([SDL], [SDL_Init], , +AC_MSG_ERROR([ *** Unable to find SDL library (http://www.libsdl.org/)])) +AC_CHECK_HEADERS([SDL.h], , +AC_MSG_ERROR([ *** SDL library found but cannot find headers (http://www.libsdl.org/)])) AC_CHECK_LIB([z], [inflate], , AC_MSG_ERROR([ *** Unable to find zlib (http://www.gzip.org/zlib/)])) AC_CHECK_LIB([physfs], [PHYSFS_init], , -AC_MSG_ERROR([ *** Unable to find PhysFS library (icculus.org/physfs/)])) +AC_MSG_ERROR([ *** Unable to find PhysFS library (http://icculus.org/physfs/)])) +AC_CHECK_HEADERS([physfs.h], , +AC_MSG_ERROR([ *** PhysFS library found but cannot find headers (http://icculus.org/physfs/)])) +if test -n "$CURL_CONFIG"; then + LIBS="$LIBS `$CURL_CONFIG --libs`" + CPPFLAGS="$CPPFLAGS `$CURL_CONFIG --cflags`" +fi AC_CHECK_LIB([curl], [curl_global_init], , AC_MSG_ERROR([ *** Unable to find CURL library (http://curl.haxx.se/)])) -CURL_LIBS=" `curl-config --libs`" -CURL_CFLAGS=" `curl-config --cflags` " -AC_SUBST(CURL_LIBS) -AC_SUBST(CURL_CFLAGS) +AC_CHECK_HEADERS([curl/curl.h], , +AC_MSG_ERROR([ *** CURL library found but cannot find headers (http://curl.haxx.se/)])) +if test -n "$PKG_CONFIG"; then + LIBS="$LIBS `$PKG_CONFIG --libs libxml-2.0`" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libxml-2.0`" +fi AC_CHECK_LIB([xml2], [xmlInitParser], , -AC_MSG_ERROR([ *** Unable to find libxml2 library (xmlsoft.org)])) +AC_MSG_ERROR([ *** Unable to find libxml2 library (http://xmlsoft.org/)])) +AC_CHECK_HEADERS([libxml/xmlreader.h], , +AC_MSG_ERROR([ *** libxml2 library found but cannot find headers (http://xmlsoft.org/)])) AC_CHECK_LIB(png, png_write_info, , AC_MSG_ERROR([ *** Unable to find png library])) @@ -66,6 +85,9 @@ AC_MSG_ERROR([ *** Unable to find SDL_ttf library (http://www.libsdl.org/project AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio], , AC_MSG_ERROR([ *** Unable to find SDL_mixer library (http://www.libsdl.org/projects/SDL_mixer/)])) +AC_CHECK_LIB([guichan_sdl], [gcnSDL], , +AC_MSG_ERROR([ *** Unable to find Guichan SDL library (http://guichan.sf.net/)])) + AC_CHECK_LIB(SDL_net, SDLNet_Init, , AC_MSG_ERROR([ *** Unable to find SDL_net library])) @@ -73,12 +95,6 @@ AC_MSG_ERROR([ *** Unable to find SDL_net library])) AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h]) -# Check for guichan headers -AC_CHECK_HEADERS([guichan.hpp], , -AC_MSG_ERROR([*** Library found but cannot find headers (guichan.sf.net) *** ])) - -AM_INIT_AUTOMAKE - # Option to enable OpenGL AC_ARG_WITH(opengl,[ --without-opengl don't use OpenGL ] ) if test "x$with_opengl" == "xno"; then @@ -87,24 +103,7 @@ else with_opengl=yes AC_CHECK_LIB([GL], [glBegin], , AC_MSG_ERROR([ *** Unable to find OpenGL library])) - AC_DEFINE(USE_OPENGL, 1, [Defines if aethyra should use an OpenGL display]) -fi - -# Search for sdl-config -AC_PATH_PROG(LIBSDL_CONFIG, sdl-config) - -if test -n "$LIBSDL_CONFIG"; then - LIBSDL_LIBS="`$LIBSDL_CONFIG --libs` -lSDL_image -lSDL_mixer -lSDL_ttf" - LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`" - AC_SUBST(LIBSDL_LIBS) - AC_SUBST(LIBSDL_CFLAGS) - - AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 1, - [Defines if your system has the LIBSDL library]) -else - AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 0, - [Defines if your system has the LIBSDL library]) - AC_MSG_ERROR([Could not find sdl-config, check http://www.libsdl.org]) + AC_DEFINE(USE_OPENGL, 1, [Defines if tmw should use an OpenGL display]) fi AC_CONFIG_FILES([ diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 4aa0cdd5..35b9d4e2 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,3 +4,4 @@ ADD_SUBDIRECTORY(fonts) ADD_SUBDIRECTORY(graphics) ADD_SUBDIRECTORY(help) ADD_SUBDIRECTORY(icons) +ADD_SUBDIRECTORY(fonts) diff --git a/data/Makefile.am b/data/Makefile.am index 44f795ef..62672207 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = fonts graphics help icons -aethyradatadir = $(pkgdatadir)/data +tmwdatadir = $(pkgdatadir)/data diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am index 1b575f7d..5aa02999 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -1,9 +1,8 @@ +fontsdir = $(pkgdatadir)/data/fonts -fontdir = $(pkgdatadir)/data/fonts - -font_DATA = \ +fonts_DATA = \ dejavusans.ttf \ dejavusans-bold.ttf EXTRA_DIST = \ - $(font_DATA) + $(fonts_DATA) diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index c5961f7a..6351d5ba 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -1,5 +1,6 @@ SET (FILES bg_quad_dis.png + bubble.png button.png button_disabled.png buttonhi.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 921469a1..eb4c7365 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -3,6 +3,7 @@ guidir = $(pkgdatadir)/data/graphics/gui gui_DATA = \ bg_quad_dis.png \ + bubble.png \ button.png \ button_disabled.png \ buttonhi.png \ diff --git a/data/graphics/gui/bg_quad_dis.png b/data/graphics/gui/bg_quad_dis.png Binary files differindex b79b9ca7..3a0354bb 100644 --- a/data/graphics/gui/bg_quad_dis.png +++ b/data/graphics/gui/bg_quad_dis.png diff --git a/data/graphics/gui/bubble.png b/data/graphics/gui/bubble.png Binary files differnew file mode 100644 index 00000000..45322eb2 --- /dev/null +++ b/data/graphics/gui/bubble.png diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png Binary files differindex ff50a908..9ebbea63 100644 --- a/data/graphics/gui/button.png +++ b/data/graphics/gui/button.png diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png Binary files differindex cb5a1b01..0ce3aa6f 100644 --- a/data/graphics/gui/button_disabled.png +++ b/data/graphics/gui/button_disabled.png diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png Binary files differindex da30f283..c4772634 100644 --- a/data/graphics/gui/buttonhi.png +++ b/data/graphics/gui/buttonhi.png diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png Binary files differindex 4c45a45f..e9cd1765 100644 --- a/data/graphics/gui/buttonpress.png +++ b/data/graphics/gui/buttonpress.png diff --git a/data/graphics/gui/checkbox.png b/data/graphics/gui/checkbox.png Binary files differindex bf8e9052..669ecf03 100644 --- a/data/graphics/gui/checkbox.png +++ b/data/graphics/gui/checkbox.png diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png Binary files differindex a0a6d144..f87cc2a9 100644 --- a/data/graphics/gui/close_button.png +++ b/data/graphics/gui/close_button.png diff --git a/data/graphics/gui/deepbox.png b/data/graphics/gui/deepbox.png Binary files differindex 0980f57e..ed3231f3 100644 --- a/data/graphics/gui/deepbox.png +++ b/data/graphics/gui/deepbox.png diff --git a/data/graphics/gui/hscroll_left_default.png b/data/graphics/gui/hscroll_left_default.png Binary files differindex 6d21e7c0..2f763d30 100644 --- a/data/graphics/gui/hscroll_left_default.png +++ b/data/graphics/gui/hscroll_left_default.png diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png Binary files differindex 1dd79658..6be5ae25 100644 --- a/data/graphics/gui/hscroll_left_highlight.png +++ b/data/graphics/gui/hscroll_left_highlight.png diff --git a/data/graphics/gui/hscroll_left_pressed.png b/data/graphics/gui/hscroll_left_pressed.png Binary files differindex 92478ec8..b8ebcb46 100644 --- a/data/graphics/gui/hscroll_left_pressed.png +++ b/data/graphics/gui/hscroll_left_pressed.png diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png Binary files differindex 94c0efeb..33fdddd0 100644 --- a/data/graphics/gui/hscroll_right_default.png +++ b/data/graphics/gui/hscroll_right_default.png diff --git a/data/graphics/gui/hscroll_right_highlight.png b/data/graphics/gui/hscroll_right_highlight.png Binary files differindex ef56538f..e9e633ea 100644 --- a/data/graphics/gui/hscroll_right_highlight.png +++ b/data/graphics/gui/hscroll_right_highlight.png diff --git a/data/graphics/gui/hscroll_right_pressed.png b/data/graphics/gui/hscroll_right_pressed.png Binary files differindex 36cff58a..53972f2b 100644 --- a/data/graphics/gui/hscroll_right_pressed.png +++ b/data/graphics/gui/hscroll_right_pressed.png diff --git a/data/graphics/gui/item_shortcut_bgr.png b/data/graphics/gui/item_shortcut_bgr.png Binary files differindex 01f1643a..e878fc7a 100644 --- a/data/graphics/gui/item_shortcut_bgr.png +++ b/data/graphics/gui/item_shortcut_bgr.png diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png Binary files differindex 6c1b7e8e..84dc2ad1 100644 --- a/data/graphics/gui/mouse.png +++ b/data/graphics/gui/mouse.png diff --git a/data/graphics/gui/radioin.png b/data/graphics/gui/radioin.png Binary files differindex 9034f469..12e027fe 100644 --- a/data/graphics/gui/radioin.png +++ b/data/graphics/gui/radioin.png diff --git a/data/graphics/gui/radioout.png b/data/graphics/gui/radioout.png Binary files differindex 4e088943..5eb67bd8 100644 --- a/data/graphics/gui/radioout.png +++ b/data/graphics/gui/radioout.png diff --git a/data/graphics/gui/resize.png b/data/graphics/gui/resize.png Binary files differindex 9890f83f..6b31ac64 100644 --- a/data/graphics/gui/resize.png +++ b/data/graphics/gui/resize.png diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png Binary files differindex 32adf4f7..1f6e6b35 100644 --- a/data/graphics/gui/slider.png +++ b/data/graphics/gui/slider.png diff --git a/data/graphics/gui/tab.png b/data/graphics/gui/tab.png Binary files differindex 71de8c8b..91eadf08 100644 --- a/data/graphics/gui/tab.png +++ b/data/graphics/gui/tab.png diff --git a/data/graphics/gui/tabselected.png b/data/graphics/gui/tabselected.png Binary files differindex 98dd41c6..e2983060 100644 --- a/data/graphics/gui/tabselected.png +++ b/data/graphics/gui/tabselected.png diff --git a/data/graphics/gui/vscroll_blue.png b/data/graphics/gui/vscroll_blue.png Binary files differindex 295ca1a5..397501ce 100644 --- a/data/graphics/gui/vscroll_blue.png +++ b/data/graphics/gui/vscroll_blue.png diff --git a/data/graphics/gui/vscroll_down_default.png b/data/graphics/gui/vscroll_down_default.png Binary files differindex 4bf696b0..c4292489 100644 --- a/data/graphics/gui/vscroll_down_default.png +++ b/data/graphics/gui/vscroll_down_default.png diff --git a/data/graphics/gui/vscroll_down_highlight.png b/data/graphics/gui/vscroll_down_highlight.png Binary files differindex a7459745..ac88f7c7 100644 --- a/data/graphics/gui/vscroll_down_highlight.png +++ b/data/graphics/gui/vscroll_down_highlight.png diff --git a/data/graphics/gui/vscroll_down_pressed.png b/data/graphics/gui/vscroll_down_pressed.png Binary files differindex e6238024..9dcc89f6 100644 --- a/data/graphics/gui/vscroll_down_pressed.png +++ b/data/graphics/gui/vscroll_down_pressed.png diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png Binary files differindex 4d950a32..87ba8758 100644 --- a/data/graphics/gui/vscroll_grey.png +++ b/data/graphics/gui/vscroll_grey.png diff --git a/data/graphics/gui/vscroll_red.png b/data/graphics/gui/vscroll_red.png Binary files differindex 0e50513c..d7ad4a90 100644 --- a/data/graphics/gui/vscroll_red.png +++ b/data/graphics/gui/vscroll_red.png diff --git a/data/graphics/gui/vscroll_up_default.png b/data/graphics/gui/vscroll_up_default.png Binary files differindex c08a2b2a..1cecc351 100644 --- a/data/graphics/gui/vscroll_up_default.png +++ b/data/graphics/gui/vscroll_up_default.png diff --git a/data/graphics/gui/vscroll_up_highlight.png b/data/graphics/gui/vscroll_up_highlight.png Binary files differindex 2f5ffade..7b5009f3 100644 --- a/data/graphics/gui/vscroll_up_highlight.png +++ b/data/graphics/gui/vscroll_up_highlight.png diff --git a/data/graphics/gui/vscroll_up_pressed.png b/data/graphics/gui/vscroll_up_pressed.png Binary files differindex 102bac86..2320ec42 100644 --- a/data/graphics/gui/vscroll_up_pressed.png +++ b/data/graphics/gui/vscroll_up_pressed.png diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am index e003bc7a..4df6b7ed 100644 --- a/data/graphics/images/Makefile.am +++ b/data/graphics/images/Makefile.am @@ -2,11 +2,7 @@ imagesdir = $(pkgdatadir)/data/graphics/images images_DATA = \ error.png \ - login_wallpaper.png \ - login_wallpaper_1024x768.png \ - login_wallpaper_1280x960.png \ - login_wallpaper_1440x1080.png \ - login_wallpaper_1600x1200.png + login_wallpaper.png EXTRA_DIST = \ $(images_DATA) diff --git a/data/graphics/images/copyright.txt b/data/graphics/images/copyright.txt deleted file mode 100644 index 2eb4c9df..00000000 --- a/data/graphics/images/copyright.txt +++ /dev/null @@ -1,6 +0,0 @@ -The login wallpaper (Mitsukai Hana) is used by permission of Kayla Shirley (kai_kaiyla@live.com). All rights are reserved by her. - -The login wallpaper with permission of the author is now licenced under -a CC-NC (Creative Commons Non-Commercial) licence. - -http://creativecommons.org/licenses/by-nc/3.0/ diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png Binary files differindex 06a9e94f..7af4f913 100644 --- a/data/graphics/images/login_wallpaper.png +++ b/data/graphics/images/login_wallpaper.png diff --git a/data/graphics/images/login_wallpaper_1024x768.png b/data/graphics/images/login_wallpaper_1024x768.png Binary files differdeleted file mode 100644 index 1239c6b0..00000000 --- a/data/graphics/images/login_wallpaper_1024x768.png +++ /dev/null diff --git a/data/graphics/images/login_wallpaper_1280x960.png b/data/graphics/images/login_wallpaper_1280x960.png Binary files differdeleted file mode 100644 index a7cf1242..00000000 --- a/data/graphics/images/login_wallpaper_1280x960.png +++ /dev/null diff --git a/data/graphics/images/login_wallpaper_1440x1080.png b/data/graphics/images/login_wallpaper_1440x1080.png Binary files differdeleted file mode 100644 index f0659073..00000000 --- a/data/graphics/images/login_wallpaper_1440x1080.png +++ /dev/null diff --git a/data/graphics/images/login_wallpaper_1600x1200.png b/data/graphics/images/login_wallpaper_1600x1200.png Binary files differdeleted file mode 100644 index 9e8d6663..00000000 --- a/data/graphics/images/login_wallpaper_1600x1200.png +++ /dev/null diff --git a/data/help/about.txt b/data/help/about.txt index 79840ad6..812aad84 100644 --- a/data/help/about.txt +++ b/data/help/about.txt @@ -1,40 +1,17 @@ <- @@index|Back to Index@@ -##3 === ABOUT Aethyra === +##3 === ABOUT THE MANA WORLD === - ##2Aethyra (Ae)##P Aethyra is a 2D MMORPG, using the eAthena server - (an open-source clone of the commercial Ragnarok Online server). It - features expanding lands and community-made graphics, making for a - fun, free, open source community project. - - ##PAethyra started out as "The Mana Experiment," an experimental - test-server for community-developed content designed for The Mana - World which was put into action by Blame, Sanga, and Sertaline. - ##PSoon thereafter, it became evident that it was taking far too - long for the elitist development team at The Mana World to - implement good tested-content. They made excuses and treated the - long-awaited custom server TMWServ as the answer to all the problems, - and left the eAthena server (which The Mana World still runs on) - to rot. Many development team members lost interest in helping, and - the programmers forsook the eAthena server saying that it would - simply delay TMWServ progress for months to fix the simplest of - errors. In response to this, The Mana Experiment became a fork - project, and an official game server. - ##PTime passed, and more and more content was tested and implemented. - Soon, discussion began for a name. Aethyra was chosen, and the Game - you see now was setup. Content development has never been better, and - the staff never more motivated! Stay on the lookout for more exciting - Aethyra developments! - -##3 === Aethyra's Goal === - - ##PAethyra is a community driven experiment that utilizes eAthena at - its core with the end goal of getting its players as involved in the - process as much as possible. It's originally forked from The Mana - World when its developers came up with the idea of "Why should we - have to wait for an MMORPG game in development when we've already got - a great server setup here that does everything we've been promised - and more?" ##P As such, we are trying to implement as many functions - of eAthena as possible while creating our own in the process based - on what our players want to see. + ##2The Mana World (TMW)##P is a serious effort to create an innovative free + and open source MMORPG. TMW uses 2D graphics and aims to create a + large and diverse interactive world. It is licensed under the GPL, + making sure this game can't ever run away from you. + + The project includes the development of both a client and a server, + as well as the development of an online world. At the moment we're + making alpha releases of the client, while our server is in early + development. The eAthena free software Ragnarok Online server is used + until our own server has matured enough to replace it. Once ready, + we'll be making releases of our server too so anybody will be free to + set up their own server and start building their own online world. diff --git a/data/help/changes.txt b/data/help/changes.txt index 60e78419..62eed904 100644 --- a/data/help/changes.txt +++ b/data/help/changes.txt @@ -2,7 +2,80 @@ ##3 === RECENT CHANGES === - -Go to http://gitorious.org/projects/tmw/repos/aethyra for a detailed -list of changes. - + + 0.0.28 (25 January 2009) + - Added support for animated map tiles + - Added support for internationalization, plus many translations + - Added support for TrueType fonts + - Trade window is now resizable + - Obscure precise home directory name when making screenshots + - Fixed follow-parent of nested and being-following particle emitters + + 0.0.27 (9 December 2008) + - Added support for showing map name above minimap + - Added showing how long the ban is when banned + - Added --data parameter for developers + - Added particle effect for critical hits + - Added support for dynamic skill names and hair colors + - Added support for status effects + - Added ability to add equipment to the shortcut bar + - Added ability to change configuration during login phase (from Aethyra) + - Mouse cursor will now hide when not used for some time + - Inventory window now displays amount of slots used + - Center minimap on player when it is larger than the minimap window + - Extended particle emitters with properties that can change over time + - Extended the GUI font to support more characters + - Only require a restart to switch to full screen with OpenGL on Windows + - Make sure news and update file list aren't cached (from Aethyra) + - Made NPC dialogs resizable (from Aethyra) + - Made window shortcuts configurable + - Fixed visibility of trade window on startup + - Fixed a client input freeze when closing NPC script from server + - Fixed dead players to lie on the ground instead of standing around + - Fixed shortcuts being activated when trade window was visible + - Fixed a crash when equipment window is open + - Fixed money value on failing to buy (from Aethyra) + - Fixed crash in right-click menu when used after a being disappeared + + 0.0.26 (29 August 2008) + - Added support for a newer version of eAthena server + - Added support for showing custom being effects + - Added new features to the particle engine + - Position names and chat such that there is no overlap, when possible + - Fixed a crash when loading a corrupt map that has too much layer data + + 0.0.25 (27 July 2008) + - Added support for whispering to other players + - Added ability to ignore other players + - Added command line argument for specifying the update host (-H) + - Added support for receiving the update host from the server + - Added support for displaying a shield sprite + - Added shortcut window, allowing you to quickly access inventory items + - Added message when gaining money from trade or quest + - Added support for an arbitrary number of map layers + - Added support for basing one sprite definition on another + - Added the possibility to assign particle effects to NPCs + - Added remembering whether windows are visible or not + - Updated to work with Guichan 0.8.x + - Improved accuracy of monster targeting with the mouse + - Page up and page down will now scroll the chat window + - Item icons are now loaded on demand and unloaded when no longer used + - Fixed display of critical hits + - Fixed multi-channel image dyeing + - Fixed updating of money display after buying + + 0.0.24.1 (7 April 2008) + - Added /clear command to clear chat window + - Added ability to close quit dialog by pressing ESC + - Added key for targetting nearest player + - Added the possibility to assign particle effects to monsters + - Added possibility to pass through players with key controls + - Fixed crash on exit after connection to server was lost + - Fixed initialization of some variables + - Fixed an error with chat messages without a sender that include a colon + - Fixed minimap to not keep reappearing when hidden + - Fixed a GCC 4.3 compile error + - Fixed music loading from non-default location + - Fixed crash on trying to show out of range emoticon + - Updated Dev-C++ and Code::Blocks project files + diff --git a/data/help/commands.txt b/data/help/commands.txt index 2785869c..c4795050 100644 --- a/data/help/commands.txt +++ b/data/help/commands.txt @@ -48,9 +48,10 @@ /whisper <name> <message> - This will send <message> to player <name>, if that player is logged in. - to whisper to users with spaces in there name you must incase the user name in qoutes - (e.g. /whisper "user name" <message>) + This will send <message> to player <name>, if that player is logged in. If the + name has a space in it, put double quotes around it like this: + + /whisper "<name>" <message> For further help type /help in the chat console. diff --git a/data/help/header.txt b/data/help/header.txt index 38604d70..151eb262 100644 --- a/data/help/header.txt +++ b/data/help/header.txt @@ -1,9 +1,9 @@ -##1 AETHYRA +##1 T H E M A N A W O R L D ##1 ========================================== - - ##2Version:##6 Aethyra GIT 0.0.27.1 ##2Date:##16 January 2008 -##2 Website: http://www.aethyra.org + ##2Version:##6 0.0.28 ##2Date:##3 25 January 2009 + +##2 Website: http://themanaworld.org diff --git a/data/help/index.txt b/data/help/index.txt index 4dcc2332..b7262f85 100644 --- a/data/help/index.txt +++ b/data/help/index.txt @@ -1,6 +1,6 @@ ##3 === INDEX === - -> @@about|About Aethyra@@ + -> @@about|About The Mana World@@ -> @@team|Development Team@@ -> @@changes|Recent Changes@@ diff --git a/data/help/support.txt b/data/help/support.txt index 5d7d019f..dfbd588d 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -7,11 +7,11 @@ can't find a solution to your problem, feel free to check our Bugs/Support section of the forum: -##2 http://www.aethyra.org/forums/ +##2 http://forums.themanaworld.org/viewforum.php?f=3 or come visit us on our IRC channel: -##2 #aethyra ##P@##2 irc.freenode.net +##2 #themanaworld ##P@##2 irc.freenode.net Otherwise see the @@team|Development Team@@ section to have a list of developers and how to contact them. diff --git a/data/help/team.txt b/data/help/team.txt index 6b2fae88..e17771d5 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -2,71 +2,131 @@ ##3 === DEVELOPMENT TEAM === - -##2 Administration: - - ##9Blua Server Administrator/Content Development - - ##9MrDan Forum Administrator/GM - - ##9Slinker Game Server Host - - ##9Tametomo Project Head/Artist/Client Developer/Ubuntu Package Maintainer/Misc. - + +##2 Project Leader: + + ##9Eugenio Favalli (aka ElvenProgrammer) + elvenprogrammer@gmail.com + + ##2 Programmers: - - ##9Kraant Developer - <kraant@gmail.com> - - ##9Forge Developer + + ##9Bjorn Lindeijer (aka Hammerbear) + b_lindeijer@users.sourceforge.net + (various parts, GUI, graphics, A* and map rewrites) + + ##9Björn Steinbrink (aka Doener) + der_doener@users.sourceforge.net + (various parts) + + ##9Eric Scrivner (aka zenogais) + bitshift2002@users.sourceforge.net + (resource manager) + + ##9J. Avila (aka Javila) + javila@users.sourceforge.net + (various parts, GUI) + + ##9Jan-Fabian Humann (aka Mra) + malastare@users.sourceforge.net + (some GUI parts) + + ##9Kiyoshi Kyokai (aka Kiokay) + kyokai@users.sourceforge.net + (game systems designer) + + ##9Mateusz Kaduk (aka Usiu) + usiu@users.sourceforge.net + (several GUI parts) + + ##9Aaron Marks (aka nym) + nymacro@users.sourceforge.net + (several GUI parts) + + ##9Shura + kth5@users.sourceforge.net + (configuration, sound, misc. ports) + + ##9Yohann Ferreira (aka Bertram) + bertram25@users.sourceforge.net + (SDL input, progress bar drawing, Debian package) + ##2 Artists: - - ##9Angeliex Artist - - ##9Bawabawa/Kyron/Pyrestriker Artist/SuSe Package Contributor - - ##9Frictor Head Artist - -##2 Mappers: - - ##9Arkyan Mapper - - ##9GonzoDark Mapper - - ##9Solo Mapper - -##2 Content Development: - - ##9Moose - -##2 GMs - - ##9Grimmjow - - ##9SoftLace1 - - ##9Mr. and Mrs. Solo - - ##9Srauls + + ##9Clef + (tiles, concepts) + + ##9Frode Lindeijer (aka Modanung) + f.lindeijer@xs4all.nl + (arts) + + ##9Gnulia + (conceptual art) + + ##9Magick + (music and sound effects) + + ##9Neko-mon + (player sprites, various things) + + ##9Neorice + (monster sprites, tiles) + + ##9Pajarico + pajarico@users.sourceforge.net + (conceptual arts) + + ##9Romulo Fernandes + razor85@users.sourceforge.net + (arts) + + ##9Rotonen + rotonen@users.sourceforge.net + (backstory, art director, music, sound) + + ##9Talaroc + talaroc@users.sourceforge.net + (sprites) + + ##9Ti Sing Hao + (music) + ##2 Misc. thanks: - - ##9doorsman Testing - - ##9Snoopy Testing - - ##9Tarax Testing - -##2 Leave of Absence - - ##9Blame Developer/GM - <blame@aethyra.com> - - ##9Sanga Head Developer/GM ("Sanga") - <sanga@aethyra.com> - - ##9Scraggy Client Developer - <DougABoffey@netscape.net> - - ##9Sert Head Artist/GM + + ##9David Smith (aka catfish_man) + catfish_man@users.sourceforge.net + (Mac package) + + ##9Igor Morgado (aka imorgado) + imorgado@users.sourceforge.net + (tester) + + ##9maci + maci321@users.sourceforge.net + (technical support) + + ##9Rodney Dawes (aka dobey) + dobey@users.sourceforge.net + (Mac package) + + ##9Ultramichy + (hosting test server) + + +##2 Inactive/retired: + + ##9Chetic + chetic@users.sourceforge.net + (maps) + + ##9Simon Edwardsson (aka SimEdw) + simonedw@users.sourceforge.net + (network code, Mac package) + + ##9Sull + (hosting CVS and related services) + + ##9Vlady + (several items) diff --git a/data/icons/Aethyra.icns b/data/icons/Aethyra.icns Binary files differdeleted file mode 100644 index 08909c0f..00000000 --- a/data/icons/Aethyra.icns +++ /dev/null diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index fee51e4f..375edef7 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,14 +1,14 @@ iconsdir = $(pkgdatadir)/data/icons -icons_DATA = aethyra.png +icons_DATA = tmw.png install-data-local: $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps - $(INSTALL) $(srcdir)/aethyra.png $(DESTDIR)$(datadir)/pixmaps/aethyra.png + $(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png uninstall-local: - rm -f $(DESTDIR)$(datadir)/pixmaps/aethyra.png + rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png EXTRA_DIST = \ $(icons_DATA) diff --git a/data/icons/The Mana World.icns b/data/icons/The Mana World.icns Binary files differnew file mode 100644 index 00000000..7230a099 --- /dev/null +++ b/data/icons/The Mana World.icns diff --git a/data/icons/aethyra.ico b/data/icons/aethyra.ico Binary files differdeleted file mode 100644 index 016e752f..00000000 --- a/data/icons/aethyra.ico +++ /dev/null diff --git a/data/icons/aethyra.png b/data/icons/aethyra.png Binary files differdeleted file mode 100644 index e686289c..00000000 --- a/data/icons/aethyra.png +++ /dev/null diff --git a/data/icons/aethyra.xpm b/data/icons/aethyra.xpm deleted file mode 100644 index 515be72e..00000000 --- a/data/icons/aethyra.xpm +++ /dev/null @@ -1,312 +0,0 @@ -/* XPM */
-static char * Aethyra_xpm[] = {
-"32 32 277 2",
-" c None",
-". c #840000",
-"+ c #7E0000",
-"@ c #4F0000",
-"# c #810000",
-"$ c #830000",
-"% c #7B0000",
-"& c #460000",
-"* c #4C0000",
-"= c #4B0000",
-"- c #750000",
-"; c #860000",
-"> c #850000",
-", c #5D0000",
-"' c #490000",
-") c #450000",
-"! c #4A0000",
-"~ c #440000",
-"{ c #6A0000",
-"] c #7A0000",
-"^ c #8B0000",
-"/ c #990000",
-"( c #960000",
-"_ c #720000",
-": c #6E0000",
-"< c #740000",
-"[ c #6B0202",
-"} c #550505",
-"| c #420404",
-"1 c #440101",
-"2 c #4D0000",
-"3 c #4E0000",
-"4 c #480000",
-"5 c #9D0000",
-"6 c #9B0000",
-"7 c #6F0000",
-"8 c #710000",
-"9 c #760000",
-"0 c #680404",
-"a c #4B0C0C",
-"b c #3C0909",
-"c c #470202",
-"d c #450101",
-"e c #500000",
-"f c #510000",
-"g c #790000",
-"h c #890000",
-"i c #920000",
-"j c #710706",
-"k c #7D381F",
-"l c #934A1A",
-"m c #7B1A09",
-"n c #6B1609",
-"o c #521E13",
-"p c #4F2517",
-"q c #5D230F",
-"r c #4D0F04",
-"s c #350A0A",
-"t c #360909",
-"u c #470303",
-"v c #930000",
-"w c #840202",
-"x c #712C1C",
-"y c #A58248",
-"z c #866621",
-"A c #835819",
-"B c #98681F",
-"C c #845C1D",
-"D c #BB964A",
-"E c #856225",
-"F c #3D1B0B",
-"G c #241818",
-"H c #251717",
-"I c #360A0A",
-"J c #430000",
-"K c #6C0000",
-"L c #800000",
-"M c #730404",
-"N c #6A431E",
-"O c #473C1C",
-"P c #534420",
-"Q c #806125",
-"R c #53290B",
-"S c #461C09",
-"T c #BB9432",
-"U c #65490F",
-"V c #1F1110",
-"W c #1A2323",
-"X c #1A2222",
-"Y c #261212",
-"Z c #440202",
-"` c #7F0000",
-" . c #870000",
-".. c #6D0505",
-"+. c #422522",
-"@. c #454434",
-"#. c #A18744",
-"$. c #8F7237",
-"%. c #A37F48",
-"&. c #AD8847",
-"*. c #C6A657",
-"=. c #644C14",
-"-. c #211615",
-";. c #1C2626",
-">. c #1B2323",
-",. c #231313",
-"'. c #420202",
-"). c #6C0404",
-"!. c #532D23",
-"~. c #A8915B",
-"{. c #967C37",
-"]. c #6E5926",
-"^. c #453512",
-"/. c #473713",
-"(. c #A4832A",
-"_. c #594310",
-":. c #241F1E",
-"<. c #232828",
-"[. c #1C2020",
-"}. c #241111",
-"|. c #430202",
-"1. c #7C5030",
-"2. c #967C3D",
-"3. c #3E3318",
-"4. c #3D3930",
-"5. c #454442",
-"6. c #524D44",
-"7. c #C09E45",
-"8. c #654F17",
-"9. c #262524",
-"0. c #252929",
-"a. c #410202",
-"b. c #6B0302",
-"c. c #A78041",
-"d. c #6A5621",
-"e. c #414543",
-"f. c #696B6B",
-"g. c #747676",
-"h. c #7B7566",
-"i. c #C9A84F",
-"j. c #665017",
-"k. c #282725",
-"l. c #252A2A",
-"m. c #1B2222",
-"n. c #3D0202",
-"o. c #750802",
-"p. c #B48E41",
-"q. c #564418",
-"r. c #4A4B4B",
-"s. c #6D6F6F",
-"t. c #797A7A",
-"u. c #867C62",
-"v. c #AE9040",
-"w. c #664F12",
-"x. c #2D2A25",
-"y. c #242828",
-"z. c #1E1E1E",
-"A. c #291010",
-"B. c #400202",
-"C. c #860B02",
-"D. c #B78C32",
-"E. c #594013",
-"F. c #433E3E",
-"G. c #606464",
-"H. c #74736C",
-"I. c #7C6D44",
-"J. c #433719",
-"K. c #413311",
-"L. c #322F1E",
-"M. c #1C2121",
-"N. c #271212",
-"O. c #3C0606",
-"P. c #8C0200",
-"Q. c #B5771D",
-"R. c #765513",
-"S. c #3F3636",
-"T. c #555B5B",
-"U. c #686969",
-"V. c #5A5957",
-"W. c #3C3832",
-"X. c #403826",
-"Y. c #2F3023",
-"Z. c #1C1F1D",
-"`. c #2E0A0A",
-" + c #460101",
-".+ c #8F0101",
-"++ c #A03F0C",
-"@+ c #AC7E19",
-"#+ c #4B3625",
-"$+ c #474747",
-"%+ c #5B5C5A",
-"&+ c #83775A",
-"*+ c #8C7539",
-"=+ c #67541F",
-"-+ c #6B551C",
-";+ c #8C6D24",
-">+ c #4E1C09",
-",+ c #4A0101",
-"'+ c #8A0606",
-")+ c #8D1203",
-"!+ c #A76713",
-"~+ c #87611B",
-"{+ c #453A32",
-"]+ c #52554E",
-"^+ c #A38A45",
-"/+ c #715818",
-"(+ c #7A6424",
-"_+ c #443212",
-":+ c #947026",
-"<+ c #7D4E11",
-"[+ c #490400",
-"}+ c #420000",
-"|+ c #7F0808",
-"1+ c #8B0101",
-"2+ c #800F01",
-"3+ c #915E11",
-"4+ c #504F40",
-"5+ c #4E4834",
-"6+ c #5A4715",
-"7+ c #5B4814",
-"8+ c #382813",
-"9+ c #917035",
-"0+ c #533209",
-"a+ c #3F0400",
-"b+ c #8E0101",
-"c+ c #8A0000",
-"d+ c #671104",
-"e+ c #663D12",
-"f+ c #786023",
-"g+ c #74612B",
-"h+ c #665320",
-"i+ c #675321",
-"j+ c #785C24",
-"k+ c #684718",
-"l+ c #380B00",
-"m+ c #400000",
-"n+ c #8C0303",
-"o+ c #8D0000",
-"p+ c #780101",
-"q+ c #510808",
-"r+ c #291A16",
-"s+ c #26291C",
-"t+ c #2D2B18",
-"u+ c #321F0E",
-"v+ c #370A02",
-"w+ c #3E0100",
-"x+ c #850202",
-"y+ c #600202",
-"z+ c #331313",
-"A+ c #1E2121",
-"B+ c #1A1E1E",
-"C+ c #270D0D",
-"D+ c #470000",
-"E+ c #7B0404",
-"F+ c #720101",
-"G+ c #4B0D0D",
-"H+ c #2D1717",
-"I+ c #261414",
-"J+ c #380808",
-"K+ c #7E0202",
-"L+ c #5D0606",
-"M+ c #3B0E0E",
-"N+ c #300C0C",
-"O+ c #430303",
-"P+ c #7A0505",
-"Q+ c #7C0000",
-"R+ c #640404",
-"S+ c #430D0D",
-"T+ c #460202",
-"U+ c #610505",
-"V+ c #440E0E",
-"W+ c #390B0B",
-"X+ c #560202",
-"Y+ c #480707",
-"Z+ c #410505",
-"`+ c #4B0101",
-" @ c #480101",
-" ",
-" ",
-" ",
-" . + @ ",
-" # $ % & * @ = ",
-" - # ; > $ , ' ) ! @ * ~ ",
-" { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4 ",
-" ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4 ",
-" g h / i j k l m n o p q r s t u e 3 2 4 ",
-" 8 > v w x y z A B C D E F G H I = @ ' J ",
-" K L ^ M N O P Q R S T U V W X Y Z e ) ",
-" ` ...+.@.#.$.%.&.*.=.-.;.>.,.'.e & ",
-" ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4 ",
-" # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.= ",
-" ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.) ",
-" L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~ ",
-" ; C.D.E.F.G.H.I.J.K.L.M.N.O.4 ",
-" P.Q.R.S.T.U.V.W.X.Y.Z.`. +2 ",
-" .+++@+#+$+%+&+*+=+-+;+>+,+= ",
-" '+)+!+~+{+]+^+/+(+_+:+<+[+}+ ",
-" |+1+2+3+z 4+5+6+7+8+9+0+a+ ",
-" b+c+d+e+f+g+h+i+j+k+l+m+ ",
-" n+o+p+q+r+s+t+u+v+w+) ) ",
-" x+` y+z+A+B+C+1 e D+ ",
-" E+# F+G+H+I+J+3 @ ~ ",
-" K+% L+M+N+O+e ' ",
-" P+Q+R+S+I T+@ ) ",
-" 9 U+V+W+u 2 ",
-" X+Y+Z+ + ",
-" * `+ @ ",
-" ",
-" "};
diff --git a/data/icons/tmw.ico b/data/icons/tmw.ico Binary files differnew file mode 100644 index 00000000..61d559a3 --- /dev/null +++ b/data/icons/tmw.ico diff --git a/data/icons/tmw.png b/data/icons/tmw.png Binary files differnew file mode 100644 index 00000000..93e6c9ae --- /dev/null +++ b/data/icons/tmw.png diff --git a/data/icons/tmw.xpm b/data/icons/tmw.xpm new file mode 100644 index 00000000..06ec2865 --- /dev/null +++ b/data/icons/tmw.xpm @@ -0,0 +1,784 @@ +/* XPM */ +static char * tmw_xpm[] = { +"32 32 749 2", +" c None", +". c #E4EB6D", +"+ c #EFF271", +"@ c #E7EF65", +"# c #DDED61", +"$ c #D6E955", +"% c #DAED4D", +"& c #F6F5A0", +"* c #EFEF89", +"= c #ECF084", +"- c #EDF077", +"; c #EAF075", +"> c #E0E960", +", c #D9E757", +"' c #D4EA52", +") c #CFE74D", +"! c #BEE140", +"~ c #C2E43E", +"{ c #B6DF33", +"] c #F8F7C2", +"^ c #F9F7AB", +"/ c #F2F099", +"( c #EEEF80", +"_ c #F3F077", +": c #F8F8B1", +"< c #E8EE6F", +"[ c #E1EB69", +"} c #DBEB5E", +"| c #D5E852", +"1 c #CDE445", +"2 c #CEE843", +"3 c #B6DC34", +"4 c #A9DA2F", +"5 c #B3E02F", +"6 c #B6E630", +"7 c #F1F2E2", +"8 c #F9F9D4", +"9 c #F9F8C5", +"0 c #F8F8CE", +"a c #F9F8D6", +"b c #F9F7CB", +"c c #F9F7B1", +"d c #F9F7A7", +"e c #E7EE73", +"f c #E4EC69", +"g c #DEEB60", +"h c #D8E755", +"i c #D5EB55", +"j c #C2E33F", +"k c #BEE33C", +"l c #B5E339", +"m c #A7DF2E", +"n c #9BDA28", +"o c #95DA24", +"p c #8DD724", +"q c #F9F9F5", +"r c #F9F9EA", +"s c #F9F9E1", +"t c #F9F9F4", +"u c #F9F7DF", +"v c #F9F7D1", +"w c #F9F7C9", +"x c #F9F7B6", +"y c #F9F7AE", +"z c #D7E363", +"A c #E1EC6B", +"B c #DDEC60", +"C c #D8EC61", +"D c #CDE552", +"E c #C6E543", +"F c #BCE440", +"G c #BEE73E", +"H c #ABDF30", +"I c #ACE230", +"J c #8FD720", +"K c #80D01C", +"L c #80D51A", +"M c #F9F9F7", +"N c #F9F9EB", +"O c #F9F9F9", +"P c #F9F7E6", +"Q c #F9F7D3", +"R c #F9F7CE", +"S c #F9F7BF", +"T c #F9F8B9", +"U c #E6EF8F", +"V c #E1EB65", +"W c #E0ED63", +"X c #D1E452", +"Y c #D3E84D", +"Z c #C3E340", +"` c #BBE13E", +" . c #B0DD35", +".. c #ABDD2E", +"+. c #A0DB2A", +"@. c #95D923", +"#. c #7ED31C", +"$. c #7ED31A", +"%. c #80DA18", +"&. c #F4F3EF", +"*. c #F9F9F6", +"=. c #F9F8F5", +"-. c #F9F7EE", +";. c #F9F7E2", +">. c #F9F7D5", +",. c #F9F6C2", +"'. c #F8F69C", +"). c #D4E56D", +"!. c #E4ED73", +"~. c #DBEA60", +"{. c #DDE961", +"]. c #C9E54E", +"^. c #BFE242", +"/. c #BEE33E", +"(. c #B1DE34", +"_. c #ABDE33", +":. c #95D826", +"<. c #8DD620", +"[. c #8DDB20", +"}. c #91DD1E", +"|. c #71D116", +"1. c #50B910", +"2. c #F9F8F7", +"3. c #F9F8F4", +"4. c #F9F7EB", +"5. c #F9F7E1", +"6. c #F9F5CF", +"7. c #F9F6C9", +"8. c #F9F6BF", +"9. c #D6E471", +"0. c #E9F075", +"a. c #E3EC6B", +"b. c #D9E96D", +"c. c #CEE558", +"d. c #CBE44E", +"e. c #BEDE3E", +"f. c #ACDA37", +"g. c #BCE639", +"h. c #AEE135", +"i. c #9EDB2A", +"j. c #8FD822", +"k. c #7CD31B", +"l. c #82DA1C", +"m. c #63CE13", +"n. c #61CE12", +"o. c #F9F9F8", +"p. c #F9F7F5", +"q. c #F9F4DD", +"r. c #F9F5D7", +"s. c #F9F5C9", +"t. c #F9F5B6", +"u. c #E3ED8D", +"v. c #DEE865", +"w. c #E3ED6D", +"x. c #DDEB5E", +"y. c #D3E755", +"z. c #CAE349", +"A. c #CFEB4D", +"B. c #C1E33B", +"C. c #BCE743", +"D. c #B0E02D", +"E. c #95DB28", +"F. c #95DB26", +"G. c #C6E627", +"H. c #E8F433", +"I. c #CAED26", +"J. c #60CD0F", +"K. c #58CD0E", +"L. c #F9F7EC", +"M. c #F9F7F1", +"N. c #F9F4E4", +"O. c #F9F3D7", +"P. c #F9F3CA", +"Q. c #F9F5CA", +"R. c #F9F5BB", +"S. c #F9F8B6", +"T. c #F6F89E", +"U. c #DFEB5C", +"V. c #CEE453", +"W. c #D0E753", +"X. c #CDE543", +"Y. c #C7E842", +"Z. c #C1E53C", +"`. c #A7DC30", +" + c #E6F453", +".+ c #E2F448", +"++ c #D8F03C", +"@+ c #D1ED2E", +"#+ c #D0F033", +"$+ c #CAED2C", +"%+ c #ACE51F", +"&+ c #55CF0F", +"*+ c #F5F6EF", +"=+ c #F9F9F2", +"-+ c #F9F9F1", +";+ c #F9F8F0", +">+ c #F9F7E7", +",+ c #F9F5F0", +"'+ c #F9F3E1", +")+ c #F9F5DB", +"!+ c #F9F6DB", +"~+ c #F9F6BE", +"{+ c #F8F59B", +"]+ c #F9F5A2", +"^+ c #F8F68D", +"/+ c #F7F689", +"(+ c #D7EC65", +"_+ c #CEE84E", +":+ c #BBE23F", +"<+ c #B6E238", +"[+ c #A2DC30", +"}+ c #EBF553", +"|+ c #E4F443", +"1+ c #DCF340", +"2+ c #D4F033", +"3+ c #CEEF2D", +"4+ c #C2E926", +"5+ c #BEEB20", +"6+ c #5CD50E", +"7+ c #53CE0D", +"8+ c #F9F7D9", +"9+ c #F9F6F2", +"0+ c #F9F5EB", +"a+ c #F9F3DA", +"b+ c #F9F6DF", +"c+ c #F9F7D0", +"d+ c #F9F7C2", +"e+ c #F9F7BB", +"f+ c #F8F68F", +"g+ c #F7F58D", +"h+ c #F6F58B", +"i+ c #EEF68B", +"j+ c #BFDF43", +"k+ c #B5DE37", +"l+ c #B5E234", +"m+ c #A7DD30", +"n+ c #E7F248", +"o+ c #D6EF40", +"p+ c #DBF239", +"q+ c #D0ED2F", +"r+ c #C3EB2A", +"s+ c #BCEB26", +"t+ c #B5E81E", +"u+ c #52CE0F", +"v+ c #4ECB0B", +"w+ c #F9F9D9", +"x+ c #F9F9D7", +"y+ c #F9F8F8", +"z+ c #F9F7E9", +"A+ c #F9F6E9", +"B+ c #F9F5E0", +"C+ c #F8F2D6", +"D+ c #F9F3CE", +"E+ c #F9F7CA", +"F+ c #F9F8B5", +"G+ c #F6F691", +"H+ c #F9F699", +"I+ c #F5F68F", +"J+ c #F3F579", +"K+ c #E8F575", +"L+ c #C7E646", +"M+ c #B5DF37", +"N+ c #B9E438", +"O+ c #9CD928", +"P+ c #D7F348", +"Q+ c #DBEF3B", +"R+ c #D1EF35", +"S+ c #D7F230", +"T+ c #C1EA25", +"U+ c #B5E91F", +"V+ c #63DC1E", +"W+ c #48CA0C", +"X+ c #F4F4DC", +"Y+ c #F9F9C3", +"Z+ c #F9F9C5", +"`+ c #F9F9C7", +" @ c #F9F9E8", +".@ c #F9F6DD", +"+@ c #F9F6D6", +"@@ c #F9F3C1", +"#@ c #F9F3BF", +"$@ c #F9F5B8", +"%@ c #F8F8A6", +"&@ c #F6F68F", +"*@ c #F4F791", +"=@ c #ABD746", +"-@ c #C5E449", +";@ c #C1E448", +">@ c #BBE23E", +",@ c #BBE237", +"'@ c #A9DC30", +")@ c #99D927", +"!@ c #D3E32C", +"~@ c #E2F340", +"{@ c #D3ED2D", +"]@ c #CAED2B", +"^@ c #CDF028", +"/@ c #C5EB27", +"(@ c #B0E51C", +"_@ c #91DC13", +":@ c #49CA08", +"<@ c #25B305", +"[@ c #F5F6BE", +"}@ c #F5F5A9", +"|@ c #F3F4B0", +"1@ c #F6F6B0", +"2@ c #F7F8B5", +"3@ c #EDF097", +"4@ c #F5F18F", +"5@ c #F9F7B8", +"6@ c #F9F4B0", +"7@ c #F9F3AE", +"8@ c #F9F3A4", +"9@ c #F9F7A4", +"0@ c #F7F7A0", +"a@ c #F5F682", +"b@ c #D3E75E", +"c@ c #CAE646", +"d@ c #CBE846", +"e@ c #EDF05A", +"f@ c #C6E432", +"g@ c #A9E02E", +"h@ c #99DA27", +"i@ c #B9DB20", +"j@ c #E1F33F", +"k@ c #CEEB2E", +"l@ c #C7EB27", +"m@ c #BBEA26", +"n@ c #B9E722", +"o@ c #A6DF19", +"p@ c #ABE815", +"q@ c #48CB09", +"r@ c #3ECA08", +"s@ c #F8F7A7", +"t@ c #F3F4A0", +"u@ c #F4F59C", +"v@ c #F0F49C", +"w@ c #F2F5A4", +"x@ c #F5F6A0", +"y@ c #EFF28F", +"z@ c #F9F8CD", +"A@ c #F9F6A7", +"B@ c #F9F3A0", +"C@ c #F8F399", +"D@ c #F8F493", +"E@ c #F8F693", +"F@ c #F7F58B", +"G@ c #E8EF65", +"H@ c #C7E445", +"I@ c #C7DB30", +"J@ c #E1ED48", +"K@ c #E8F353", +"L@ c #C3E227", +"M@ c #D9EB2E", +"N@ c #E7F549", +"O@ c #D3EE3B", +"P@ c #CBED2D", +"Q@ c #CDEF27", +"R@ c #BFEC23", +"S@ c #B6E81E", +"T@ c #A9E518", +"U@ c #B1EB1B", +"V@ c #35BE06", +"W@ c #38C306", +"X@ c #F9F9A7", +"Y@ c #F2F38F", +"Z@ c #F2F495", +"`@ c #F3F38D", +" # c #F9F9E9", +".# c #F7F8C5", +"+# c #F8F7D1", +"@# c #F8F6A2", +"## c #F9F7A9", +"$# c #F8F59C", +"%# c #F8F291", +"&# c #F8F58F", +"*# c #F6F789", +"=# c #F2F477", +"-# c #F0F571", +";# c #EAEE52", +"># c #DCEA45", +",# c #EBEF43", +"'# c #E4F04D", +")# c #DEEF45", +"!# c #E1F246", +"~# c #E4F448", +"{# c #DBF039", +"]# c #D9F235", +"^# c #C9ED2B", +"/# c #CAEF2C", +"(# c #CEF22B", +"_# c #B6E91E", +":# c #B1EB21", +"<# c #A9E815", +"[# c #48CF09", +"}# c #40CD06", +"|# c #EDEF6B", +"1# c #EBF07C", +"2# c #E7EB71", +"3# c #E8E865", +"4# c #F8F79E", +"5# c #F8F7A4", +"6# c #F9F69E", +"7# c #F8F48F", +"8# c #F6F280", +"9# c #F6F482", +"0# c #F3F473", +"a# c #EFF169", +"b# c #EDF467", +"c# c #EAF35C", +"d# c #EAF258", +"e# c #E4F052", +"f# c #E4F046", +"g# c #E0F03F", +"h# c #D5EE3B", +"i# c #DFF23E", +"j# c #D7F137", +"k# c #CEED2E", +"l# c #C9EF28", +"m# c #CAF025", +"n# c #B9EA1E", +"o# c #B3E91D", +"p# c #B1EB1A", +"q# c #A6E817", +"r# c #39C506", +"s# c #35C505", +"t# c #B3BC3E", +"u# c #E9F07C", +"v# c #DEE867", +"w# c #F9F79E", +"x# c #F8F793", +"y# c #F8F78F", +"z# c #F7F684", +"A# c #F5F27E", +"B# c #F4F26D", +"C# c #F4F36F", +"D# c #EDF061", +"E# c #EEF363", +"F# c #EDF35C", +"G# c #EEF45C", +"H# c #EAF357", +"I# c #E8F34B", +"J# c #DCEE43", +"K# c #E1F03F", +"L# c #D6ED37", +"M# c #D5EE33", +"N# c #D5F134", +"O# c #D9F232", +"P# c #CEF22D", +"Q# c #C7F22A", +"R# c #9BDB18", +"S# c #A7E518", +"T# c #AEEB1B", +"U# c #95E514", +"V# c #37C306", +"W# c #3CC705", +"X# c #E0EC60", +"Y# c #D1E455", +"Z# c #F7F78F", +"`# c #F7F891", +" $ c #F8F78B", +".$ c #F5F782", +"+$ c #F8F791", +"@$ c #EFF06B", +"#$ c #F3F36D", +"$$ c #EFF36D", +"%$ c #F1F56F", +"&$ c #EDF260", +"*$ c #EDF461", +"=$ c #E7F150", +"-$ c #E9F355", +";$ c #E8F349", +">$ c #E8F442", +",$ c #DDF13E", +"'$ c #DAF038", +")$ c #CEEB26", +"!$ c #D0EE2C", +"~$ c #B9E82A", +"{$ c #C1ED26", +"]$ c #A0E41C", +"^$ c #ABE71B", +"/$ c #99E315", +"($ c #99E415", +"_$ c #33B306", +":$ c #2BBB05", +"<$ c #D9EB5E", +"[$ c #CDE44E", +"}$ c #F6F579", +"|$ c #F4F577", +"1$ c #F3F571", +"2$ c #F4F57C", +"3$ c #F3F363", +"4$ c #F2F475", +"5$ c #F0F567", +"6$ c #A2D93F", +"7$ c #C3E43F", +"8$ c #B6D92E", +"9$ c #A7CD1F", +"0$ c #E4F042", +"a$ c #E4F248", +"b$ c #E5F348", +"c$ c #D7EC39", +"d$ c #DBF33C", +"e$ c #DDF23E", +"f$ c #D1EF2D", +"g$ c #C1E825", +"h$ c #BFEB26", +"i$ c #AEE61B", +"j$ c #A7E318", +"k$ c #B0E818", +"l$ c #9EE615", +"m$ c #6DD30D", +"n$ c #27A603", +"o$ c #2CBE05", +"p$ c #E2ED50", +"q$ c #CBE348", +"r$ c #F6F780", +"s$ c #F5F577", +"t$ c #F3F56F", +"u$ c #EFF469", +"v$ c #F3F471", +"w$ c #F3F46F", +"x$ c #EFF461", +"y$ c #E7F053", +"z$ c #C6E83F", +"A$ c #A4D733", +"B$ c #ABDD2F", +"C$ c #B0DF2E", +"D$ c #A7DD2B", +"E$ c #E4F240", +"F$ c #E8F555", +"G$ c #DDF33C", +"H$ c #E1F53E", +"I$ c #D4F032", +"J$ c #CEF02E", +"K$ c #CAEF2D", +"L$ c #C2EF28", +"M$ c #B5E91B", +"N$ c #93DD13", +"O$ c #93E215", +"P$ c #93E213", +"Q$ c #80DB0D", +"R$ c #45CA05", +"S$ c #2FC204", +"T$ c #CEE743", +"U$ c #C1E23E", +"V$ c #F0F365", +"W$ c #F5F473", +"X$ c #F2F269", +"Y$ c #E9EF57", +"Z$ c #EFF363", +"`$ c #E8F052", +" % c #EBF358", +".% c #B8E439", +"+% c #BCE839", +"@% c #A4DC2A", +"#% c #ABE22D", +"$% c #95D822", +"%% c #E1F240", +"&% c #D6ED32", +"*% c #CFEC2C", +"=% c #D4F02F", +"-% c #CAEE2B", +";% c #C3EB27", +">% c #C6EE25", +",% c #C3EE21", +"'% c #B8ED21", +")% c #AEEA16", +"!% c #79D90F", +"~% c #2EB106", +"{% c #26B808", +"]% c #2CBF05", +"^% c #C9E73B", +"/% c #C5E63C", +"(% c #F0F56B", +"_% c #EEF258", +":% c #F0F265", +"<% c #EFF155", +"[% c #EDF358", +"}% c #EBF550", +"|% c #EBF54D", +"1% c #C9E83B", +"2% c #A4DB28", +"3% c #9EDC2B", +"4% c #8FD622", +"5% c #82D01E", +"6% c #7EC512", +"7% c #C9E827", +"8% c #D0EE2E", +"9% c #C7ED2C", +"0% c #C7EE27", +"a% c #C1EE2A", +"b% c #C2EF24", +"c% c #BEED22", +"d% c #A9E718", +"e% c #3EC307", +"f% c #39C306", +"g% c #38C606", +"h% c #23B603", +"i% c #ACDB2F", +"j% c #B0DF34", +"k% c #EDF35A", +"l% c #EDF553", +"m% c #E2F045", +"n% c #E6F350", +"o% c #E6F448", +"p% c #9CD01E", +"q% c #8BC916", +"r% c #B8DC1B", +"s% c #7CBC0F", +"t% c #95D618", +"u% c #7ED319", +"v% c #BFE118", +"w% c #C6ED2A", +"x% c #C1EA21", +"y% c #C1ED22", +"z% c #B8EA1D", +"A% c #B6EB1D", +"B% c #BCEF1F", +"C% c #53CA07", +"D% c #3FC708", +"E% c #2EBC05", +"F% c #2FBE04", +"G% c #2DBF04", +"H% c #A2CF1F", +"I% c #B1E12F", +"J% c #B5E32E", +"K% c #E8F243", +"L% c #D7EB45", +"M% c #E8F245", +"N% c #DDEF40", +"O% c #E2F342", +"P% c #DFF33E", +"Q% c #E4F542", +"R% c #DAF138", +"S% c #D8F230", +"T% c #CBEB28", +"U% c #D1F02E", +"V% c #C6EC24", +"W% c #CAEF25", +"X% c #BCEB21", +"Y% c #B6EB1E", +"Z% c #ABE91B", +"`% c #A2E616", +" & c #3CC508", +".& c #3EC906", +"+& c #37C305", +"@& c #27B903", +"#& c #209B02", +"$& c #A9DF27", +"%& c #A4DD27", +"&& c #91D623", +"*& c #E3F13C", +"=& c #E4F340", +"-& c #E4F33F", +";& c #E4F43E", +">& c #E2F439", +",& c #D6F033", +"'& c #D5F034", +")& c #CEEF2E", +"!& c #CBED26", +"~& c #CFEF27", +"{& c #D5F22E", +"]& c #B5E620", +"^& c #B9EA1F", +"/& c #84E620", +"(& c #3EB508", +"_& c #58CE0D", +":& c #39CA11", +"<& c #3EC607", +"[& c #3BCA08", +"}& c #28BB04", +"|& c #28BC03", +"1& c #8FD620", +"2& c #97D823", +"3& c #A6E22B", +"4& c #69CB1D", +"5& c #86D61F", +"6& c #E5F740", +"7& c #DCF338", +"8& c #CAEC2D", +"9& c #CDED2B", +"0& c #D1F02C", +"a& c #CDEE27", +"b& c #C1EB22", +"c& c #CFF228", +"d& c #BCE922", +"e& c #3CBB09", +"f& c #50CD0C", +"g& c #4BCD0B", +"h& c #3CC207", +"i& c #42CD09", +"j& c #2EBB04", +"k& c #28B905", +"l& c #28B903", +"m& c #61B113", +"n& c #7ED41A", +"o& c #89D71B", +"p& c #8DDB1A", +"q& c #7CD518", +"r& c #8FDA1B", +"s& c #71D314", +"t& c #7CDA18", +"u& c #BEF232", +"v& c #8BD715", +"w& c #63C207", +"x& c #55C108", +"y& c #5AD111", +"z& c #4BC90B", +"A& c #3EC108", +"B& c #46C908", +"C& c #40CB08", +"D& c #34C205", +"E& c #32C505", +"F& c #22A003", +"G& c #79D818", +"H& c #75D314", +"I& c #67D012", +"J& c #69D313", +"K& c #71D613", +"L& c #67D413", +"M& c #4BC20C", +"N& c #4DCB0E", +"O& c #5AD510", +"P& c #50CA0B", +"Q& c #4BC909", +"R& c #3CC708", +"S& c #42C906", +"T& c #35C206", +"U& c #33C306", +"V& c #30C504", +"W& c #49C30E", +"X& c #71D913", +"Y& c #84E318", +"Z& c #5ECF0E", +"`& c #58D00D", +" * c #5ED40D", +".* c #48C70A", +"+* c #57D40B", +"@* c #37BE06", +"#* c #39C707", +"$* c #37C505", +"%* c #34C705", +"&* c #49BE0B", +"** c #4BD00C", +"=* c #46C609", +"-* c #46D00A", +";* c #33BE06", +">* c #20A904", +" . + @ # $ % ", +" & * = - ; > , ' ) ! ~ { ", +" ] ^ / ( _ : < [ } | 1 2 3 4 5 6 ", +" 7 8 9 0 a b c d e f g h i j k l m n o p ", +" q r s t u v w x y z A B C D E F G H I J K L ", +" M M N O P u Q R S T U V W X Y Z ` ...+.@.#.$.%. ", +" &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1. ", +" O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n. ", +" o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K. ", +" O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+ ", +" *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+ ", +" r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+ ", +" w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+ ", +"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@", +"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@", +"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@", +"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#", +"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#", +"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#", +" X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$ ", +" <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$ ", +" p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$ ", +" T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]% ", +" ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h% ", +" i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G% ", +" H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#& ", +" $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|& ", +" 1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l& ", +" m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F& ", +" G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V& ", +" W&X&Y&Z&`& *.*+*@*#*$*%* ", +" &***=*-*;*>* "}; diff --git a/docs/FAQ.txt b/docs/FAQ.txt index 6adfb2b3..7c2000fd 100644 --- a/docs/FAQ.txt +++ b/docs/FAQ.txt @@ -7,12 +7,12 @@ Q: How to get help? A: The fastest way is to come on our IRC channel. There you can find a lot of nice people that will help you until you solve your problem. Server: - irc.freenode.net Channel: #aethyra. + irc.freenode.net Channel: #themanaworld. If you don't like IRC just come to our forums: - http://www.aethyra.org/ . Ok, do you think forums are evil? - Don't worry, send me an e-mail at blame582@gmail.com and you're done. + http://forums.themanaworld.org. Ok, do you think forums are evil? Don't + worry, send me an e-mail at elvenprogrammer@gmail.com and you're done. That's not enough? No, I won't give you my phone number! ;P - + GAME Q: I always get "Unregistered ID" error message, why? @@ -21,7 +21,7 @@ A: First of all check that your username is at least 4 characters long. Is the first time you login? Have you registered an account? If not use the "Register" button in game. If you already succesfully connected before, but now you're getting this message, please send an e-mail to - blame582@gmail.com. + elvenprogrammer@gmail.com. Q: I always get "Wrong password" but I'm sure I typed it right, why? @@ -50,9 +50,7 @@ Q: What's SVN? A: It's a system where is stored the latest development version. It's not assured that it's stable, but surely it has the latest updates. (SVN version is updated quite frequently). If you want to check it out, read this guide - http://themanaworld.org/svn-tutorial.txt - -(We need our own svn tut -- kraant) + http://themanaworld.org/svn-tutorial.txt DEVELOPMENT @@ -60,20 +58,26 @@ DEVELOPMENT Q: When will the next version be released? A: We have scheduled releases. Usually a new release is available every month. - Check http://www.aethyra.org/ for further info. + Check http://themanaworld.org/ for further info. Q: How can I contribute? A: There are a lot of ways: - + - If you're a programmer, an artist or just willing to help in any way, you can become part of the development team. Send an e-mail to - blame582@gmail.com explaining what you want to do, or join our irc - channel: #aethyra @ irc.freenode.net. - - - You can be a beta tester. Just play with Aethyra and report - every error on the forum. - - - Play with Aethyra: more players, more fun! Simple as that! ;-) + elvenprogrammer@gmail.com explaining what you want to do, or join our irc + channel: #themanaworld @ irc.freenode.net. + + - You can donate money. Follow the link on the project page: + + http://sourceforge.net/projects/themanaworld/ + + - You can be a beta tester. Just play The Mana World and report every + error to the tracker. Read for more infos on the project page: + + http://themanaworld.org/ + + - Play with The Mana World: more players, more fun! Simple as that! ;-) diff --git a/docs/HACKING.txt b/docs/HACKING.txt index 85ad0d8c..f2ae8b2b 100644 --- a/docs/HACKING.txt +++ b/docs/HACKING.txt @@ -1,6 +1,6 @@ ---------------------------------- -Aethyra Hacking Guide ---------------------------------- +---------------------------- +The Mana World Hacking Guide +---------------------------- With multiple coders working on the same source files, there needs to be a standard specifying how code is written down. Not doing so can cause quite some diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt index 4e643a55..9a74d91b 100644 --- a/docs/INSTALL/debian.txt +++ b/docs/INSTALL/debian.txt @@ -1,43 +1,31 @@ -How to install Aethyra on my GNU/Debian Box +How to install TMW on my GNU/Debian Box ================================================== Author: FERREIRA Yohann (Bertram) Email: Bertram@cegetel.net -With slight edits by Daniel Thomas (kraant@gmail.com) -to for Aethyra... - -WARNING! These instructions are probably outdated! - -Check the forums (http://www.aethyra.org/forums/) where better help can be found. - -Aethyra project +The Mana World project ====================== -Homepage: http://www.aethyra.org/ -IRC: irc.freenode.net / #aethyra +Homepage: http://themanaworld.org/ +IRC: irc.freenode.net / #themanaworld -1) Installing Aethyra and dependencies +1) Installing The Mana World and dependencies 2) Creating a Debian Package using DebHelper Tools 3) Notes -1. Installing Aethyra and Dependencies +1. Installing The Mana World and Dependencies ============================================= -Aethyra Debian Package can be installed under the Debian Testing and -Unstable (Sarge/Sid). In order to have Mana Experiment working, you'll need +The Mana World Debian Package can be installed under the Debian Testing and +Unstable (Sarge/Sid). In order to have Mana World working, you'll need packages for SDL, SDL_mixer, SDL_image, libxml2, libphysfs and libguichan0. To install the dependencies, you can do type (as root): - apt-get install libsdl-mixer1.2 libsdl-image1.2 libxml2 libphysfs-1.0-0 + apt-get install libsdl-mixer1.2 libsdl-image1.2 libxml2 libphysfs-1.0-0 libguichan0 -(You'll need to compile libguichan from source since we've moved to 8.1 -and there is no package for this as of yet. This could create -problems, any debian users trying this out and giving us fixes -would be much appreciated -- kraant) - -Type aethyra as a normal user to play! (Enjoy!) +Type tmw as a normal user to play! (Enjoy!) 2. Creating a Debian Package using DebHelper Tools ================================================== @@ -53,9 +41,9 @@ And the debhelper tools: Download tmw from Subversion using the command (You'll need Subversion installed on your system): - svn co svn://www.aethyra.org/client/trunk aethyra + svn https://svn.sourceforge.net/svnroot/themanaworld/tmw/trunk tmw -Rename the aethyra folder into aethyra-XXX and open a console in it. +Rename the tmw folder into tmw-XXX and open a console in it. You can now type: fakeroot dpkg-buildpackage @@ -65,16 +53,16 @@ file. Install it: - dpkg -i aethyra_XXXXXX_i386.deb + dpkg -i tmw_XXXXXX_i386.deb (If you've got a previous one already installed with the same version number, don't forget to remove it with :) - apt-get remove aethyra + apt-get remove tmw (Don't worry, you configuration files are not removed...) -And now the final step: type 'aethyra' as a normal user in a shell and you're in! +And now the final step: type 'tmw' as a normal user in a shell and you're in! KDE/GNOME menu entries are created in Arcade Games upon installation. @@ -83,10 +71,6 @@ KDE/GNOME menu entries are created in Arcade Games upon installation. A Debian Repository has been created. -(This repository is for The Mana World not Aethyra, volunteers to make a -package would be nice, basically if you follow these instructions -you won't get aethyra as of now -- kraant) - Simply add in your /etc/apt/sources.list file: deb http://bertram.ifrance.com ./ @@ -95,11 +79,9 @@ Simply add in your /etc/apt/sources.list file: Then, as root, do: apt-get update - apt-get install aethyra + apt-get install tmw and you're done! -N.B.: The t_me-music, libguichan0, and libguichan0-dev packages are also +N.B.: The tmw-music, libguichan0, and libguichan0-dev packages are also provided in this repository. - -(Added '_' to avoid picking this file up in grep, fix this later -- kraant) diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt index 2fd12f8c..fb758c43 100644 --- a/docs/INSTALL/win32.txt +++ b/docs/INSTALL/win32.txt @@ -1,12 +1,10 @@ -How setup Dev-C++ to compile Aethyra on a Win32 Box +How setup Dev-C++ to compile TMW on a Win32 Box =============================================== -(I think Dev-C++ support is broken as of now -- kraant) - -Aethyra project -=========================== -Homepage: http://www.aethyra.org -IRC: irc.freenode.net / #aethyra +The Mana World project +====================== +Homepage: themanaworld.sourceforge.net +IRC: irc.freenode.net / #themanaworld 0. Index @@ -14,7 +12,7 @@ IRC: irc.freenode.net / #aethyra 1. Requirements 2. Installing Dev-C++ 3. Installing the required libraries -4. Compiling Aethyra +4. Compiling The Mana World 1. Requirements @@ -25,7 +23,7 @@ free IDE for Win32 built around GCC. Remember, Win32 was not meant for GCC and stuff so you will probably run into trouble unless you really know what you're doing, so best stick with Dev-C++. -Besides a C++ compiler, Aethyra depends on the following libraries: +Besides a C++ compiler, TMW depends on the following libraries: 1) SDL 2) SDL_mixer @@ -46,7 +44,7 @@ This tutorial is written and tested with the latest beta version, which is the old stable version, so don't do that. Get Dev-C++ here: http://www.bloodshed.net/ - + After you have fetched it, simply run and install as prompted. @@ -97,36 +95,36 @@ Install them all through the Dev-C++ package manager. iconv-1.9.1.win32.zip From each file, copy the headers to your include directory, the libs to - the lib direcotry and the dlls (in bin direcotry) to your aethyra directory. + the lib direcotry and the dlls (in bin direcotry) to your tmw directory. **) For PhysFS copy the headers to your include directory, the libs to - the lib directory and the dlls (in bin direcotry) to your aethyra directory. + the lib directory and the dlls (in bin direcotry) to your tmw directory. ***) Download developer files and put headers and libs in to include and lib - directories of Dev-Cpp. Download binaries and place the dll inside aethyra + directories of Dev-Cpp. Download binaries and place the dll inside tmw folder. ****) Get latest win32 - mingw package and install as usual. -You should now be fully equipped for compiling the latest Aethyra development +You should now be fully equipped for compiling the latest TMW development code! -4. Compiling Aethyra -================================ +4. Compiling The Mana World +=========================== -Check out The Mana Experiment from Subversion using either the command line svn +Check out The Mana World from Subversion using either the command line svn tool or TortoiseSVN, pick what you like to use most and install that. Next, check out the following directory from our repository: - svn://www.aethyra.org/client/trunk + https://svn.sourceforge.net/svnroot/themanaworld/tmw/trunk -Open "Aethyra.dev" in Dev-C++. From there on you should be able to -start compilition with Excute -> Compile. A file called aethyra.exe should appear +Open "The Mana World.dev" in Dev-C++. From there on you should be able to +start compilition with Excute -> Compile. A file called tmw.exe should appear in the same directory as where you opened the .dev from. Before you can actually run the executable be sure to copy over the following -DLLs from your Dev-Cpp/dll directory to the directory containing aethyra.exe (or +DLLs from your Dev-Cpp/dll directory to the directory containing tmw.exe (or alternatively into your c:\windows\system\ for a more universal solution): SDL.dll @@ -145,7 +143,7 @@ And also make sure you have: zlib1.dll Additionally don't forget to copy any updated .dll (when libs are updated, -the dll are usually updated too) to the folder containing aethyra.exe (or to the +the dll are usually updated too) to the folder containing tmw.exe (or to the c:\windows\system\). -Have fun hacking Aethyra! +Have fun hacking The Mana World! diff --git a/docs/Makefile.am b/docs/Makefile.am index 8b311f85..0f9e7d2c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,11 +1,10 @@ -man6_MANS = aethyra.6 +man6_MANS = tmw.6 EXTRA_DIST = $(man6_MANS) \ packages.txt \ FAQ.txt \ HACKING.txt \ - SOURCE/aethyradox.sh \ - SOURCE/aethyra.doxcfg \ + SOURCE/Doxyfile \ items.txt \ progression.txt \ INSTALL/debian.txt \ diff --git a/docs/SOURCE/aethyra.doxcfg b/docs/SOURCE/Doxyfile index cbc22910..c9522aaf 100644 --- a/docs/SOURCE/aethyra.doxcfg +++ b/docs/SOURCE/Doxyfile @@ -17,7 +17,7 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = Aethyra +PROJECT_NAME = The Mana World # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or @@ -30,7 +30,7 @@ PROJECT_NUMBER = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = ../docs/SOURCE/ +OUTPUT_DIRECTORY = # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -406,7 +406,7 @@ WARN_FORMAT = "$file:$line: $text" # and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = "warnings.log" #--------------------------------------------------------------------------- # configuration options related to the input files @@ -417,7 +417,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = +INPUT = "../../src" # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -625,7 +625,7 @@ GENERATE_HTMLHELP = NO # can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = aethyra.chm +CHM_FILE = tmw.chm # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can # be used to specify the location (absolute path including file name) of diff --git a/docs/SOURCE/aethyradox.sh b/docs/SOURCE/aethyradox.sh deleted file mode 100644 index e0f299a8..00000000 --- a/docs/SOURCE/aethyradox.sh +++ /dev/null @@ -1 +0,0 @@ -cd ../../src/ && doxygen ../docs/SOURCE/aethyra.doxcfg diff --git a/docs/items.txt b/docs/items.txt index efba35ac..19c6b10c 100644 --- a/docs/items.txt +++ b/docs/items.txt @@ -1,5 +1,5 @@ ------------------------------- - AETHYRA INVENTORY SYSTEM +THE MANA WORLD INVENTORY SYSTEM ------------------------------- 1. INTRODUCTION diff --git a/docs/packages.txt b/docs/packages.txt index f29fbe8c..3d794a1b 100644 --- a/docs/packages.txt +++ b/docs/packages.txt @@ -1,6 +1,6 @@ ----------------------------------- -AETHYRA PACKAGE SYSTEM ----------------------------------- +----------------------------- +THE MANA WORLD PACKAGE SYSTEM +----------------------------- 1. INTRODUCTION 2. LOCATION OF DATA @@ -10,46 +10,39 @@ AETHYRA PACKAGE SYSTEM 6. LOADING A REQUESTED RESOURCE 7. RESOURCE MANAGEMENT DETAILS -(Note this file is a _little_ outdated in some ways -- kraant) - 1. INTRODUCTION -Aethyra (Was The Mana Experiment, originally part of The Mana World) is expected to grow continuously with updates to the game -world occurring relatively frequently. More often so than for example new -releases of the game client. To make sure players don't have to update their -data manually all the time, by for example downloading the latest from the -website, the Aethyra client should be able to automatically obtain new data -packages from the server. +The Mana World is expected to grow continuously with updates to the game world +occurring relatively frequently. More often so than for example new releases +of the game client. To make sure players don't have to update their data +manually all the time, by for example downloading the latest from the website, +the TMW client should be able to automatically obtain new data packages from +the server. Note: To reduce the load on the server (which isn't expected to have huge free uploading resources), the idea is that the server will only send a torrent file to the client and that the file is subsequently downloaded from - several locations that have volunteered to spread Aethyra data files. Ultimately + several locations that have volunteered to spread TMW data files. Ultimately a simple option on the client will even allow players to contribute their excess bandwidth to help other players get the updates faster. -(This doesn't seem to have occurred we're still using http all the way -up to now even into Aethyra) - 2. LOCATION OF DATA -There are two locations where Aethyra can look for game data. The install data +There are two locations where TMW can look for game data. The install data directory and the data directory in the user's home directory. The latter one doesn't have to be used for Windows users, but is required for dynamic updates for UNIX users, who generally won't have write permissions to the install data directory. So for UNIX the two locations are: - /usr/local/share/aethyra/data/* + /usr/local/share/manaworld/data/* - ~/.aethyra/updates/* - - ~/.aethyra/customdata + ~/.manaworld/data/* While for Windows all the data will be located at: - C:\Program Files\Aethyra\data\* + C:\Program Files\The Mana World\data\* In the UNIX case it doesn't matter in which order the data directories are examined. @@ -90,7 +83,7 @@ package is irrelevant. An example of the contents is given by: 5. INITIALIZING PACKAGE MANAGEMENT -When Aethyra starts it will scan its data directories for both packages (archives) +When TMW starts it will scan its data directories for both packages (archives) and directories. When a directory is found with the same name as a package, the directory is the preferred location to load data from as it is assumed to be more up to date. @@ -132,27 +125,27 @@ the data while working on the next package to be released. The resource management technique is critical to the overall success of the package management system as a whole. Resources are loaded at runtime as they -are needed, and unloaded as they become unused. In order to ensure the -autonomous functioning of this process reference counting is the agreed upon -technique for managing loaded resources in Aethyra. +are needed, and unloaded as they become unused. In order to ensure the +autonomous functioning of this process reference counting is the agreed upon +technique for managing loaded resources in TMW. -For those unfamiliar with the practice of reference counting, it involves +For those unfamiliar with the practice of reference counting, it involves every resource object having a variable containing the number of references to the object. When a reference is added the function addRef() is called and when -it is removed the function release() is called. When the reference count -reaches zero the object will automatically delete itself, thus handling the +it is removed the function release() is called. When the reference count +reaches zero the object will automatically delete itself, thus handling the cleanup of resources. Reference counting will form the core of the resource management system. Each resource object will have the functionality of a reference counted object. The -resource manager will hold ResourceEntry objects. The resource entry object -contains a pointer to the resource as well as the location of the path of the +resource manager will hold ResourceEntry objects. The resource entry object +contains a pointer to the resource as well as the location of the path of the file the resource was loaded from. This would look something like: /** * A generic reference counted resource object. */ - class Resource { + class Resource { public: /** * Loads the resource from the specified path. @@ -165,17 +158,17 @@ file the resource was loaded from. This would look something like: * Increments the reference counted of this object. */ void addRef() { ++referenceCount; } - + /** * Decrements the reference count and deletes the object * if no references are left. * @return <code>true</code> if the object was deleted * <code>false</code> otherwise. */ - void release() { + void release() { --referenceCount; - if(!referenceCount) + if (!referenceCount) { delete this; return true; @@ -190,14 +183,14 @@ file the resource was loaded from. This would look something like: /** * A resource entry descriptor. */ - struct ResourceEntry { - Resource* resource; - std::string filePath; + struct ResourceEntry { + Resource* resource; + std::string filePath; }; ... The resource manager would then hold a mapping containing the resource entry as -well as the string defining its resource identification path. The resource +well as the string defining its resource identification path. The resource manager would thus look something like this: /** diff --git a/docs/progression.txt b/docs/progression.txt index cbec77e2..a25cf11f 100644 --- a/docs/progression.txt +++ b/docs/progression.txt @@ -1,5 +1,5 @@ ----------------------------------- - AETHYRA PLAYER'S PROGRESSION +THE MANA WORLD PLAYER'S PROGRESSION ----------------------------------- 1. PLAYER'S STATS @@ -126,4 +126,4 @@ Peon 17 Double Hit, Hard Hit(JL:5) Beginner Lvl:10 Every of these notes have to be discussed, if you have any feedback, suggestions, updates, commit or tell them at: -address: irc://irc.freenode.net channel: #aethyra +address: irc://irc.freenode.net channel: #themanaworld diff --git a/docs/sounddev.txt b/docs/sounddev.txt index 1c83157a..149150ba 100644 --- a/docs/sounddev.txt +++ b/docs/sounddev.txt @@ -1,6 +1,6 @@ -------------------------------------- -AETHYRA SOUND DEVELOPMENT -------------------------------------- +-------------------------------- +THE MANA WORLD SOUND DEVELOPMENT +-------------------------------- 1. INTRODUCTION 2. SPECS @@ -9,7 +9,7 @@ AETHYRA SOUND DEVELOPMENT 1. INTRODUCTION -In Aethyra we plan to have both background music and sound effects +In The Mana World we plan to have both background music and sound effects linked to beings actions. 2. SPECS @@ -35,4 +35,4 @@ all. 4. SUGGESTIONS -As placeholders we could use Wesnoth SFX/BGM to test the sound engine. +As placeholders we could use Wesnoth SFX/BGM to test the sound engine.
\ No newline at end of file diff --git a/docs/aethyra.6 b/docs/tmw.6 index a130a3a5..0dee82c7 100644 --- a/docs/aethyra.6 +++ b/docs/tmw.6 @@ -1,13 +1,13 @@ -.TH "AETHYRA" "6" +.TH "TMW" "6" .SH "NAME" -aethyra \- aethyra is Aethyra: A fantasy online game +tmw \- tmw is The Mana World: A fantasy online game .SH "SYNOPSIS" -\fBaethyra\fR +\fBtmw\fR .SH "DESCRIPTION" This manual page documents briefly the -\fBaethyra\fR ingame +\fBtmw\fR ingame commands. -\fBaethyra\fR is a great online game based upon the Seiken Densetsu Serie. +\fBtmw\fR is a great online game based upon the Seiken Densetsu Serie. It has its own universe, and and its own character management system, which will give you the opportunity to play in a 2D heroic-fantasy world forever. .SH "BINARY PARAMETERS" @@ -49,49 +49,26 @@ Make your character attack. .B Key A: Target nearest monster. .TP -.B Key Z: +.B Key G: Get items on the ground or in a chest. .TP -.B Key S: -Make your character sit. -.TP .B Alt + 1...9: Shows an emoticon above your character. .TP -.B F1: -Displays / Hides in game help. -.TP -.B F2: -Displays / Hides status window. -.TP -.B F3: -Displays / Hides inventory window. -.TP -.B F4: -Displays / Hides equipment window. -.TP -.B F5: -Displays / Hides skills window. -.TP -.B F6: -Displays / Hides map. -.TP -.B F7 -Displays / Hides messages. +.B Alt + I: +Shows / Hide inventory window. .TP -.B F8 -Displays / Hides hot-keys. +.B Alt + K: +Shows / Hide skills window. .TP -.B F9: -Displays / Hides configuration window. +.B Alt + E: +Shows / Hide equipment window. .TP -.B F10 -Displays / Hides debug window. +.B Alt + C: +Shows configuration window. .SH "AUTHOR" This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de> for The Mana World project. -With slight alterations by Daniel Thomas\[:a]i <kraant@gmail.com>, -for Aethyra. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. diff --git a/docs/win32-release.txt b/docs/win32-release.txt index 5bd837d0..a8696897 100644 --- a/docs/win32-release.txt +++ b/docs/win32-release.txt @@ -1,6 +1,6 @@ -------------------------------------------- -AETHYRA WIN32 RELEASE CHECKLIST -------------------------------------------- +-------------------------------------- +THE MANA WORLD WIN32 RELEASE CHECKLIST +-------------------------------------- Every Win32 releaser should follow this checklist when creating a new package. @@ -11,10 +11,7 @@ Every Win32 releaser should follow this checklist when creating a new package. * Eventually Legal Copyright - Update README and ChangeLog if not already - Compile OpenGL version (Using -DUSE_OPENGL option) and rename the executable - from aethyra.exe to aethyra_opengl.exe - (This isn't actually how it's happening because I'm cross compiling - and therefore flying blind. As it is aethyra.exe is the OpenGL version - and no sdl version is generated -- kraant) + from tmw.exe to tmw_opengl.exe - Compile normal version (Do not use special flags as __DEBUG or USE_OPENGL) - Check if the dlls were compressed (SDL.dll, SDL_Image.dll, SDL_Mixer.dll) - Check config.xml for default values: @@ -22,9 +19,9 @@ Every Win32 releaser should follow this checklist when creating a new package. <configuration> <option name="chatlog" value="chatlog.txt"/> <option name="guialpha" value="0.8"/> - <option name="host" value="www.aethyra.org"/> + <option name="host" value="server.themanaworld.org"/> <option name="hwaccel" value="0"/> - <option name="port" value="21001"/> + <option name="port" value="6901"/> <option name="remember" value="0"/> <option name="screen" value="0"/> <option name="sfxVolume" value="100"/> diff --git a/packaging/debian/aethyra-data.install b/packaging/debian/aethyra-data.install deleted file mode 100644 index c652dff3..00000000 --- a/packaging/debian/aethyra-data.install +++ /dev/null @@ -1,6 +0,0 @@ -data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui -data/graphics/gui/*.xml usr/share/games/aethyra/data/graphics/gui -data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images -data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient -data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles -data/help/*.txt usr/share/games/aethyra/data/help diff --git a/packaging/debian/aethyra.desktop b/packaging/debian/aethyra.desktop deleted file mode 100644 index 221d2258..00000000 --- a/packaging/debian/aethyra.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=Aethyra -Comment=Aethyra is a 2D MMORPG using eAthena. -Exec=aethyra -StartupNotify=false -Terminal=false -Type=Game -Icon=aethyra.png -Categories=Game diff --git a/packaging/debian/aethyra.install b/packaging/debian/aethyra.install deleted file mode 100644 index 66ba5126..00000000 --- a/packaging/debian/aethyra.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/aethyra.desktop usr/share/applications -debian/aethyra.xpm usr/share/pixmaps -data/icons/aethyra.png usr/share/icons -docs/aethyra.6 usr/share/man/man6 -src/aethyra usr/games diff --git a/packaging/debian/aethyra.menu b/packaging/debian/aethyra.menu deleted file mode 100644 index 42035107..00000000 --- a/packaging/debian/aethyra.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(aethyra):needs="X11" section="Games/Adventure"\ - title="Aethyra"\ - description="Aethyra is a 2D MMORPG using eAthena."\ - command="/usr/games/aethyra" icon="/usr/share/pixmaps/aethyra.xpm" diff --git a/packaging/debian/aethyra.xpm b/packaging/debian/aethyra.xpm deleted file mode 100644 index 8d8550bd..00000000 --- a/packaging/debian/aethyra.xpm +++ /dev/null @@ -1,312 +0,0 @@ -/* XPM */ -static char * Aethyra_xpm[] = { -"32 32 277 2", -" c None", -". c #840000", -"+ c #7E0000", -"@ c #4F0000", -"# c #810000", -"$ c #830000", -"% c #7B0000", -"& c #460000", -"* c #4C0000", -"= c #4B0000", -"- c #750000", -"; c #860000", -"> c #850000", -", c #5D0000", -"' c #490000", -") c #450000", -"! c #4A0000", -"~ c #440000", -"{ c #6A0000", -"] c #7A0000", -"^ c #8B0000", -"/ c #990000", -"( c #960000", -"_ c #720000", -": c #6E0000", -"< c #740000", -"[ c #6B0202", -"} c #550505", -"| c #420404", -"1 c #440101", -"2 c #4D0000", -"3 c #4E0000", -"4 c #480000", -"5 c #9D0000", -"6 c #9B0000", -"7 c #6F0000", -"8 c #710000", -"9 c #760000", -"0 c #680404", -"a c #4B0C0C", -"b c #3C0909", -"c c #470202", -"d c #450101", -"e c #500000", -"f c #510000", -"g c #790000", -"h c #890000", -"i c #920000", -"j c #710706", -"k c #7D381F", -"l c #934A1A", -"m c #7B1A09", -"n c #6B1609", -"o c #521E13", -"p c #4F2517", -"q c #5D230F", -"r c #4D0F04", -"s c #350A0A", -"t c #360909", -"u c #470303", -"v c #930000", -"w c #840202", -"x c #712C1C", -"y c #A58248", -"z c #866621", -"A c #835819", -"B c #98681F", -"C c #845C1D", -"D c #BB964A", -"E c #856225", -"F c #3D1B0B", -"G c #241818", -"H c #251717", -"I c #360A0A", -"J c #430000", -"K c #6C0000", -"L c #800000", -"M c #730404", -"N c #6A431E", -"O c #473C1C", -"P c #534420", -"Q c #806125", -"R c #53290B", -"S c #461C09", -"T c #BB9432", -"U c #65490F", -"V c #1F1110", -"W c #1A2323", -"X c #1A2222", -"Y c #261212", -"Z c #440202", -"` c #7F0000", -" . c #870000", -".. c #6D0505", -"+. c #422522", -"@. c #454434", -"#. c #A18744", -"$. c #8F7237", -"%. c #A37F48", -"&. c #AD8847", -"*. c #C6A657", -"=. c #644C14", -"-. c #211615", -";. c #1C2626", -">. c #1B2323", -",. c #231313", -"'. c #420202", -"). c #6C0404", -"!. c #532D23", -"~. c #A8915B", -"{. c #967C37", -"]. c #6E5926", -"^. c #453512", -"/. c #473713", -"(. c #A4832A", -"_. c #594310", -":. c #241F1E", -"<. c #232828", -"[. c #1C2020", -"}. c #241111", -"|. c #430202", -"1. c #7C5030", -"2. c #967C3D", -"3. c #3E3318", -"4. c #3D3930", -"5. c #454442", -"6. c #524D44", -"7. c #C09E45", -"8. c #654F17", -"9. c #262524", -"0. c #252929", -"a. c #410202", -"b. c #6B0302", -"c. c #A78041", -"d. c #6A5621", -"e. c #414543", -"f. c #696B6B", -"g. c #747676", -"h. c #7B7566", -"i. c #C9A84F", -"j. c #665017", -"k. c #282725", -"l. c #252A2A", -"m. c #1B2222", -"n. c #3D0202", -"o. c #750802", -"p. c #B48E41", -"q. c #564418", -"r. c #4A4B4B", -"s. c #6D6F6F", -"t. c #797A7A", -"u. c #867C62", -"v. c #AE9040", -"w. c #664F12", -"x. c #2D2A25", -"y. c #242828", -"z. c #1E1E1E", -"A. c #291010", -"B. c #400202", -"C. c #860B02", -"D. c #B78C32", -"E. c #594013", -"F. c #433E3E", -"G. c #606464", -"H. c #74736C", -"I. c #7C6D44", -"J. c #433719", -"K. c #413311", -"L. c #322F1E", -"M. c #1C2121", -"N. c #271212", -"O. c #3C0606", -"P. c #8C0200", -"Q. c #B5771D", -"R. c #765513", -"S. c #3F3636", -"T. c #555B5B", -"U. c #686969", -"V. c #5A5957", -"W. c #3C3832", -"X. c #403826", -"Y. c #2F3023", -"Z. c #1C1F1D", -"`. c #2E0A0A", -" + c #460101", -".+ c #8F0101", -"++ c #A03F0C", -"@+ c #AC7E19", -"#+ c #4B3625", -"$+ c #474747", -"%+ c #5B5C5A", -"&+ c #83775A", -"*+ c #8C7539", -"=+ c #67541F", -"-+ c #6B551C", -";+ c #8C6D24", -">+ c #4E1C09", -",+ c #4A0101", -"'+ c #8A0606", -")+ c #8D1203", -"!+ c #A76713", -"~+ c #87611B", -"{+ c #453A32", -"]+ c #52554E", -"^+ c #A38A45", -"/+ c #715818", -"(+ c #7A6424", -"_+ c #443212", -":+ c #947026", -"<+ c #7D4E11", -"[+ c #490400", -"}+ c #420000", -"|+ c #7F0808", -"1+ c #8B0101", -"2+ c #800F01", -"3+ c #915E11", -"4+ c #504F40", -"5+ c #4E4834", -"6+ c #5A4715", -"7+ c #5B4814", -"8+ c #382813", -"9+ c #917035", -"0+ c #533209", -"a+ c #3F0400", -"b+ c #8E0101", -"c+ c #8A0000", -"d+ c #671104", -"e+ c #663D12", -"f+ c #786023", -"g+ c #74612B", -"h+ c #665320", -"i+ c #675321", -"j+ c #785C24", -"k+ c #684718", -"l+ c #380B00", -"m+ c #400000", -"n+ c #8C0303", -"o+ c #8D0000", -"p+ c #780101", -"q+ c #510808", -"r+ c #291A16", -"s+ c #26291C", -"t+ c #2D2B18", -"u+ c #321F0E", -"v+ c #370A02", -"w+ c #3E0100", -"x+ c #850202", -"y+ c #600202", -"z+ c #331313", -"A+ c #1E2121", -"B+ c #1A1E1E", -"C+ c #270D0D", -"D+ c #470000", -"E+ c #7B0404", -"F+ c #720101", -"G+ c #4B0D0D", -"H+ c #2D1717", -"I+ c #261414", -"J+ c #380808", -"K+ c #7E0202", -"L+ c #5D0606", -"M+ c #3B0E0E", -"N+ c #300C0C", -"O+ c #430303", -"P+ c #7A0505", -"Q+ c #7C0000", -"R+ c #640404", -"S+ c #430D0D", -"T+ c #460202", -"U+ c #610505", -"V+ c #440E0E", -"W+ c #390B0B", -"X+ c #560202", -"Y+ c #480707", -"Z+ c #410505", -"`+ c #4B0101", -" @ c #480101", -" ", -" ", -" ", -" . + @ ", -" # $ % & * @ = ", -" - # ; > $ , ' ) ! @ * ~ ", -" { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4 ", -" ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4 ", -" g h / i j k l m n o p q r s t u e 3 2 4 ", -" 8 > v w x y z A B C D E F G H I = @ ' J ", -" K L ^ M N O P Q R S T U V W X Y Z e ) ", -" ` ...+.@.#.$.%.&.*.=.-.;.>.,.'.e & ", -" ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4 ", -" # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.= ", -" ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.) ", -" L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~ ", -" ; C.D.E.F.G.H.I.J.K.L.M.N.O.4 ", -" P.Q.R.S.T.U.V.W.X.Y.Z.`. +2 ", -" .+++@+#+$+%+&+*+=+-+;+>+,+= ", -" '+)+!+~+{+]+^+/+(+_+:+<+[+}+ ", -" |+1+2+3+z 4+5+6+7+8+9+0+a+ ", -" b+c+d+e+f+g+h+i+j+k+l+m+ ", -" n+o+p+q+r+s+t+u+v+w+) ) ", -" x+` y+z+A+B+C+1 e D+ ", -" E+# F+G+H+I+J+3 @ ~ ", -" K+% L+M+N+O+e ' ", -" P+Q+R+S+I T+@ ) ", -" 9 U+V+W+u 2 ", -" X+Y+Z+ + ", -" * `+ @ ", -" ", -" "}; diff --git a/packaging/debian/control b/packaging/debian/control index 0d94b4fd..4372aaea 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -1,43 +1,37 @@ -Source: aethyra +Source: tmw Section: games Priority: optional -Homepage: http://www.aethyra.org/ -Maintainer: Aethyra Project <www.aethyra.org> -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan-dev (>= 0.8.1-3), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev +Homepage: http://www.themanaworld.org/ +Maintainer: Patrick Matthäi <patrick.matthaei@web.de> +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev Standards-Version: 3.7.3 -Package: aethyra +Package: tmw Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, aethyra-data (= ${source:Version}) -Recommends: aethyra-music -Description: Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of - getting its players as involved in the process as much as possible. It's originally forked from - The Mana World when its developers came up with the idea of "Why should we have to wait for an - MMORPG game in development when we've already got a great server setup here that does everything - we've been promised and more?" As such, we are trying to implement as many functions of eAthena - as possible while creating our own in the process based on what our players want to see. +Depends: ${shlibs:Depends}, ${misc:Depends}, tmw-data (= ${source:Version}) +Recommends: tmw-music +Description: The Mana World is a great Online Rolegame + based upon the Seiken Densetsu serie. It has its own universe, and its own + character management system, which will give you the opportunity to play in a + 2D heroic-fantasy world forever. -Package: aethyra-dbg +Package: tmw-dbg Architecture: any Priority: extra -Depends: aethyra (= ${binary:Version}) -Description: Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of - getting its players as involved in the process as much as possible. It's originally forked from - The Mana World when its developers came up with the idea of "Why should we have to wait for an - MMORPG game in development when we've already got a great server setup here that does everything - we've been promised and more?" As such, we are trying to implement as many functions of eAthena - as possible while creating our own in the process based on what our players want to see. +Depends: tmw (= ${binary:Version}) +Description: The Mana World is a great Online Rolegame (debugging symbols) + based upon the Seiken Densetsu serie. It has its own universe, and its own + character management system, which will give you the opportunity to play in a + 2D heroic-fantasy world forever. . - This package provides debugging symbols for the aethyra package. + This package provides debugging symbols for the tmw package. -Package: aethyra-data +Package: tmw-data Architecture: all -Recommends: aethyra, aethyra-music -Description: Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of - getting its players as involved in the process as much as possible. It's originally forked from - The Mana World when its developers came up with the idea of "Why should we have to wait for an - MMORPG game in development when we've already got a great server setup here that does everything - we've been promised and more?" As such, we are trying to implement as many functions of eAthena - as possible while creating our own in the process based on what our players want to see. +Recommends: tmw, tmw-music +Description: The Mana World is a great Online Rolegame (data files) + based upon the Seiken Densetsu serie. It has its own universe, and its own + character management system, which will give you the opportunity to play in a + 2D heroic-fantasy world forever. . This package contains the data files. diff --git a/packaging/debian/rules b/packaging/debian/rules index 6ee08a3b..614ee701 100644 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -56,7 +56,7 @@ binary-arch: build install dh_install -a dh_desktop -a dh_installmenu -a - dh_strip -a --dbg-package=aethyra-dbg + dh_strip -a --dbg-package=tmw-dbg dh_compress -a dh_fixperms -a dh_installdeb -a diff --git a/packaging/debian/tmw-data.install b/packaging/debian/tmw-data.install new file mode 100644 index 00000000..c9f6cb7b --- /dev/null +++ b/packaging/debian/tmw-data.install @@ -0,0 +1,5 @@ +data/graphics/gui/*.png usr/share/games/tmw/data/graphics/gui +data/graphics/images/*.png usr/share/games/tmw/data/graphics/images +data/graphics/images/ambient/*.png usr/share/games/tmw/data/graphics/images/ambient +data/graphics/tiles/*.png usr/share/games/tmw/data/graphics/tiles +data/help/*.txt usr/share/games/tmw/data/help diff --git a/packaging/debian/tmw.desktop b/packaging/debian/tmw.desktop new file mode 100644 index 00000000..f094f668 --- /dev/null +++ b/packaging/debian/tmw.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Name=The Mana World +Name[fr]=Le Monde de Mana +Comment=An online fantasy role playing game +Comment[fr]=Un jeu en ligne dans un univers fantastique +Comment[de]=ein Online Fantasy Spiel +Comment[it]=Un gioco fantasy online +Comment[nl]=Een online role playing game +Exec=tmw +StartupNotify=false +Terminal=false +Type=Game +Icon=tmw.png +Categories=Game diff --git a/packaging/debian/aethyra.docs b/packaging/debian/tmw.docs index d622a527..d622a527 100644 --- a/packaging/debian/aethyra.docs +++ b/packaging/debian/tmw.docs diff --git a/packaging/debian/tmw.install b/packaging/debian/tmw.install new file mode 100644 index 00000000..037ccf54 --- /dev/null +++ b/packaging/debian/tmw.install @@ -0,0 +1,5 @@ +debian/tmw.desktop usr/share/applications +debian/tmw.xpm usr/share/pixmaps +data/icons/tmw.png usr/share/icons +docs/tmw.6 usr/share/man/man6 +src/tmw usr/games diff --git a/packaging/debian/tmw.menu b/packaging/debian/tmw.menu new file mode 100644 index 00000000..4af5ad0a --- /dev/null +++ b/packaging/debian/tmw.menu @@ -0,0 +1,4 @@ +?package(tmw):needs="X11" section="Games/Adventure"\ + title="The Mana World"\ + description="The Mana World is an Online Fantasy adventure game."\ + command="/usr/games/tmw" icon="/usr/share/pixmaps/tmw.xpm" diff --git a/packaging/debian/aethyra.sgml b/packaging/debian/tmw.sgml index 0ed18199..0ed18199 100644 --- a/packaging/debian/aethyra.sgml +++ b/packaging/debian/tmw.sgml diff --git a/packaging/debian/tmw.xpm b/packaging/debian/tmw.xpm new file mode 100644 index 00000000..46ce5c87 --- /dev/null +++ b/packaging/debian/tmw.xpm @@ -0,0 +1,776 @@ +/* XPM */ +static char * tmw_xpm[] = { +"32 32 741 2", +" c None", +". c #E8ED72", +"+ c #E7ED6A", +"@ c #E1EB62", +"# c #D4E758", +"$ c #D2E750", +"% c #CDE748", +"& c #F5F4A1", +"* c #F3F294", +"= c #EBEE81", +"- c #EAEE77", +"; c #E6ED6F", +"> c #E1EB68", +", c #D9E859", +"' c #D3E851", +") c #CCE549", +"! c #C7E643", +"~ c #BEE239", +"{ c #B3DF32", +"] c #F8F8C4", +"^ c #F9F7B3", +"/ c #F4F3A2", +"( c #F4F397", +"_ c #F5F39A", +": c #F2F399", +"< c #E2EA6D", +"[ c #DFEA66", +"} c #DAE95C", +"| c #D3E753", +"1 c #CAE54B", +"2 c #C7E545", +"3 c #BFE23C", +"4 c #B7E034", +"5 c #B1E130", +"6 c #A5DC28", +"7 c #F9F9DA", +"8 c #F9F8CA", +"9 c #F8F7C9", +"0 c #F8F7CD", +"a c #F9F7C7", +"b c #F9F7B8", +"c c #F7F5A8", +"d c #E6EC73", +"e c #E0EA68", +"f c #DBE95D", +"g c #D8E956", +"h c #D2E850", +"i c #C4E343", +"j c #BEE23D", +"k c #B2E036", +"l c #A9DE2E", +"m c #A0DC29", +"n c #91D823", +"o c #F9F9F5", +"p c #F9F9EA", +"q c #F9F9E2", +"r c #F9F8E9", +"s c #F9F8E1", +"t c #F9F7D3", +"u c #F9F7BC", +"v c #F9F7AF", +"w c #E8EE80", +"x c #E2EC6F", +"y c #DBEA61", +"z c #D3E755", +"A c #CAE44C", +"B c #C6E446", +"C c #BDE441", +"D c #B8E337", +"E c #AADE30", +"F c #9DDA2A", +"G c #91D722", +"H c #87D61F", +"I c #7FD61B", +"J c #F9F9F8", +"K c #F9F9F7", +"L c #F9F9F0", +"M c #F9F8EC", +"N c #F9F7E1", +"O c #F9F7D7", +"P c #F9F7C9", +"Q c #F9F7B4", +"R c #EBF092", +"S c #E1EB69", +"T c #DBE95F", +"U c #D3E654", +"V c #CCE44A", +"W c #C9E647", +"X c #BDE13D", +"Y c #B1DE35", +"Z c #A8DD30", +"` c #9BDA29", +" . c #94D823", +".. c #8CD921", +"+. c #82D71C", +"@. c #7CD716", +"#. c #F9F9F9", +"$. c #F9F8F5", +"%. c #F9F7EE", +"&. c #F9F7E4", +"*. c #F9F7D5", +"=. c #F9F7CB", +"-. c #F9F7BF", +";. c #F4F39E", +">. c #E1EA76", +",. c #E0EA69", +"'. c #D9E85D", +"). c #D7E859", +"!. c #CCE64E", +"~. c #C1E343", +"{. c #BBE23C", +"]. c #B0DF34", +"^. c #A9DD2F", +"/. c #9AD928", +"(. c #90D822", +"_. c #8AD81F", +":. c #81D81B", +"<. c #76D517", +"[. c #F9F7F6", +"}. c #F9F7F4", +"|. c #F9F5D3", +"1. c #F9F6C7", +"2. c #F9F6B9", +"3. c #E6EC86", +"4. c #E6ED72", +"5. c #E3ED6C", +"6. c #D6E75E", +"7. c #D1E655", +"8. c #C7E34A", +"9. c #C1E141", +"0. c #B2DD39", +"a. c #B3E135", +"b. c #A6DE30", +"c. c #9BDB29", +"d. c #97DA24", +"e. c #87D71E", +"f. c #82D71B", +"g. c #87DA1F", +"h. c #63CF12", +"i. c #F8F8F8", +"j. c #F9F7F5", +"k. c #F9F5E3", +"l. c #F9F5D4", +"m. c #F9F6B8", +"n. c #EDF198", +"o. c #E1EB6F", +"p. c #E1EC68", +"q. c #D8E95C", +"r. c #D3E752", +"s. c #C9E44A", +"t. c #C7E746", +"u. c #BEE43D", +"v. c #B0E138", +"w. c #A8E02D", +"x. c #A3DF29", +"y. c #B4E226", +"z. c #CDEB2C", +"A. c #B9E925", +"B. c #6DD213", +"C. c #56C90F", +"D. c #F9F8F4", +"E. c #F9F7EB", +"F. c #F9F7F2", +"G. c #F9F5EA", +"H. c #F9F3DE", +"I. c #F9F4CF", +"J. c #F9F5C5", +"K. c #F9F5B8", +"L. c #F8F7B2", +"M. c #F1F495", +"N. c #E3EC6B", +"O. c #D8E859", +"P. c #CEE650", +"Q. c #C8E449", +"R. c #C2E441", +"S. c #BAE139", +"T. c #E7F24F", +"U. c #E3F347", +"V. c #DCF13E", +"W. c #D9F137", +"X. c #CDEE30", +"Y. c #C3EB27", +"Z. c #85D919", +"`. c #4FC90E", +" + c #F7F7F2", +".+ c #F9F9F2", +"++ c #F9F8ED", +"@+ c #F9F5EE", +"#+ c #F9F4E4", +"$+ c #F9F5DC", +"%+ c #F9F6D1", +"&+ c #F9F6C2", +"*+ c #F9F6B7", +"=+ c #F9F6A6", +"-+ c #F8F599", +";+ c #F7F591", +">+ c #F4F584", +",+ c #D7EB61", +"'+ c #C5E447", +")+ c #BAE13E", +"!+ c #B8E23A", +"~+ c #B8E132", +"{+ c #E6F349", +"]+ c #E1F343", +"^+ c #DAF13B", +"/+ c #D2EF33", +"(+ c #CBEE2E", +"_+ c #C1EA25", +":+ c #A9E61F", +"<+ c #55CE10", +"[+ c #4FC60D", +"}+ c #F8F8E9", +"|+ c #F9F9E8", +"1+ c #F9F9E7", +"2+ c #F9F8E4", +"3+ c #F9F7F0", +"4+ c #F9F6EF", +"5+ c #F9F5E7", +"6+ c #F9F3DB", +"7+ c #F9F5D6", +"8+ c #F9F7CE", +"9+ c #F9F7BE", +"0+ c #F9F7B7", +"a+ c #F9F7A5", +"b+ c #F7F691", +"c+ c #F6F588", +"d+ c #F5F580", +"e+ c #DBEE6B", +"f+ c #BAE13D", +"g+ c #B5E137", +"h+ c #A5DB2E", +"i+ c #E0F041", +"j+ c #DBF140", +"k+ c #DAF138", +"l+ c #D1EE32", +"m+ c #C6EB2B", +"n+ c #C0EC27", +"o+ c #BAEB22", +"p+ c #65D517", +"q+ c #4FCC0B", +"r+ c #F9F9D7", +"s+ c #F9F9D6", +"t+ c #F9F8EA", +"u+ c #F9F7E8", +"v+ c #F9F5E5", +"w+ c #F9F5DD", +"x+ c #F9F2D2", +"y+ c #F9F3CA", +"z+ c #F9F6C3", +"A+ c #F9F7BA", +"B+ c #F9F8B2", +"C+ c #F8F89E", +"D+ c #F8F58E", +"E+ c #F5F583", +"F+ c #EFF479", +"G+ c #C5E557", +"H+ c #C5E543", +"I+ c #B9E13B", +"J+ c #9FDA2A", +"K+ c #CEEC3B", +"L+ c #D9EF38", +"M+ c #D4EE32", +"N+ c #D1EF30", +"O+ c #C8ED2A", +"P+ c #C2EB26", +"Q+ c #B5E81E", +"R+ c #80DC1C", +"S+ c #46C80B", +"T+ c #F0F1C0", +"U+ c #F9F8C7", +"V+ c #F9F9C6", +"W+ c #F9F8D5", +"X+ c #F9F7DF", +"Y+ c #F9F6D6", +"Z+ c #F9F5D0", +"`+ c #F9F3C4", +" @ c #F9F3BC", +".@ c #F9F5B5", +"+@ c #F9F7B0", +"@@ c #F9F8A4", +"#@ c #F7F796", +"$@ c #EFF386", +"%@ c #D3E865", +"&@ c #C7E450", +"*@ c #C0E242", +"=@ c #BEE33F", +"-@ c #B5E036", +";@ c #A7DB2F", +">@ c #A0DC2B", +",@ c #C4E32F", +"'@ c #DCF139", +")@ c #D2ED2E", +"!@ c #CAEC2A", +"~@ c #CBEF2B", +"{@ c #BEEA22", +"]@ c #B2E81E", +"^@ c #8FDD17", +"/@ c #3DC209", +"(@ c #33BC07", +"_@ c #F5F5B4", +":@ c #F6F6AE", +"<@ c #F6F6B1", +"[@ c #F7F7B3", +"}@ c #F2F3AB", +"|@ c #F3F198", +"1@ c #F8F5BA", +"2@ c #F9F4B6", +"3@ c #F9F3AF", +"4@ c #F9F4A4", +"5@ c #F8F7A2", +"6@ c #F7F799", +"7@ c #F6F68A", +"8@ c #DDEC69", +"9@ c #CEE74F", +"0@ c #C0E03C", +"a@ c #D5EA4C", +"b@ c #BEE23A", +"c@ c #A9DF2F", +"d@ c #9EDD2A", +"e@ c #BEE22A", +"f@ c #DCF23A", +"g@ c #D4F033", +"h@ c #CBED2A", +"i@ c #C5ED29", +"j@ c #BDEB22", +"k@ c #B4E81E", +"l@ c #A5E618", +"m@ c #41C209", +"n@ c #3ABF07", +"o@ c #DCDC8A", +"p@ c #F3F49B", +"q@ c #F3F49D", +"r@ c #F2F49D", +"s@ c #F4F59F", +"t@ c #F4F59D", +"u@ c #F1F498", +"v@ c #F8F7BF", +"w@ c #F9F6AF", +"x@ c #F8F39A", +"y@ c #F8F594", +"z@ c #F5F57D", +"A@ c #DDEC66", +"B@ c #C2E144", +"C@ c #BDE13F", +"D@ c #BFD82E", +"E@ c #E6EF4E", +"F@ c #E1F04A", +"G@ c #C2E433", +"H@ c #CDEA34", +"I@ c #DDF03F", +"J@ c #D4EF36", +"K@ c #CFEF30", +"L@ c #CBEE2A", +"M@ c #C2EC26", +"N@ c #B7E91F", +"O@ c #ADE71C", +"P@ c #A0E517", +"Q@ c #3FC008", +"R@ c #33BD06", +"S@ c #DDD97B", +"T@ c #F2F392", +"U@ c #F0F28F", +"V@ c #F1F38C", +"W@ c #F6F7BE", +"X@ c #F5F6B7", +"Y@ c #F5F5B2", +"Z@ c #F9F6A7", +"`@ c #F9F6A3", +" # c #F8F59C", +".# c #F8F38D", +"+# c #F7F58C", +"@# c #F5F687", +"## c #F3F576", +"$# c #F0F575", +"%# c #DDEC57", +"&# c #D8EA49", +"*# c #DDE946", +"=# c #E8F14F", +"-# c #E3F148", +";# c #E2F346", +"># c #E1F345", +",# c #D8F039", +"'# c #D1EF31", +")# c #CAED2C", +"!# c #C4EC27", +"~# c #C1ED24", +"{# c #B6EA1F", +"]# c #AFEA1C", +"^# c #A4E717", +"/# c #3EBF08", +"(# c #37C206", +"_# c #E8EB6C", +":# c #E6ED76", +"<# c #E4EC73", +"[# c #ECEF86", +"}# c #F8F7A7", +"|# c #F9F7A7", +"1# c #F8F7A3", +"2# c #F8F69D", +"3# c #F8F69A", +"4# c #F7F48A", +"5# c #F6F27B", +"6# c #F6F482", +"7# c #F3F57B", +"8# c #F1F574", +"9# c #F0F46C", +"0# c #EBF25E", +"a# c #EBF259", +"b# c #E7F152", +"c# c #E1EF44", +"d# c #DFEF40", +"e# c #D7EE3B", +"f# c #DAF039", +"g# c #D7F137", +"h# c #D1F032", +"i# c #CCEF2C", +"j# c #C6EE26", +"k# c #B7EA1F", +"l# c #AAE81A", +"m# c #97E415", +"n# c #37BE07", +"o# c #2CAF05", +"p# c #D5DC5B", +"q# c #E4ED6F", +"r# c #E9F082", +"s# c #F8F7A1", +"t# c #F8F79D", +"u# c #F7F696", +"v# c #F6F68B", +"w# c #F5F37B", +"x# c #F5F378", +"y# c #F3F372", +"z# c #F1F36C", +"A# c #EEF468", +"B# c #ECF35D", +"C# c #EAF256", +"D# c #E7F151", +"E# c #E4F148", +"F# c #E0F043", +"G# c #E1F143", +"H# c #D9EF39", +"I# c #D2ED31", +"J# c #CEF030", +"K# c #C9EF2A", +"L# c #C0ED25", +"M# c #ADE61C", +"N# c #A7E619", +"O# c #A5E818", +"P# c #80D913", +"Q# c #34BE06", +"R# c #35BF05", +"S# c #E0EC61", +"T# c #E4ED72", +"U# c #F7F792", +"V# c #F7F791", +"W# c #F8F78F", +"X# c #F6F687", +"Y# c #F6F688", +"Z# c #F3F377", +"`# c #F4F474", +" $ c #F1F472", +".$ c #EEF46D", +"+$ c #DEEB59", +"@$ c #E7F059", +"#$ c #E9F356", +"$$ c #E9F255", +"%$ c #E7F24D", +"&$ c #E6F245", +"*$ c #E4F243", +"=$ c #DFF240", +"-$ c #D7EF36", +";$ c #CCEB2B", +">$ c #CDEE2C", +",$ c #C5ED2A", +"'$ c #BDEB25", +")$ c #ADE71E", +"!$ c #A6E51A", +"~$ c #9AE316", +"{$ c #93E214", +"]$ c #5CC30B", +"^$ c #34BD05", +"/$ c #DDEC59", +"($ c #D6E858", +"_$ c #F5F57C", +":$ c #F5F680", +"<$ c #F5F67E", +"[$ c #F5F67C", +"}$ c #F4F574", +"|$ c #F1F26A", +"1$ c #F2F46F", +"2$ c #EFF468", +"3$ c #BCE24A", +"4$ c #BBDF38", +"5$ c #B9DB30", +"6$ c #C3DF33", +"7$ c #DDED42", +"8$ c #E5F249", +"9$ c #DEF03D", +"0$ c #D5EF35", +"a$ c #CEEE2E", +"b$ c #C1E925", +"c$ c #B9E923", +"d$ c #B1E71E", +"e$ c #ABE619", +"f$ c #A8E517", +"g$ c #94E113", +"h$ c #83DE11", +"i$ c #35AD06", +"j$ c #2FBB04", +"k$ c #CEE249", +"l$ c #CFE54B", +"m$ c #E8F16F", +"n$ c #F5F578", +"o$ c #F4F674", +"p$ c #F1F46D", +"q$ c #F2F268", +"r$ c #F1F366", +"s$ c #EFF462", +"t$ c #DEEF5B", +"u$ c #B3E039", +"v$ c #B4E037", +"w$ c #AEDE31", +"x$ c #A6DB2B", +"y$ c #BBE331", +"z$ c #E3F243", +"A$ c #DFF141", +"B$ c #D9F038", +"C$ c #D9F136", +"D$ c #CDEF2E", +"E$ c #C7EE2A", +"F$ c #BDEB24", +"G$ c #B7EA1D", +"H$ c #A0E316", +"I$ c #96E214", +"J$ c #93E212", +"K$ c #6DD10D", +"L$ c #2CAD04", +"M$ c #2AB303", +"N$ c #CDE746", +"O$ c #CDE74B", +"P$ c #F0F56D", +"Q$ c #F2F46A", +"R$ c #F0F264", +"S$ c #ECF15A", +"T$ c #EFF361", +"U$ c #EDF45A", +"V$ c #EBF45C", +"W$ c #B9E239", +"X$ c #B6E335", +"Y$ c #ADE02E", +"Z$ c #A9E02B", +"`$ c #A4DE28", +" % c #DFF243", +".% c #D7EF35", +"+% c #D5EF31", +"@% c #D4F031", +"#% c #CDEF2C", +"$% c #C7ED28", +"%% c #C6EE27", +"&% c #C1EE23", +"*% c #B6EC1F", +"=% c #A7E818", +"-% c #67CC0E", +";% c #47C208", +">% c #34B906", +",% c #2DBD04", +"'% c #C1E23C", +")% c #C3E53E", +"!% c #D7EB4F", +"~% c #EEF257", +"{% c #ECF057", +"]% c #EAF051", +"^% c #EBF255", +"/% c #EBF452", +"(% c #E9F450", +"_% c #B8E137", +":% c #A3DB2A", +"<% c #A5DF2B", +"[% c #98DA26", +"}% c #8CD621", +"|% c #90D41D", +"1% c #BFE326", +"2% c #D0EE2D", +"3% c #CEEF2E", +"4% c #C8EE28", +"5% c #C1ED26", +"6% c #BCEC22", +"7% c #B9ED20", +"8% c #9FE419", +"9% c #70CD0F", +"0% c #35B906", +"a% c #34C005", +"b% c #30C005", +"c% c #26B503", +"d% c #B7E036", +"e% c #B7E239", +"f% c #E2EF4B", +"g% c #EBF451", +"h% c #E5F14B", +"i% c #E4F04B", +"j% c #E7F451", +"k% c #E6F44B", +"l% c #B6DD2C", +"m% c #ABDC25", +"n% c #B4DF23", +"o% c #A3D61D", +"p% c #96D91D", +"q% c #86D218", +"r% c #B3DE21", +"s% c #CAED2B", +"t% c #C6EC25", +"u% c #BEEB22", +"v% c #BDEC20", +"w% c #B3EA1D", +"x% c #9AE017", +"y% c #46BC07", +"z% c #40C107", +"A% c #35C206", +"B% c #2EBE05", +"C% c #2BBD04", +"D% c #B2E130", +"E% c #B5E334", +"F% c #DFF042", +"G% c #E4F147", +"H% c #E5F348", +"I% c #E2F246", +"J% c #E4F445", +"K% c #DFF33F", +"L% c #E0F33D", +"M% c #DCF238", +"N% c #D8F034", +"O% c #D2EF2E", +"P% c #CBEB29", +"Q% c #D1EF2D", +"R% c #C7ED26", +"S% c #C5EE26", +"T% c #B7EA20", +"U% c #B5EA1D", +"V% c #AEEA1B", +"W% c #85D813", +"X% c #3FC208", +"Y% c #3AC507", +"Z% c #33C005", +"`% c #2BBB04", +" & c #26A903", +".& c #A9E029", +"+& c #A5DF29", +"@& c #A5DE29", +"#& c #D8EE3D", +"$& c #E4F341", +"%& c #E2F340", +"&& c #E0F33C", +"*& c #DDF239", +"=& c #D9F236", +"-& c #D6F133", +";& c #D3F131", +">& c #CEEE2A", +",& c #CEEF28", +"'& c #CBEF29", +")& c #BFEB22", +"!& c #B2EB23", +"~& c #81DD1D", +"{& c #6DCF11", +"]& c #68D10F", +"^& c #4CCB0E", +"/& c #39C407", +"(& c #33C106", +"_& c #2ABB04", +":& c #27B803", +"<& c #97DA23", +"[& c #98DC24", +"}& c #95DC23", +"|& c #93DB25", +"1& c #99DF2A", +"2& c #C6EC31", +"3& c #C6EB2E", +"4& c #ADE026", +"5& c #C1E928", +"6& c #CCEE29", +"7& c #C9ED26", +"8& c #B9EA21", +"9& c #8FD718", +"0& c #4FC30C", +"a& c #4DCB0B", +"b& c #49CB0A", +"c& c #3DC508", +"d& c #3DC808", +"e& c #34C306", +"f& c #2DBC04", +"g& c #2CBF04", +"h& c #88D81D", +"i& c #87D81A", +"j& c #86D81A", +"k& c #7ED518", +"l& c #75D015", +"m& c #71D113", +"n& c #84DB1A", +"o& c #9DE524", +"p& c #7CD316", +"q& c #62CA0E", +"r& c #5AC80B", +"s& c #55C90B", +"t& c #46CA0A", +"u& c #41C708", +"v& c #3DC907", +"w& c #36C406", +"x& c #30C205", +"y& c #27AA04", +"z& c #75D016", +"A& c #79D516", +"B& c #73D515", +"C& c #6AD113", +"D& c #6CD413", +"E& c #65D211", +"F& c #5BCD0F", +"G& c #56CD0E", +"H& c #58D10E", +"I& c #50CC0C", +"J& c #48C809", +"K& c #40C708", +"L& c #3FC607", +"M& c #40C907", +"N& c #38C706", +"O& c #32C105", +"P& c #57BE0F", +"Q& c #61D111", +"R& c #66D411", +"S& c #62D20F", +"T& c #57CD0D", +"U& c #57D00C", +"V& c #4DCC0C", +"W& c #4BCD0A", +"X& c #40C608", +"Y& c #3DC807", +"Z& c #30B505", +"`& c #4BBC0B", +" * c #4CC20A", +".* c #48BF0A", +"+* c #45C109", +"@* c #38B507", +"#* c #31B506", +" . + @ # $ % ", +" & * = - ; > , ' ) ! ~ { ", +" ] ^ / ( _ : < [ } | 1 2 3 4 5 6 ", +" 7 8 9 0 a b c d e f g h i j k l m n ", +" o p q r s t a u v w x y z A B C D E F G H I ", +" J K L o M N O P u Q R S T U V W X Y Z ` ...+.@. ", +" #.K J $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<. ", +" #.#.J [.}.%.&.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h. ", +" i.#.K [.j.}.%.k.l.1.m.n.o.p.q.r.s.t.u.v.E w.x.y.z.A.B.C. ", +" #.K D.E.}.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.D T.U.V.W.X.Y.Z.`. ", +" +.+.+++&.F.@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+ ", +" }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+9.f+g+h+i+j+k+l+m+n+o+p+q+ ", +" r+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+].J+K+L+M+N+O+P+Q+R+S+ ", +"T+U+V+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@", +"_@:@<@[@[@}@|@1@2@3@4@5@6@7@8@9@W 0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@", +"o@p@q@r@s@t@u@v@w@4@x@y@b+z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@", +"S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#", +"_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#O@l#m#n#o#", +"p#q#r#5@s#t#u#b+v#w#x#y#z#A#B#C#D#E#F#G#H#I#'#J#K#L#M#N#O#P#Q#R#", +" S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$ ", +" /$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$G#9$k+0$a$b$c$d$e$f$g$h$i$j$ ", +" k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$'#D$E$F$G$H$I$J$K$L$M$ ", +" N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,% ", +" '%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c% ", +" d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C% ", +" D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% & ", +" .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:& ", +" <&[&}&|&1&2&3&4&5&6&7&{@8&9&0&a&b&c&d&e&f&g& ", +" h&i&j&k&l&m&n&o&p&q&r&s&a&t&u&v&w&x&y& ", +" z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O& ", +" P&Q&R&S&T&U&V&W&X&Y&v&Z& ", +" `& *.*+*@*#* "}; diff --git a/packaging/debian/watch b/packaging/debian/watch index 5fd35272..01aa13f7 100644 --- a/packaging/debian/watch +++ b/packaging/debian/watch @@ -1,2 +1,2 @@ version=3 -http://aethyra.org/downloads/aethyra-(.*)\.tar\.gz +http://sf.net/themanaworld/tmw-(.*)\.tar\.gz diff --git a/packaging/windows/make-translations.vbs b/packaging/windows/make-translations.vbs index dee9f2bb..99e88875 100644 --- a/packaging/windows/make-translations.vbs +++ b/packaging/windows/make-translations.vbs @@ -29,7 +29,7 @@ do while not stream.AtEndOfStream CreateFolderIfNonexistent("..\..\translations\" + s + "\LC_MESSAGES") 'build the translate command infile = "../../po/" + s + ".po" - outfile = "../../translations/" + s +"/LC_MESSAGES/aethyra.mo" + outfile = "../../translations/" + s +"/LC_MESSAGES/tmw.mo" command = "msgfmt -c -o " + outfile + " " + infile 'execute translate command errval = WshShell.run(command, 0, true) diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index d5905c45..e1c1e390 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -5,14 +5,14 @@ SetCompressor /SOLID lzma !define SRCDIR "..\.." ;--- (and without !defines ) --- -!System "upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d ${SRCDIR}\aethyra.exe" +!System "upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d ${SRCDIR}\tmw.exe" ; HM NIS Edit helper defines -!define PRODUCT_NAME "Aethyra" -!define PRODUCT_VERSION "0.0.27.1" -!define PRODUCT_PUBLISHER "Aethyra Development Team" -!define PRODUCT_WEB_SITE "http://aethyra.org" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\aethyra.exe" +!define PRODUCT_NAME "The Mana World" +!define PRODUCT_VERSION "0.0.28" +!define PRODUCT_PUBLISHER "The Mana World Development Team" +!define PRODUCT_WEB_SITE "http://themanaworld.org" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tmw.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" @@ -22,14 +22,14 @@ SetCompressor /SOLID lzma ; MUI Settings !define MUI_ABORTWARNING ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico" -!define MUI_ICON "${SRCDIR}\data\icons\aethyra.ico" +!define MUI_ICON "${SRCDIR}\data\icons\tmw.ico" ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico" -!define MUI_UNICON "${SRCDIR}\data\icons\aethyra.ico" +!define MUI_UNICON "${SRCDIR}\data\icons\tmw.ico" ;Language Selection Dialog Settings ;Remember the installer language !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "Software\Aethyra" +!define MUI_LANGDLL_REGISTRY_KEY "Software\The Mana World" !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" !define MUI_WELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp" @@ -49,16 +49,16 @@ SetCompressor /SOLID lzma !insertmacro MUI_PAGE_INSTFILES ; Finish page !define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_RUN_FUNCTION Runaethyra +!define MUI_FINISHPAGE_RUN_FUNCTION RunTMW !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""' !define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage -!define MUI_FINISHPAGE_LINK "Visit the Aethyra website for the latest news, FAQs and support" -!define MUI_FINISHPAGE_LINK_LOCATION "http://aethyra.org" +!define MUI_FINISHPAGE_LINK "Visit TMW website for the latest news, FAQs and support" +!define MUI_FINISHPAGE_LINK_LOCATION "http://themanaworld.org" !insertmacro MUI_PAGE_FINISH -Function Runaethyra +Function RunTMW SetOutPath $INSTDIR -Exec "$INSTDIR\aethyra.exe" +Exec "$INSTDIR\tmw.exe" FunctionEnd Function changeFinishImage @@ -130,8 +130,8 @@ ReserveFile "setup_finish.bmp" ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "aethyra-${PRODUCT_VERSION}-win32.exe" -InstallDir "$PROGRAMFILES\Aethyra" +OutFile "tmw-${PRODUCT_VERSION}-win32.exe" +InstallDir "$PROGRAMFILES\The Mana World" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -146,9 +146,9 @@ Section "Core files (required)" SecCore SectionIn RO SetOutPath "$INSTDIR" SetOverwrite ifnewer - CreateDirectory "$SMPROGRAMS\Aethyra" - CreateShortCut "$SMPROGRAMS\Aethyra\Aethyra.lnk" "$INSTDIR\aethyra.exe" - CreateShortCut "$DESKTOP\Aethyra.lnk" "$INSTDIR\aethyra.exe" + CreateDirectory "$SMPROGRAMS\The Mana World" + CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World.lnk" "$INSTDIR\tmw.exe" + CreateShortCut "$DESKTOP\The Mana World.lnk" "$INSTDIR\tmw.exe" CreateDirectory "$INSTDIR\data" CreateDirectory "$INSTDIR\data\fonts" CreateDirectory "$INSTDIR\data\graphics" @@ -161,7 +161,7 @@ Section "Core files (required)" SecCore SetOverwrite ifnewer SetOutPath "$INSTDIR" - File "${SRCDIR}\aethyra.exe" + File "${SRCDIR}\tmw.exe" File "${SRCDIR}\*.dll" File "${SRCDIR}\AUTHORS" File "${SRCDIR}\COPYING" @@ -177,7 +177,7 @@ Section "Core files (required)" SecCore SetOutPath "$INSTDIR\data\help" File "${SRCDIR}\data\help\*.txt" SetOutPath "$INSTDIR\data\icons\" - File "${SRCDIR}\data\icons\aethyra.ico" + File "${SRCDIR}\data\icons\tmw.ico" SetOutPath "$INSTDIR\docs" File "${SRCDIR}\docs\FAQ.txt" SectionEnd @@ -204,18 +204,18 @@ SectionEnd Section -AdditionalIcons WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" - CreateShortCut "$SMPROGRAMS\Aethyra\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" - CreateShortCut "$SMPROGRAMS\Aethyra\Readme.lnk" "notepad.exe" "$INSTDIR\README" - CreateShortCut "$SMPROGRAMS\Aethyra\FAQ.lnk" "$INSTDIR\docs\FAQ.txt" - CreateShortCut "$SMPROGRAMS\Aethyra\Uninstall.lnk" "$INSTDIR\uninst.exe" + CreateShortCut "$SMPROGRAMS\The Mana World\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" + CreateShortCut "$SMPROGRAMS\The Mana World\Readme.lnk" "notepad.exe" "$INSTDIR\README" + CreateShortCut "$SMPROGRAMS\The Mana World\FAQ.lnk" "$INSTDIR\docs\FAQ.txt" + CreateShortCut "$SMPROGRAMS\The Mana World\Uninstall.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\aethyra.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\tmw.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\aethyra.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\tmw.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" @@ -226,21 +226,21 @@ Function un.onInit FunctionEnd Section Uninstall - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aethyra" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\The Mana World" Delete "$INSTDIR\*.*" - Delete "$SMPROGRAMS\Aethyra\Uninstall.lnk" - Delete "$DESKTOP\Aethyra.lnk" - Delete "$SMPROGRAMS\Aethyra\Aethyra.lnk" - Delete "$SMPROGRAMS\Aethyra\Website.lnk" - Delete "$SMPROGRAMS\Aethyra\Readme.lnk" - Delete "$SMPROGRAMS\Aethyra\FAQ.lnk" + Delete "$SMPROGRAMS\The Mana World\Uninstall.lnk" + Delete "$DESKTOP\The Mana World.lnk" + Delete "$SMPROGRAMS\The Mana World\The Mana World.lnk" + Delete "$SMPROGRAMS\The Mana World\Website.lnk" + Delete "$SMPROGRAMS\The Mana World\Readme.lnk" + Delete "$SMPROGRAMS\The Mana World\FAQ.lnk" + + RMDir "$SMPROGRAMS\The Mana World" - RMDir "$SMPROGRAMS\Aethyra" RMDir /r "$INSTDIR\data" RMDir /r "$INSTDIR\docs" - RMDir /r "$INSTDIR\po" RMDir /r "$INSTDIR\updates" RMDir "$INSTDIR" @@ -22,4 +22,4 @@ ru sk sv th -zh_CN +#zh_CN diff --git a/po/Makevars b/po/Makevars index 73f2a51b..76e72f50 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,7 +1,7 @@ # Makefile variables for PO directory in any package using GNU gettext. # Usually the message domain is the same as the package name. -DOMAIN = aethyra +DOMAIN = tmw # These two variables depend on the location of this directory. subdir = po diff --git a/po/aethyra.pot b/po/aethyra.pot deleted file mode 100644 index e21fcec0..00000000 --- a/po/aethyra.pot +++ /dev/null @@ -1,2150 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR The Mana World Development Team -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 -msgid "Buy" -msgstr "" - -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 -#, c-format -msgid "Price: %d GP / Total: %d GP" -msgstr "" - -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 -msgid "Quit" -msgstr "" - -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 -#, c-format -msgid "Description: %s" -msgstr "" - -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 -#, c-format -msgid "Effect: %s" -msgstr "" - -#: src/gui/buysell.cpp:30 -msgid "Shop" -msgstr "" - -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 -msgid "Sell" -msgstr "" - -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 -msgid "Cancel" -msgstr "" - -#: src/gui/char_select.cpp:64 -msgid "Confirm Character Delete" -msgstr "" - -#: src/gui/char_select.cpp:65 -msgid "Are you sure you want to delete this character?" -msgstr "" - -#: src/gui/char_select.cpp:83 -msgid "Select Character" -msgstr "" - -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 -#, c-format -msgid "Name: %s" -msgstr "" - -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 -#, c-format -msgid "Level: %d" -msgstr "" - -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 -#, c-format -msgid "Job Level: %d" -msgstr "" - -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 -#, c-format -msgid "Money: %d" -msgstr "" - -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "" - -#: src/gui/char_select.cpp:180 -#, c-format -msgid "Gold: %d" -msgstr "" - -#: src/gui/char_select.cpp:249 -msgid "Create Character" -msgstr "" - -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 -msgid "Name:" -msgstr "" - -#: src/gui/char_select.cpp:262 -msgid "Hair Color:" -msgstr "" - -#: src/gui/char_select.cpp:265 -msgid "Hair Style:" -msgstr "" - -#: src/gui/char_select.cpp:266 -msgid "Create" -msgstr "" - -#: src/gui/char_server.cpp:49 -msgid "Select Server" -msgstr "" - -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 -msgid "OK" -msgstr "" - -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -msgid "Chat" -msgstr "" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " -msgstr "" - -#: src/gui/chat.cpp:151 -#, c-format -msgid "Global announcement from %s: " -msgstr "" - -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 -msgid "Server:" -msgstr "" - -#: src/gui/chat.cpp:327 -#, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." -msgstr "" - -#: src/gui/chat.cpp:599 -msgid "Unknown command" -msgstr "" - -#: src/gui/chat.cpp:611 -msgid "Trade failed!" -msgstr "" - -#: src/gui/chat.cpp:614 -msgid "Emote failed!" -msgstr "" - -#: src/gui/chat.cpp:617 -msgid "Sit failed!" -msgstr "" - -#: src/gui/chat.cpp:620 -msgid "Chat creating failed!" -msgstr "" - -#: src/gui/chat.cpp:623 -msgid "Could not join party!" -msgstr "" - -#: src/gui/chat.cpp:626 -msgid "Cannot shout!" -msgstr "" - -#: src/gui/chat.cpp:635 -msgid "You have not yet reached a high enough lvl!" -msgstr "" - -#: src/gui/chat.cpp:638 -msgid "Insufficient HP!" -msgstr "" - -#: src/gui/chat.cpp:641 -msgid "Insufficient SP!" -msgstr "" - -#: src/gui/chat.cpp:644 -msgid "You have no memos!" -msgstr "" - -#: src/gui/chat.cpp:647 -msgid "You cannot do that right now!" -msgstr "" - -#: src/gui/chat.cpp:650 -msgid "Seems you need more Zeny... ;-)" -msgstr "" - -#: src/gui/chat.cpp:653 -msgid "You cannot use this skill with that kind of weapon!" -msgstr "" - -#: src/gui/chat.cpp:656 -msgid "You need another red gem!" -msgstr "" - -#: src/gui/chat.cpp:659 -msgid "You need another blue gem!" -msgstr "" - -#: src/gui/chat.cpp:662 -msgid "You're carrying to much to do this!" -msgstr "" - -#: src/gui/chat.cpp:665 -msgid "Huh? What's that?" -msgstr "" - -#: src/gui/chat.cpp:674 -msgid "Warp failed..." -msgstr "" - -#: src/gui/chat.cpp:677 -msgid "Could not steal anything..." -msgstr "" - -#: src/gui/chat.cpp:680 -msgid "Poison had no effect..." -msgstr "" - -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 -msgid "-- Help --" -msgstr "" - -#: src/gui/chat.cpp:792 -msgid "/announce: Global announcement (GM only)" -msgstr "" - -#: src/gui/chat.cpp:793 -msgid "/clear: Clears this window" -msgstr "" - -#: src/gui/chat.cpp:794 -msgid "/help: Display this help" -msgstr "" - -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 -msgid "/where: Display map name" -msgstr "" - -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" -msgstr "" - -#: src/gui/chat.cpp:806 -msgid "/who: Display number of online users" -msgstr "" - -#: src/gui/chat.cpp:807 -msgid "For more information, type /help <command>" -msgstr "" - -#: src/gui/chat.cpp:811 -msgid "Command: /announce <msg>" -msgstr "" - -#: src/gui/chat.cpp:812 -msgid "*** only available to a GM ***" -msgstr "" - -#: src/gui/chat.cpp:813 -msgid "This command sends the message <msg> to all players currently online." -msgstr "" - -#: src/gui/chat.cpp:818 -msgid "Command: /clear" -msgstr "" - -#: src/gui/chat.cpp:819 -msgid "This command clears the chat log of previous chat." -msgstr "" - -#: src/gui/chat.cpp:824 -msgid "Command: /help" -msgstr "" - -#: src/gui/chat.cpp:825 -msgid "This command displays a list of all commands available." -msgstr "" - -#: src/gui/chat.cpp:827 -msgid "Command: /help <command>" -msgstr "" - -#: src/gui/chat.cpp:828 -msgid "This command displays help on <command>." -msgstr "" - -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 -msgid "Command: /where" -msgstr "" - -#: src/gui/chat.cpp:864 -msgid "This command displays the name of the current map." -msgstr "" - -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 -msgid "Command: /whisper <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:871 -msgid "Command: /w <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:872 -msgid "This command sends the message <msg> to <nick>." -msgstr "" - -#: src/gui/chat.cpp:874 -msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." -msgstr "" - -#: src/gui/chat.cpp:879 -msgid "Command: /who" -msgstr "" - -#: src/gui/chat.cpp:880 -msgid "This command displays the number of players currently online." -msgstr "" - -#: src/gui/chat.cpp:885 -msgid "Unknown command." -msgstr "" - -#: src/gui/chat.cpp:886 -msgid "Type /help for a list of commands." -msgstr "" - -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -msgid "Party" -msgstr "" - -#: src/gui/colour.cpp:38 -msgid "Server" -msgstr "" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 -msgid "Yes" -msgstr "" - -#: src/gui/confirm_dialog.cpp:41 -msgid "No" -msgstr "" - -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 -msgid "Connecting..." -msgstr "" - -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 -msgid "Equipment" -msgstr "" - -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 -msgid "Help" -msgstr "" - -#: src/gui/help.cpp:45 -msgid "Close" -msgstr "" - -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 -msgid "Inventory" -msgstr "" - -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "" - -#: src/gui/inventorywindow.cpp:72 -msgid "Drop" -msgstr "" - -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " -msgstr "" - -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " -msgstr "" - -#: src/gui/item_amount.cpp:76 -msgid "Select amount of items to trade." -msgstr "" - -#: src/gui/item_amount.cpp:80 -msgid "Select amount of items to drop." -msgstr "" - -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 -msgid "Login" -msgstr "" - -#: src/gui/login.cpp:52 src/gui/register.cpp:77 -msgid "Password:" -msgstr "" - -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 -msgid "Register" -msgstr "" - -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 -msgid "Status" -msgstr "" - -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 -msgid "Skills" -msgstr "" - -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 -msgid "Shortcut" -msgstr "" - -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 -msgid "Setup" -msgstr "" - -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 -msgid "MiniMap" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -msgid "Reset" -msgstr "" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 -msgid "NPC" -msgstr "" - -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, c-format -msgid "@@trade|Trade With %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:79 -#, c-format -msgid "@@attack|Attack %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "" - -#: src/gui/popupmenu.cpp:113 -msgid "@@talk|Talk To NPC@@" -msgstr "" - -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 -msgid "@@cancel|Cancel@@" -msgstr "" - -#: src/gui/popupmenu.cpp:135 -#, c-format -msgid "@@pickup|Pick Up %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:287 -msgid "@@use|Unequip@@" -msgstr "" - -#: src/gui/popupmenu.cpp:289 -msgid "@@use|Equip@@" -msgstr "" - -#: src/gui/popupmenu.cpp:292 -msgid "@@use|Use@@" -msgstr "" - -#: src/gui/popupmenu.cpp:294 -msgid "@@drop|Drop@@" -msgstr "" - -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -msgid "Recorder" -msgstr "" - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -msgid "Already recording." -msgstr "" - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -msgid "Recording..." -msgstr "" - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 -msgid "Confirm:" -msgstr "" - -#: src/gui/register.cpp:86 -msgid "Male" -msgstr "" - -#: src/gui/register.cpp:87 -msgid "Female" -msgstr "" - -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 -#, c-format -msgid "The username needs to be at least %d characters long." -msgstr "" - -#: src/gui/register.cpp:172 -#, c-format -msgid "The username needs to be less than %d characters long." -msgstr "" - -#: src/gui/register.cpp:180 -#, c-format -msgid "The password needs to be at least %d characters long." -msgstr "" - -#: src/gui/register.cpp:188 -#, c-format -msgid "The password needs to be less than %d characters long." -msgstr "" - -#: src/gui/register.cpp:195 -msgid "Passwords do not match." -msgstr "" - -#: src/gui/register.cpp:215 src/main.cpp:1056 -msgid "Error" -msgstr "" - -#: src/gui/setup_audio.cpp:41 -msgid "Sound" -msgstr "" - -#: src/gui/setup_audio.cpp:47 -msgid "Sfx volume" -msgstr "" - -#: src/gui/setup_audio.cpp:48 -msgid "Music volume" -msgstr "" - -#: src/gui/setup.cpp:57 -msgid "Apply" -msgstr "" - -#: src/gui/setup.cpp:57 -msgid "Reset Windows" -msgstr "" - -#: src/gui/setup.cpp:78 -msgid "Video" -msgstr "" - -#: src/gui/setup.cpp:82 -msgid "Audio" -msgstr "" - -#: src/gui/setup.cpp:86 -msgid "Joystick" -msgstr "" - -#: src/gui/setup.cpp:90 -msgid "Keyboard" -msgstr "" - -#: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 -msgid "Players" -msgstr "" - -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 -msgid "Press the button to start calibration" -msgstr "" - -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 -msgid "Calibrate" -msgstr "" - -#: src/gui/setup_joystick.cpp:40 -msgid "Enable joystick" -msgstr "" - -#: src/gui/setup_joystick.cpp:84 -msgid "Stop" -msgstr "" - -#: src/gui/setup_joystick.cpp:85 -msgid "Rotate the stick" -msgstr "" - -#: src/gui/setup_keyboard.cpp:86 -msgid "Assign" -msgstr "" - -#: src/gui/setup_keyboard.cpp:90 -msgid "Default" -msgstr "" - -#: src/gui/setup_keyboard.cpp:119 -msgid "Key Conflict(s) Detected." -msgstr "" - -#: src/gui/setup_keyboard.cpp:120 -msgid "Resolve them, or gameplay may result in strange behaviour." -msgstr "" - -#: src/gui/setup_players.cpp:56 -msgid "Name" -msgstr "" - -#: src/gui/setup_players.cpp:57 -msgid "Relation" -msgstr "" - -#: src/gui/setup_players.cpp:61 -msgid "Neutral" -msgstr "" - -#: src/gui/setup_players.cpp:62 -msgid "Friend" -msgstr "" - -#: src/gui/setup_players.cpp:63 -msgid "Disregarded" -msgstr "" - -#: src/gui/setup_players.cpp:64 -msgid "Ignored" -msgstr "" - -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 -msgid "Save player list" -msgstr "" - -#: src/gui/setup_players.cpp:224 -msgid "Allow trading" -msgstr "" - -#: src/gui/setup_players.cpp:226 -msgid "Allow whispers" -msgstr "" - -#: src/gui/setup_players.cpp:257 -msgid "When ignoring:" -msgstr "" - -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 -msgid "Full screen" -msgstr "" - -#: src/gui/setup_video.cpp:118 -msgid "OpenGL" -msgstr "" - -#: src/gui/setup_video.cpp:119 -msgid "Custom cursor" -msgstr "" - -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 -msgid "FPS Limit:" -msgstr "" - -#: src/gui/setup_video.cpp:145 -msgid "Gui opacity" -msgstr "" - -#: src/gui/setup_video.cpp:146 -msgid "Scroll radius" -msgstr "" - -#: src/gui/setup_video.cpp:147 -msgid "Scroll laziness" -msgstr "" - -#: src/gui/setup_video.cpp:148 -msgid "Ambient FX" -msgstr "" - -#: src/gui/setup_video.cpp:149 -msgid "Particle Detail" -msgstr "" - -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 -msgid "off" -msgstr "" - -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 -msgid "low" -msgstr "" - -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 -msgid "high" -msgstr "" - -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 -msgid "medium" -msgstr "" - -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 -msgid "max" -msgstr "" - -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 -msgid "Switching to full screen" -msgstr "" - -#: src/gui/setup_video.cpp:313 -msgid "Restart needed for changes to take effect." -msgstr "" - -#: src/gui/setup_video.cpp:325 -msgid "Changing OpenGL" -msgstr "" - -#: src/gui/setup_video.cpp:326 -msgid "Applying change to OpenGL requires restart." -msgstr "" - -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." -msgstr "" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." -msgstr "" - -#: src/gui/skill.cpp:41 -msgid "skills.xml" -msgstr "" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 -#, c-format -msgid "Skill points: %d" -msgstr "" - -#: src/gui/skill.cpp:143 -msgid "Up" -msgstr "" - -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -msgid "use" -msgstr "" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 -#, c-format -msgid "Job: %d" -msgstr "" - -#: src/gui/status.cpp:52 src/gui/status.cpp:171 -#, c-format -msgid "Money: %d GP" -msgstr "" - -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -msgid "Job:" -msgstr "" - -#: src/gui/status.cpp:71 -msgid "Stats" -msgstr "" - -#: src/gui/status.cpp:72 -msgid "Total" -msgstr "" - -#: src/gui/status.cpp:73 -msgid "Cost" -msgstr "" - -#: src/gui/status.cpp:77 -msgid "Attack:" -msgstr "" - -#: src/gui/status.cpp:78 -msgid "Defense:" -msgstr "" - -#: src/gui/status.cpp:79 -msgid "M.Attack:" -msgstr "" - -#: src/gui/status.cpp:80 -msgid "M.Defense:" -msgstr "" - -#: src/gui/status.cpp:81 -#, c-format -msgid "% Accuracy:" -msgstr "" - -#: src/gui/status.cpp:82 -#, c-format -msgid "% Evade:" -msgstr "" - -#: src/gui/status.cpp:83 -msgid "% Reflex:" -msgstr "" - -#: src/gui/status.cpp:211 -msgid "Strength" -msgstr "" - -#: src/gui/status.cpp:212 -msgid "Agility" -msgstr "" - -#: src/gui/status.cpp:213 -msgid "Vitality" -msgstr "" - -#: src/gui/status.cpp:214 -msgid "Intelligence" -msgstr "" - -#: src/gui/status.cpp:215 -msgid "Dexterity" -msgstr "" - -#: src/gui/status.cpp:216 -msgid "Luck" -msgstr "" - -#: src/gui/status.cpp:234 -#, c-format -msgid "Remaining Status Points: %d" -msgstr "" - -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 -#, c-format -msgid "You get %d GP." -msgstr "" - -#: src/gui/trade.cpp:81 -msgid "You give:" -msgstr "" - -#: src/gui/trade.cpp:250 -msgid "Failed adding item. You can not overlap one kind of item on the window." -msgstr "" - -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - -#: src/gui/updatewindow.cpp:93 -msgid "Updating..." -msgstr "" - -#: src/gui/updatewindow.cpp:115 -msgid "Play" -msgstr "" - -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 -msgid "Completed" -msgstr "" - -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 -msgid "Unnamed" -msgstr "" - -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -msgid "Are you sure you want to quit?" -msgstr "" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -msgid "Sit" -msgstr "" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, c-format -msgid "Item Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -msgid "Status Window" -msgstr "" - -#: src/keyboardconfig.cpp:73 -msgid "Inventory Window" -msgstr "" - -#: src/keyboardconfig.cpp:74 -msgid "Equipment WIndow" -msgstr "" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, c-format -msgid "Emote Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -msgid "Select OK" -msgstr "" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -msgid "Trying to connect to account server..." -msgstr "" - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -msgid "Trying to connect to char server..." -msgstr "" - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -msgid "Trying to connect to map server..." -msgstr "" - -#: src/main.cpp:700 -#, c-format -msgid "Map: %s" -msgstr "" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 -msgid "Got disconnected from server!" -msgstr "" - -#: src/main.cpp:1068 -msgid "Connecting to map server..." -msgstr "" - -#: src/main.cpp:1076 -msgid "Connecting to character server..." -msgstr "" - -#: src/main.cpp:1084 -msgid "Connecting to account server..." -msgstr "" - -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -msgid "Invite to party" -msgstr "" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -msgid " /create" -msgstr "" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-07-16 18:28+0000\n" "Last-Translator: صقر بن عبدالله <Unknown>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -17,608 +17,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "شراء" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "السعر: %d GP / الإجمالي: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "مغادرة" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "الوصÙ: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "التأثير: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "إيقاÙ" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "بيع" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "إلغاء" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "هل أنت متأكّد من Øذ٠هذه الشخصيّة؟" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "إنتقاء الشخصيّة" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "مواÙÙ‚" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "جديد" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "ØØ°Ù" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "السّابق" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "التّالي" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "الاسم: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "المستوى: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "المستوى: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "النقود: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "جديد" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "ØØ°Ù" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "السّابق" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "التّالي" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "مواÙÙ‚" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "إنشاء شخصيّة" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "الاسم:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "لون الشعر:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "قصّة الشعر:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "إنشاء" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "إنتقاء الشخصيّة" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "إنشاء" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "الخادوم:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "تغيير OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "مرتÙع" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "المنÙØ°:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "الخادوم:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "نعم" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "لا" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "جار٠الاتّصال..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "استخدام" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "العتاد" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "تجريد من العتاد" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "الجردة" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "استعمال العتاد" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "استخدام" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "إسقاط" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "تجريد من العتاد" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "استعمال العتاد" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "انتقاء كمّيّة من المواد للمتاجرة بها." @@ -627,245 +437,148 @@ msgstr "انتقاء كمّيّة من المواد للمتاجرة بها." msgid "Select amount of items to drop." msgstr "انتقاء كمّيّة من المواد لإسقاطها." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "ولوج" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "كلمة السرّ:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "المنÙØ°:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "ترك" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "تسجيل" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "الØالة" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "مهارات" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "اختصار" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "تثبيت" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "خارطة صغيرة" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "تسجيل" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@تجارة|متاجرة مع %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@مهاجمة|هاجم %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "الجردة" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@Ù…Øادثة|تØدّث مع NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@إلغاء|إلغاء@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@اقتطاÙ|اقتطا٠%s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@استخدام|استخدام العتاد@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@استخدام|استخدام العتاد@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@استخدم|استخدم@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@إسقاط|إسقاط@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "جار٠الاتّصال..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "جار٠الاتّصال..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "جار٠الاتّصال..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@الوصÙ|الوصÙ@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "تأكيد:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d Ù…ØارÙ." -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "يجب أن يكون طول اسم المستخدم أقل من %d Ù…ØارÙ." -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d Ù…ØارÙ." -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "يجب أن يكون طول كلمة السرّ أقل من %d Ù…ØارÙ." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "كلمات السرّ غير متطابقة." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "خطأ" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "صوت" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Øجم صوت المؤثرّات" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Øجم صوت الموسيقا" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "تطبيق" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "تصÙير النواÙØ°" @@ -886,393 +599,274 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "إضغط على الزرّ لبدأ المعايرة" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "معايرة" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "تÙعيل عصا الألعاب" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "إيقاÙ" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "تدوير العصا" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "ØØ°Ù" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "الاسم:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "ملء الشاشة" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "مؤشّر مخصّص" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Øدّ FPS:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "عتمة واجهة المستخدم" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "نص٠قطر اللÙÙ‘" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "كسل اللÙÙ‘" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "مؤثّرات Ù…Øيطة" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "واقÙ" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "منخÙض" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "مرتÙع" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "ملء الشاشة" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "جار٠ملء الشاشة" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "يجب إعادة التشغيل لتÙعّل التغييرات." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "تغيير OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "تطبيق التغيير على OpenGL ÙŠØتاج لإعادة تشغيل." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "يجب إعادة التشغيل لتÙعّل التغييرات." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "يجب إعادة التشغيل لتÙعّل التغييرات." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "مهارات" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "استخدام" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "المستوى: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "النقود: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "المستوى: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "الØالة" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "مهاجمة %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "دÙاع %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "مهاجمة %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "دÙاع %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "القوّة:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Ø®Ùّة الØركة:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "نشاط:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "ذكاء:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "المهارة:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "إضاÙØ©" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "أنت تØصل على %d GP." @@ -1281,933 +875,43 @@ msgstr "أنت تØصل على %d GP." msgid "You give:" msgstr "أنت تقدّم:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "إلغاء" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "هل أنت متأكّد من Øذ٠هذه الشخصيّة؟" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "مهاجمة %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "مهاجمة %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "تصÙير النواÙØ°" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "قسم" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "اختصار" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "تصÙير النواÙØ°" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "الØالة" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "الجردة" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "العتاد" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "تصÙير النواÙØ°" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "تصÙير النواÙØ°" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "تصÙير النواÙØ°" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "تصÙير النواÙØ°" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "اختصار" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "إنتقاء الشخصيّة" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "جار٠الاتّصال..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "جار٠الاتّصال..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "جار٠الاتّصال..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "الاسم: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "جار٠الاتّصال..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "الجردة" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "إنشاء" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "خارطة صغيرة" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@الوصÙ|الوصÙ@@" - #~ msgid "Unregister" #~ msgstr "إلغاء التسجيل" @@ -2226,6 +930,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "رجاء ØØ°Ù %d نقطة" +#~ msgid "Split" +#~ msgstr "قسم" + #~ msgid "Select amount of items to split." #~ msgstr "انتقاء كمّيّة من المواد لقسمها." @@ -2244,6 +951,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "اختار خادومك لـMana World" +#~ msgid "Port:" +#~ msgstr "المنÙØ°:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "رجاء طباعة عنوان ومنÙØ° الخادوم." @@ -2270,3 +980,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "الوزن الإجماليّ: %d - وزن الØدّ الأقصى: %d" + +#~ msgid "Keep" +#~ msgstr "ترك" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,600 +17,414 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "preu %d GP / total %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "sortir" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 -#, c-format -msgid "Name: %s" -msgstr "" +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "ok" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 -#, c-format -msgid "Level: %d" +#: src/gui/char_select.cpp:86 +msgid "New" msgstr "" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 -#, c-format -msgid "Job Level: %d" +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" msgstr "" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 -#, c-format -msgid "Money: %d" +#: src/gui/char_select.cpp:88 +msgid "Previous" msgstr "" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" +#: src/gui/char_select.cpp:89 +msgid "Next" msgstr "" -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 +#, c-format +msgid "Name: %s" msgstr "" -#: src/gui/char_select.cpp:99 -msgid "Previous" +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 +#, c-format +msgid "Level: %d" msgstr "" -#: src/gui/char_select.cpp:100 -msgid "Next" +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 +#, c-format +msgid "Job Level: %d" msgstr "" -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "ok" +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 +#, c-format +msgid "Money: %d" +msgstr "" -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "nom" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "canvi" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -msgid "Party" -msgstr "" - -#: src/gui/colour.cpp:38 -msgid "Server" -msgstr "" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "si" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "no" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "" -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" msgstr "" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" msgstr "" #: src/gui/item_amount.cpp:76 @@ -621,240 +435,147 @@ msgstr "" msgid "Select amount of items to drop." msgstr "" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -msgid "Reset" -msgstr "" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, c-format msgid "@@trade|Trade With %s@@" msgstr "" -#: src/gui/popupmenu.cpp:79 +#: src/gui/popupmenu.cpp:83 #, c-format msgid "@@attack|Attack %s@@" msgstr "" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" msgstr "" -#: src/gui/recorder.cpp:37 -msgid "Recorder" -msgstr "" - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -msgid "Already recording." -msgstr "" - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -msgid "Recording..." -msgstr "" - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "" -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -875,376 +596,263 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 msgid "Default" msgstr "" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "nom" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." -msgstr "" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/skill.cpp:41 -msgid "skills.xml" -msgstr "" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -msgid "use" -msgstr "" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -msgid "Job:" -msgstr "" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 msgid "Strength" msgstr "" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 msgid "Intelligence" msgstr "" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" +#: src/gui/trade.cpp:61 +msgid "Add" msgstr "" -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 +#: src/gui/trade.cpp:64 msgid "Trade" msgstr "" -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "" @@ -1253,901 +861,41 @@ msgstr "" msgid "You give:" msgstr "" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -msgid "Are you sure you want to quit?" -msgstr "" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -msgid "Sit" -msgstr "" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, c-format -msgid "Item Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -msgid "Status Window" -msgstr "" - -#: src/keyboardconfig.cpp:73 -msgid "Inventory Window" -msgstr "" - -#: src/keyboardconfig.cpp:74 -msgid "Equipment WIndow" -msgstr "" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, c-format -msgid "Emote Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -msgid "Select OK" -msgstr "" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -msgid "Trying to connect to account server..." -msgstr "" - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -msgid "Trying to connect to char server..." -msgstr "" - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -msgid "Trying to connect to map server..." -msgstr "" - -#: src/main.cpp:700 -#, c-format -msgid "Map: %s" -msgstr "" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "" -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -msgid "Invite to party" -msgstr "" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -msgid " /create" -msgstr "" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" +#~ msgid "Change" +#~ msgstr "canvi" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,606 +17,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Nákup" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Popis: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Prodej" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "ZruÅ¡it" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "PotvrÄte vymazánà postavy" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Jste si jistÃ, že chcete vymazat tuto postavu?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 #, fuzzy msgid "Select Character" msgstr "VytvoÅ™it postavu" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Nová" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Odstranit" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "PÅ™edchozÃ" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "DalÅ¡Ã" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Jméno: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Úroveň: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Úroveň: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "PenÃze: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Nová" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Odstranit" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "PÅ™edchozÃ" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "DalÅ¡Ã" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "VytvoÅ™it postavu" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Jméno:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Barva vlasů:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Styl vlasů:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "VytvoÅ™it" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Server:" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "VytvoÅ™it" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Port:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Ano" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Ne" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "PÅ™ipojuji se..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "VybavenÃ" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventář" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Vybavit" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Upustit" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" msgstr "" +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Vybavit" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Vyberte množstvà zbožÃ, se kterým budete obchodovat." @@ -625,244 +437,147 @@ msgstr "Vyberte množstvà zbožÃ, se kterým budete obchodovat." msgid "Select amount of items to drop." msgstr "Vyberte množstvà zbožÃ, které chcete upustit." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Heslo:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port:" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Zapamatovat uživatelské jméno" -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registrace" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Stav" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Dovednosti" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Zkratka" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "NastavenÃ" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "MiniMapa" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registrace" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, c-format msgid "@@trade|Trade With %s@@" msgstr "" -#: src/gui/popupmenu.cpp:79 +#: src/gui/popupmenu.cpp:83 #, c-format msgid "@@attack|Attack %s@@" msgstr "" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventář" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" msgstr "" -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "PÅ™ipojuji se..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "PÅ™ipojuji se..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "PÅ™ipojuji se..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Muž" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Žena" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Heslo musà být kratÅ¡Ã než %d znaků." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Hesla se neshodujÃ." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Chyba" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Zvuk" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -883,388 +598,273 @@ msgid "Keyboard" msgstr "Klávesnice" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Kalibrovat" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Odstranit" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Jméno:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." -msgstr "" - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Dovednosti" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -msgid "use" -msgstr "" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Úroveň: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "PenÃze: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Úroveň: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Stav" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Útok %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Obrana %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Útok %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Obrana %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "SÃla:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Vitalita:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitalita:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Inteligence:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" +#: src/gui/trade.cpp:61 +msgid "Add" msgstr "" -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 +#: src/gui/trade.cpp:64 msgid "Trade" msgstr "" -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "" @@ -1273,927 +873,43 @@ msgstr "" msgid "You give:" msgstr "" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Jste si jistÃ, že chcete vymazat tuto postavu?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Útok %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Útok %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "RozdÄ›lit" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Zkratka" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Stav" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventář" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "VybavenÃ" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Zkratka" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Server:" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "PÅ™ipojuji se..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "PÅ™ipojuji se..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "PÅ™ipojuji se..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Jméno: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "PÅ™ipojuji se..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventář" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "VytvoÅ™it" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "MiniMapa" - -#~ msgid "Remember Username" -#~ msgstr "Zapamatovat uživatelské jméno" - #~ msgid "Account and Character Management" #~ msgstr "Správa úÄtu a postavy" @@ -2215,6 +931,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Odstraňte prosÃm %d bodů." +#~ msgid "Split" +#~ msgstr "RozdÄ›lit" + #~ msgid "Guilds" #~ msgstr "Gildy" @@ -2224,6 +943,9 @@ msgstr "" #~ msgid "Email:" #~ msgstr "E-mail:" +#~ msgid "Port:" +#~ msgstr "Port:" + #~ msgid "Propose trade" #~ msgstr "NabÃdnout obchod" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-12-28 14:45+0000\n" "Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n" "Language-Team: Danish <none@none.none>\n" @@ -17,628 +17,421 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Køb" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Pris: %d GP / Total: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Afslut" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Beskrivelse: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effekt: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Butik" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Sælg" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Fortryd" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Bekræft sletning af karakter" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Er du sikker pÃ¥ at du vil slette denne karakter?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Vælg Karakter" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Opret" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Slet" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Forrige" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Næste" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Navn: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Niveau: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Niveau: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Penge: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Opret" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Slet" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Forrige" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Næste" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "Guld: %d" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Lav Bruger" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Navn:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "HÃ¥rfarve:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Frisure:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Opret" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Vælg Server" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "OK" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Chat" - -#: src/gui/chat.cpp:146 +#: src/gui/chat.cpp:115 #, fuzzy -msgid "Global announcement: " +msgid "Global announcement:" msgstr "Global meddelelse: " -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, fuzzy, c-format -msgid "Global announcement from %s: " -msgstr "Global meddelelse fra %s: " +msgid "Global announcement from %s:" +msgstr "Global meddelelse fra " -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 -#, c-format -msgid "Whispering to %s: %s" -msgstr "Hvisker til %s: %s" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "Prøver at sende en blank gruppe besked." - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "Ukendt genstand" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "Retur bringer focus pÃ¥ chatten." - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "Besked lukker chat." - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "Enter bringer nu focus pÃ¥ chatten." - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "Besked lukker nu chat." - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" -"Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0" -"\"." - -#: src/gui/chat.cpp:510 -#, fuzzy -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "Ukendt gruppe kommando... Skriv \"/help party\" for mere information." - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "Trylleformularen findes ikke!" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "Til stede: " +#: src/gui/chat.cpp:139 +#, fuzzy, c-format +msgid "%s whispers:" +msgstr "Tillad hviskere" -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." -msgstr "Fremmøde skrives til loggen" +#: src/gui/chat.cpp:276 +#, fuzzy, c-format +msgid "Whispering to %s: %s" +msgstr "Hvisker til " -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "Ukendt kommando" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "Handel fejlede!" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "Emote fejlede!" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "Sæt dig fejlede!" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "Chat skabelsen fejlede!" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "Kunne ikke tilslutte sig gruppen!" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "Kan ikke rÃ¥be!" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "Du er ikke nÃ¥et til det rette Niveau endnu!" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "Utilstrækkelig HP!" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "Utilstrækkelig SP!" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "Du har ingen memorandaer!" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "Det kan du ikke gøre lige nu!" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "Det ser ud til at du har behov for flere Zeny... ;-)" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "Du kan ikke bruge denne færdighed med dette slags vÃ¥ben!" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "Du har behov for en rød krystal mere" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "Du har behov for en blÃ¥ krystal mere" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "Du har for meget pÃ¥ dig, til at kunne gøre dette" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "Hmm? Hvad er det?" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "Warp mislykkede..." -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "Kunne ikke stjæle noget som helst..." -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "Giften havde ingen effekt..." -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "Det nuværende gruppe præfiks er " - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "Gruppens præfiks skal være et bogstav langt. " - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "Kan ikke bruge '/' som præfikset" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Ændre præfikset til " - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "--Hjælp--" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "/announce: Global meddelelse (Kun for GM)" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "/clear: Rydder dette vindue" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "/help: Viser denne hjælp" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "/msg <navn> <besked>: Alternativ form for /whisper" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "/present: FÃ¥r listen af tilstedeværende brugere" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "/toggle: Bestemmer om <retur> bringer focus pÃ¥ chat loggen." - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "/where: Viser bane navnet" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" -msgstr "/w <navn> <besked>: Kort form for /whisper" - -#: src/gui/chat.cpp:804 +#: src/gui/chat.cpp:496 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" "/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" +msgstr "/w <navn> <besked>: Kort form for /whisper" + +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "/who: Viser antalet af online brugere" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "For at fÃ¥ mere information, skriv /help <kommando>" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "Kommando: /announce <besked>" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "*** kun tilgængelig for en GM ***" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "Denne kommando sender beskeden <besked> til alle brugere online." -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "Kommando: /clear" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "Denne commando rydder chat loggen" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "Kommando: /help" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "Kommando: /help <kommando>" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "Denne kommando viser hjælp for <kommando>" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "Kommando: /present" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" -"Denne kommando finder en liste over brugere, der er inden for en " -"lytteradius, og sender listen til enten record loggen, hvis du optager, " -"ellers er det chat loggen." - -#: src/gui/chat.cpp:843 -#, fuzzy -msgid "Command: /record <filename>" -msgstr "Kommando: /clear" - -#: src/gui/chat.cpp:844 -#, fuzzy -msgid "This command starts recording the chat log to the file <filename>." -msgstr "Denne commando rydder chat loggen" - -#: src/gui/chat.cpp:846 -#, fuzzy -msgid "Command: /record" -msgstr "Kommando: /clear" - -#: src/gui/chat.cpp:847 -#, fuzzy -msgid "This command finishes a recording session." -msgstr "Denne kommando viser hjælp for <kommando>" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "Kommando /toggle <tilstand>" - -#: src/gui/chat.cpp:852 -#, fuzzy -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" -"Denne kommando bestemmer om retur, skal bruges til at fokusere pÃ¥ chat " -"loggen, ellerom chat om chat loggen, automatisk skal slÃ¥ fra." - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" -"<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slÃ¥ fokusering " -"af chat vindue til, eller \"0\", \"no\", \"false\" for at slÃ¥ fokusering af " -"chat vindue fra." - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "Kommando: /toggle" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "Denne kommando viser fokusering af chat vinduets status." - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "kommando: /where" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "Denne kommando viser det nuværende bane navn." -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "Kommando: /msg <navn> <besked>" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "Kommando: /whisper <navn> <besked>" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "Kommando: /w <navn> <besked>" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "Denne kommando sender beskeden <besked> til <navn>." -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "Hvis navnet har mellemrum i det, skal det omringes med følgende (\")." -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "Kommando: /who" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" "Denne kommando viser det antal af online brugere, der nuværende er online." -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "Ukendt kommando" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "Skriv /help for at fÃ¥ en liste med kommandoer" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "GM" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "høj" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "Bruger" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "Hvisk" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "Er" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Gruppe" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "Logger" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "Hyperlink" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Ja" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Nej" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Opretter forbindelse..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "Kan ikke loade valgte-billede.png" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "Emote" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Brug" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Udstyr" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Tag af" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "Hjælp" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "Luk" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventarliste" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Tag pÃ¥" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Brug" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Smid" -#: src/gui/inventorywindow.cpp:84 -#, fuzzy -msgid "Slots: " -msgstr " g Pladser: " +#: src/gui/inventorywindow.cpp:99 +#, fuzzy, c-format +msgid "Weight: %d / %d" +msgstr "Vægt: " -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Tag af" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Tag pÃ¥" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Vælg hvor mange genstande du vil bytte." @@ -647,246 +440,148 @@ msgstr "Vælg hvor mange genstande du vil bytte." msgid "Select amount of items to drop." msgstr "Vælg hvor mange genstande du vil smide." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Log Ind" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Adgangskode:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port:" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "Nuværende:" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Husk Brugernavn" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Behold" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registrer" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Status" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Færdigheder" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Genvej" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Opsætning" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "MiniKort" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Nuværende:" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, fuzzy, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Byt Med " -#: src/gui/popupmenu.cpp:79 +#: src/gui/popupmenu.cpp:83 #, fuzzy, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Angrib " -#: src/gui/popupmenu.cpp:85 -#, fuzzy, c-format -msgid "@@friend|Befriend %s@@" -msgstr "@@friend|Bliv ven med " - -#: src/gui/popupmenu.cpp:88 -#, fuzzy, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "@@disregard|Se bort fra " - -#: src/gui/popupmenu.cpp:89 -#, fuzzy, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "@@ignore|Bloker " - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, fuzzy, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "@@unignore|Fjern blokering " - -#: src/gui/popupmenu.cpp:94 -#, fuzzy, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "@@ignore|Bloker fuldstændig " - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "@@party-invite|Inviter " - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Snak Til NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Annuller@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Saml Op %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Tag af@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Tag pÃ¥@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Brug@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Smid@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Opretter forbindelse..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Opretter forbindelse..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -#, fuzzy -msgid "Failed to start recording." -msgstr "Fejlede i at skifte til " - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Opretter forbindelse..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Beskrivelse@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Bekræft:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Mand" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Kvinde" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "RegisterDialog::register Brugernavn er %s" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Adgangskoden skal være mindre end %d bogstaver langt." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "De indtastede adgangskoder stemmer ikke overens." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Fejl" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Lyd" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Lydstyrke pÃ¥ effekter" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Lydstyrke pÃ¥ musik" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Anvend" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Nulstil Vinduer" @@ -907,395 +602,274 @@ msgid "Keyboard" msgstr "Tastatur" #: src/gui/setup.cpp:94 -#, fuzzy -msgid "Colors" -msgstr "Farver:" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "Brugere" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -#, fuzzy -msgid "Green: " -msgstr "Til stede: " - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Tryk pÃ¥ knappen for at starte justeringen." -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Justering" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Aktiver joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Stop" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Rotere joysticket" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "Tildel" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Standart" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "Tast Konfikt(er) Opdaget." -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt." -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Navn:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "Relation" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "Neutral" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "Ven" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "Se bort fra" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "Ignorer" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "???" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "Gem bruger liste" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "Tillad handel" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "Tillad hviskere" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "NÃ¥r ignorer:" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "Ingen opsætning tilgængelig" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "Alle opløsninger er tilgængelige" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Fuld Skærm" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Brugerdefineret Musepil" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "Partikel effekter" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "Snakke bobler" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "Vis navn" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "FPS grænse:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Gennemsigtighed" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Følsomhed pÃ¥ mus" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Acceleration pÃ¥ mus" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Omgivende FX" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "Partikel Detalje" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "fra" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "lav" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "høj" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "mellem" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "maks" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "Fejlede i at skifte til " - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "vinduet" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Fuld Skærm" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "opsætning og genoprettelse af gammel opsætning fejlede ogsÃ¥!" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Skifter til fuld skærm" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Ændringerne kræver at du genstarter klienten." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Skrifter til OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Ændringerne til OpenGL kræver at du genstarter klienten." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "Skærm opløsning ændret" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Ændringerne kræver at du genstarter klienten." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "Partikel effekt opsætningen er ændret" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane." - -#: src/gui/skill.cpp:41 -msgid "skills.xml" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "Færdigheds points: %d" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "Op" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "inc" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Brug" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "Fejl under loading af færdigheds fil: %s" - -#: src/gui/speechbubble.cpp:35 -#, fuzzy -msgid "Speech" -msgstr "Snakke" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Karriere: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Penge: %d GP" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Karriere: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Status" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "Total" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "Pris" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Angrib:" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Forsvar:" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "M.Angrib:" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "M.Forsvar:" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, fuzzy, c-format msgid "% Accuracy:" msgstr "% Nøjagtighed:" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, fuzzy, c-format msgid "% Evade:" msgstr "% Undvig:" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "% Refleks:" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Styrke" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Adræthed" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Helbred" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Intelligens" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Behændighed" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "Held" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "Tilgode Status Points: %d" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "Handel: Dig" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "Handel" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Tilføj" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "Handel" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Du fÃ¥r %d GP." @@ -1304,985 +878,699 @@ msgstr "Du fÃ¥r %d GP." msgid "You give:" msgstr "Du giver:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand pÃ¥ " "vinduet." -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "Kunne ikke loade tekst fil: %s" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "Updatere..." -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "Spil" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "Kunne ikke loade nyhederne" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "curl fejl " - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr " host: " - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "Checksum for fil %s fejlede: (%lx/%lx)" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "Kunne ikke skabe mThread" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "##1 Opdateringsprocessen er ikke færdiggjort" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "##1 Det er varmt anbefalet at" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "##1 du prøver igen senere" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "%s allerede her" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "Udført" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "Besked" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" -"Du bære pÃ¥ mere en halvdelen af din vægt. Du kan derfor ikke genvinde liv." +#: src/resources/itemdb.cpp:99 +msgid "Unnamed" +msgstr "Unavngivet" -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "Du er død." +#: src/main.cpp:769 +msgid "Got disconnected from server!" +msgstr "Blev smidt af serveren!" -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" -"Vi er ked af at mÃ¥tte informere dig, om at din karakter var dræbt i kamp." +#: src/main.cpp:956 +#, fuzzy +msgid "Connecting to map server..." +msgstr "Opretter forbindelse til bane serveren..." -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "Du er ikke sÃ¥ levende som du engang har været." +#: src/main.cpp:964 +msgid "Connecting to character server..." +msgstr "Opretter forbindelse til karakter serveren..." -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "De kolder hænder der tilhøre Grim Reaper, griber ud efter din sjæl" +#: src/main.cpp:972 +msgid "Connecting to account server..." +msgstr "Opretter forbindelse til bruger serveren..." -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "Game Over!" +#, fuzzy +#~ msgid "Chat" +#~ msgstr "Chat" -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "Indsæt en mønt for at fortsætte" +#~ msgid "Welcome" +#~ msgstr "Velkommen" -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" -"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre " -"sted." +#~ msgid "Trying to send a blank party message." +#~ msgstr "Prøver at sende en blank gruppe besked." -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "Din plan om at smadre fjendens vÃ¥ben, ved at benytte din hals fejlede." +#~ msgid "Return toggles chat." +#~ msgstr "Retur bringer focus pÃ¥ chatten." -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "Jeg gÃ¥r ud fra at dette ikke gik alt for godt." +#~ msgid "Message closes chat." +#~ msgstr "Besked lukker chat." -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "Du vil gerne have dine ejendele identificeret?" +#~ msgid "Return now toggles chat." +#~ msgstr "Enter bringer nu focus pÃ¥ chatten." -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "Desværre, blev der aldrig fundet noget spor efter dig..." +#~ msgid "Message now closes chat." +#~ msgstr "Besked lukker nu chat." -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "Udslettet." +#~ msgid "" +#~ "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." +#~ msgstr "" +#~ "Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", " +#~ "\"0\"." -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "Det ser ud til at du fik du hoved udleveret til dig." +#~ msgid "" +#~ "Unknown party command... Type \"/help party\" party for more information." +#~ msgstr "" +#~ "Ukendt gruppe kommando... Skriv \"/help party\" for mere information." -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny." +#~ msgid "No such spell!" +#~ msgstr "Trylleformularen findes ikke!" -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "Du er ikke død endnu. Du hviler dig bare." +#~ msgid "The current server doesn't support spells" +#~ msgstr "Den nuværende server understøtter ikke trylleformulare" -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "Du er ikke mere." +#~ msgid "Present: " +#~ msgstr "Til stede: " -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "Du er holdt op med at være til." +#~ msgid "Attendance written to record log." +#~ msgstr "Fremmøde skrives til loggen" -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "Du er udløbet og er gÃ¥et hen for at møde din skaber." +#~ msgid "The current party prefix is " +#~ msgstr "Det nuværende gruppe præfiks er " -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "Du er en hÃ¥rd nød at knække, men desværre død." +#~ msgid "Party prefix must be one character long." +#~ msgstr "Gruppens præfiks skal være et bogstav langt. " -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af." +#~ msgid "Cannot use a '/' as the prefix." +#~ msgstr "Kan ikke bruge '/' som præfikset" -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" -"Hvis det ikke var fordi du var sÃ¥ animeret, kunne du sikker imponere Chuck " -"Norris." +#, fuzzy +#~ msgid "Changing prefix to " +#~ msgstr "Ændre præfikset til " -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "Din tid er ovre." +#~ msgid "/msg <nick> <message>: Alternate form for /whisper" +#~ msgstr "/msg <navn> <besked>: Alternativ form for /whisper" -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "Drik noget syre." +#~ msgid "/present: Get list of players present" +#~ msgstr "/present: FÃ¥r listen af tilstedeværende brugere" -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "Du har stillet træskoene." +#~ msgid "/toggle: Determine whether <return> toggles the chat log." +#~ msgstr "/toggle: Bestemmer om <retur> bringer focus pÃ¥ chat loggen." -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "Du har spist af dødens pølse for den sidste gang." +#~ msgid "Command: /present" +#~ msgstr "Kommando: /present" -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "Du er en forhenværende spiller." +#~ msgid "" +#~ "This command gets a list of players within hearing and sends it to either " +#~ "the record log if recording, or the chat log otherwise." +#~ msgstr "" +#~ "Denne kommando finder en liste over brugere, der er inden for en " +#~ "lytteradius, og sender listen til enten record loggen, hvis du optager, " +#~ "ellers er det chat loggen." -#: src/net/playerhandler.cpp:244 -msgid "You're pining for the fjords." -msgstr "Du er tabt bag en vogn." +#~ msgid "Command: /toggle <state>" +#~ msgstr "Kommando /toggle <tilstand>" -#: src/net/playerhandler.cpp:267 -msgid "You picked up " -msgstr "Du samlede op " +#~ msgid "" +#~ "This command sets whether the return key should toggle the chat log, or " +#~ "whether the chat log turns off automatically." +#~ msgstr "" +#~ "Denne kommando bestemmer om retur, skal bruges til at fokusere pÃ¥ chat " +#~ "loggen, ellerom chat om chat loggen, automatisk skal slÃ¥ fra." -#: src/net/playerhandler.cpp:390 -msgid "Equip arrows first" -msgstr "Tag først pile pÃ¥" +#~ msgid "" +#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or " +#~ "\"0\", \"no\", \"false\" to turn the toggle off." +#~ msgstr "" +#~ "<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slÃ¥ " +#~ "fokusering af chat vindue til, eller \"0\", \"no\", \"false\" for at slÃ¥ " +#~ "fokusering af chat vindue fra." -#: src/net/playerhandler.cpp:394 -#, c-format -msgid "0x013b: Unhandled message %i" -msgstr "0x013b: Unbehandlet besked %i" +#~ msgid "Command: /toggle" +#~ msgstr "Kommando: /toggle" -#: src/net/tradehandler.cpp:91 -msgid "Request for trade" -msgstr "Ansøg om lov til at handle" +#~ msgid "This command displays the return toggle status." +#~ msgstr "Denne kommando viser fokusering af chat vinduets status." -#: src/net/tradehandler.cpp:93 -msgid " wants to trade with you, do you accept?" -msgstr " vil gerne handle med dig, vil du acceptere?" +#~ msgid "Command: /msg <nick> <msg>" +#~ msgstr "Kommando: /msg <navn> <besked>" -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "Du kan ikke handle. Handle partneren er for langt væk." +#~ msgid "GM" +#~ msgstr "GM" -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "Du kan ikke handle. Karakteren findes ikke." +#~ msgid "Player" +#~ msgstr "Bruger" -#: src/net/tradehandler.cpp:115 -msgid "Trade cancelled due to an unknown reason." -msgstr "Handlen blev annulleret af en ukendt grund." +#~ msgid "Whisper" +#~ msgstr "Hvisk" -#: src/net/tradehandler.cpp:121 -msgid "Trade: You and " -msgstr "Handel: Dig og " +#~ msgid "Is" +#~ msgstr "Er" -#: src/net/tradehandler.cpp:127 #, fuzzy -msgid "Trade with " -msgstr "Handel med " +#~ msgid "Party" +#~ msgstr "Gruppe" -#: src/net/tradehandler.cpp:128 #, fuzzy -msgid " cancelled" -msgstr " afbrudt" +#~ msgid "Server" +#~ msgstr "Server" -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "Ubehandlet handel annullerede pakken" +#~ msgid "Logger" +#~ msgstr "Logger" -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "Fejlede i at tilføje genstand. Handels partneren bære pÃ¥ for meget." +#~ msgid "Hyperlink" +#~ msgstr "Hyperlink" -#: src/net/tradehandler.cpp:190 -msgid "Failed adding item. Trade partner has no free slot." -msgstr "" -"Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser." +#~ msgid "Unable to load selection.png" +#~ msgstr "Kan ikke loade valgte-billede.png" -#: src/net/tradehandler.cpp:194 -msgid "Failed adding item for unknown reason." -msgstr "Fejlede i at tilføje genstand af en ukendt grund." +#~ msgid "Emote" +#~ msgstr "Emote" -#: src/net/tradehandler.cpp:207 -msgid "Trade canceled." -msgstr "Handel annulleret." +#~ msgid " g Slots: " +#~ msgstr " g Pladser: " -#: src/net/tradehandler.cpp:214 -msgid "Trade completed." -msgstr "Handel er komplet." +#~ msgid " g Slots: " +#~ msgstr " g Pladser: " -#: src/resources/colordb.cpp:56 -#, c-format -msgid "Trying TMW's color file, %s." -msgstr "Prøver TMW's farve fil, %s." +#~ msgid "Port:" +#~ msgstr "Port:" -#: src/resources/colordb.cpp:66 -msgid "ColorDB: Failed" -msgstr "ColorDB: Fejlede" +#~ msgid "Recent:" +#~ msgstr "Nuværende:" -#: src/resources/colordb.cpp:83 -#, fuzzy, c-format -msgid "ColorDB: Redefinition of dye ID %d" -msgstr "ColorDB: Ny definition af genstand ID %d" +#~ msgid "Keep" +#~ msgstr "Behold" -#: src/resources/colordb.cpp:98 -msgid "Unloading color database..." -msgstr "Udlæser farve database..." +#, fuzzy +#~ msgid "Map" +#~ msgstr "MiniKort" -#: src/resources/colordb.cpp:113 -#, c-format -msgid "ColorDB: Error, unknown dye ID# %d" -msgstr "ColorDB: Fejl, ukendt dye ID# %d" +#~ msgid "@@friend|Befriend " +#~ msgstr "@@friend|Bliv ven med " -#: src/resources/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "startede emote database..." +#~ msgid "@@disregard|Disregard " +#~ msgstr "@@disregard|Se bort fra " -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "Emote Database: Fejl under læsning af emotes.xml!" +#~ msgid "@@ignore|Ignore " +#~ msgstr "@@ignore|Bloker " -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "Emote Database: Emote med manglende ID i emotes.xml!" +#~ msgid "@@unignore|Un-Ignore " +#~ msgstr "@@unignore|Fjern blokering " -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "EmoteDB: Warning, unknown emote ID %d requested" +#~ msgid "@@ignore|Completely ignore " +#~ msgstr "@@ignore|Bloker fuldstændig " -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "Startede genstans database..." +#~ msgid "@@party-invite|Invite " +#~ msgstr "@@party-invite|Inviter " -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" +#~ msgid "RegisterDialog::register Username is %s" +#~ msgstr "RegisterDialog::register Brugernavn er %s" -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "ItemDB: Fejl under læsningen af items.xml!" +#, fuzzy +#~ msgid "Colors" +#~ msgstr "Farver:" -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "ItemDB: Ugyldig eller manglende genstand ID i items.xml!" +#, fuzzy +#~ msgid "Color:" +#~ msgstr "Farve:" -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "ItemDB: Ny definition af genstand ID %d" +#~ msgid "???" +#~ msgstr "???" -#: src/resources/itemdb.cpp:102 -msgid "Unnamed" -msgstr "Unavngivet" +#~ msgid "No modes available" +#~ msgstr "Ingen opsætning tilgængelig" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" +#~ msgid "All resolutions available" +#~ msgstr "Alle opløsninger er tilgængelige" -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "Udlæser genstands databasen..." +#~ msgid "Particle effects" +#~ msgstr "Partikel effekter" -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "ItemDB: Fejl, ukendt genstand ID# %d" +#~ msgid "Speech bubbles" +#~ msgstr "Snakke bobler" -#: src/resources/itemdb.cpp:240 -#, c-format -msgid "ItemDB: Ignoring unknown sound event '%s'" -msgstr "ItemDB: Ignorerer ukendt lyd begivenhed '%s'" +#~ msgid "Show name" +#~ msgstr "Vis navn" -#: src/resources/monsterdb.cpp:44 -msgid "unnamed" -msgstr "unavngivet" +#~ msgid "Failed to switch to " +#~ msgstr "Fejlede i at skifte til " -#: src/resources/monsterdb.cpp:46 -msgid "Initializing monster database..." -msgstr "Starter monster database..." +#~ msgid "windowed" +#~ msgstr "vinduet" -#: src/resources/monsterdb.cpp:48 -msgid "monsters.xml" -msgstr "" +#, fuzzy +#~ msgid "fullscreen" +#~ msgstr "Fuld Skærm" -#: src/resources/monsterdb.cpp:53 -msgid "Monster Database: Error while loading monster.xml!" -msgstr "Monster Database: Fejl under indlæsningen ad monster.xml!" +#~ msgid "mode and restoration of old mode also failed!" +#~ msgstr "opsætning og genoprettelse af gammel opsætning fejlede ogsÃ¥!" -#: src/resources/monsterdb.cpp:84 -#, c-format -msgid "" -"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" -msgstr "" -"MonsterDB: Ukendt mÃ¥l mus skriver \"%s\" for %s - at bruge en mellem størelse" +#~ msgid "Couldn't set " +#~ msgstr "Kunne ikke definere " -#: src/resources/monsterdb.cpp:121 -#, c-format -msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" -msgstr "" -"MonsterDB: Advarsel, lyd effekt %s for ukendt begivenhed %s af monster %s" +#~ msgid " video mode: " +#~ msgstr " skærm opsætning: " -#: src/resources/monsterdb.cpp:159 -#, c-format -msgid "MonsterDB: Warning, unknown monster ID %d requested" -msgstr "MonsterDB: Advarsel, ukendt monster ID %d efterspurgt" +#~ msgid "Screen resolution changed" +#~ msgstr "Skærm opløsning ændret" -#: src/resources/npcdb.cpp:48 -msgid "Initializing NPC database..." -msgstr "Starter NPC database..." +#, fuzzy +#~ msgid "Restart your client for the change to take effect." +#~ msgstr "Ændringerne kræver at du genstarter klienten." -#: src/resources/npcdb.cpp:55 -msgid "NPC Database: Error while loading npcs.xml!" -msgstr "NPC Database: Fejl under indlæsning af npcs.xml!" +#~ msgid "Particle effect settings changed" +#~ msgstr "Partikel effekt opsætningen er ændret" -#: src/resources/npcdb.cpp:67 -msgid "NPC Database: NPC with missing ID in npcs.xml!" -msgstr "NPC Database: NPC med manglende ID i npcs.xml!" +#, fuzzy +#~ msgid "Restart your client or change maps for the change to take effect." +#~ msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane." -#: src/resources/npcdb.cpp:125 -#, c-format -msgid "NPCDB: Warning, unknown NPC ID %d requested" -msgstr "NPCDB: Advarsel, ukendt NPC ID %d efterspurgt" +#~ msgid "inc" +#~ msgstr "inc" -#: src/game.cpp:390 -msgid "Screenshot saved to ~/" -msgstr "Skærmbillede gemt under ~/" +#, fuzzy +#~ msgid "use" +#~ msgstr "Brug" -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "Gemningen af skærmbilledet fejlede!" +#~ msgid "Error loading skills file: %s" +#~ msgstr "Fejl under loading af færdigheds fil: %s" -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "Fejl: kunne ikke gemme skærmbilledet." +#~ msgid "Message" +#~ msgstr "Besked" -#: src/game.cpp:471 -msgid "Network Error" -msgstr "Netværk Fejl" +#~ msgid "Trade: You" +#~ msgstr "Handel: Dig" -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke" +#~ msgid "Couldn't load text file: %s" +#~ msgstr "Kunne ikke loade tekst fil: %s" -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Er du sikker pÃ¥ at du gerne vil stoppe?" +#~ msgid "Couldn't load news" +#~ msgstr "Kunne ikke loade nyhederne" -#: src/game.cpp:610 -msgid "no" -msgstr "nej" +#~ msgid "curl error " +#~ msgstr "curl fejl " -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "Ignorer indkomne handels anmodninger" +#~ msgid " host: " +#~ msgstr " host: " -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "Accepter indkomne handels anmodninger" +#~ msgid "Checksum for file %s failed: (%lx/%lx)" +#~ msgstr "Checksum for fil %s fejlede: (%lx/%lx)" -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "Advarsel: guichan indput untagelse: %s" +#~ msgid "Unable to create mThread" +#~ msgstr "Kunne ikke skabe mThread" -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" +#~ msgid "##1 The update process is incomplete." +#~ msgstr "##1 Opdateringsprocessen er ikke færdiggjort" -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" +#~ msgid "##1 It is strongly recommended that" +#~ msgstr "##1 Det er varmt anbefalet at" -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" +#~ msgid "##1 you try again later" +#~ msgstr "##1 du prøver igen senere" -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" +#~ msgid "%s already here" +#~ msgstr "%s allerede her" -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Angrib:" +#~ msgid "" +#~ "You are carrying more then half your weight. You are unable to regain " +#~ "health." +#~ msgstr "" +#~ "Du bære pÃ¥ mere en halvdelen af din vægt. Du kan derfor ikke genvinde liv." -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" +#~ msgid "You are dead." +#~ msgstr "Du er død." -#: src/keyboardconfig.cpp:48 -#, fuzzy -msgid "Talk" -msgstr "Total" +#~ msgid "We regret to inform you that your character was killed in battle." +#~ msgstr "" +#~ "Vi er ked af at mÃ¥tte informere dig, om at din karakter var dræbt i kamp." -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Angrib:" +#~ msgid "You are not that alive anymore." +#~ msgstr "Du er ikke sÃ¥ levende som du engang har været." -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" +#~ msgid "The cold hands of the grim reaper are grabbing for your soul." +#~ msgstr "De kolder hænder der tilhøre Grim Reaper, griber ud efter din sjæl" -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" +#~ msgid "Game Over!" +#~ msgstr "Game Over!" -#: src/keyboardconfig.cpp:52 -#, fuzzy -msgid "Target Player" -msgstr "Bruger" +#~ msgid "Insert coin to continue" +#~ msgstr "Indsæt en mønt for at fortsætte" -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" +#~ msgid "" +#~ "No, kids. Your character did not really die. It... err... went to a " +#~ "better place." +#~ msgstr "" +#~ "Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre " +#~ "sted." -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Nulstil Vinduer" +#~ msgid "" +#~ "Your plan of breaking your enemies weapon by bashing it with your throat " +#~ "failed." +#~ msgstr "" +#~ "Din plan om at smadre fjendens vÃ¥ben, ved at benytte din hals fejlede." -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Opdel" +#~ msgid "I guess this did not run too well." +#~ msgstr "Jeg gÃ¥r ud fra at dette ikke gik alt for godt." -#: src/keyboardconfig.cpp:56 -#, fuzzy -msgid "Screenshot" -msgstr "Skærmbillede gemt under ~/" +#~ msgid "Do you want your possessions identified?" +#~ msgstr "Du vil gerne have dine ejendele identificeret?" -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" +#~ msgid "Sadly, no trace of you was ever found..." +#~ msgstr "Desværre, blev der aldrig fundet noget spor efter dig..." -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" +#~ msgid "Annihilated." +#~ msgstr "Udslettet." -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Genvej" +#~ msgid "Looks like you got your head handed to you." +#~ msgstr "Det ser ud til at du fik du hoved udleveret til dig." -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Nulstil Vinduer" +#~ msgid "" +#~ "You screwed up again, dump your body down the tubes and get you another " +#~ "one." +#~ msgstr "" +#~ "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny." -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Status" +#~ msgid "You're not dead yet. You're just resting." +#~ msgstr "Du er ikke død endnu. Du hviler dig bare." -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventarliste" +#~ msgid "You are no more." +#~ msgstr "Du er ikke mere." -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Udstyr" +#~ msgid "You have ceased to be." +#~ msgstr "Du er holdt op med at være til." -#: src/keyboardconfig.cpp:75 -#, fuzzy -msgid "Skill Window" -msgstr "Færdigheds points: %d" +#~ msgid "You've expired and gone to meet your maker." +#~ msgstr "Du er udløbet og er gÃ¥et hen for at møde din skaber." -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" +#~ msgid "You're a stiff." +#~ msgstr "Du er en hÃ¥rd nød at knække, men desværre død." -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Nulstil Vinduer" +#~ msgid "Bereft of life, you rest in peace." +#~ msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af." -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" +#~ msgid "If you weren't so animated, you'd be pushing up the daisies." +#~ msgstr "" +#~ "Hvis det ikke var fordi du var sÃ¥ animeret, kunne du sikker imponere " +#~ "Chuck Norris." -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Nulstil Vinduer" +#~ msgid "Your metabolic processes are now history." +#~ msgstr "Din tid er ovre." -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Nulstil Vinduer" +#~ msgid "You're off the twig." +#~ msgstr "Drik noget syre." -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Emote fejlede!" +#~ msgid "You've kicked the bucket." +#~ msgstr "Du har stillet træskoene." -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" +#~ msgid "" +#~ "You've shuffled off your mortal coil, run down the curtain and joined the " +#~ "bleedin' choir invisibile." +#~ msgstr "Du har spist af dødens pølse for den sidste gang." -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Genvej" +#~ msgid "You are an ex-player." +#~ msgstr "Du er en forhenværende spiller." -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" +#~ msgid "You're pining for the fjords." +#~ msgstr "Du er tabt bag en vogn." -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" +#~ msgid "You picked up " +#~ msgstr "Du samlede op " -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" +#~ msgid "Equip arrows first" +#~ msgstr "Tag først pile pÃ¥" -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Vælg Server" +#~ msgid "0x013b: Unhandled message %i" +#~ msgstr "0x013b: Unbehandlet besked %i" -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "Fejl: Ugyldigt opdaterings host: %s" +#~ msgid "Request for trade" +#~ msgstr "Ansøg om lov til at handle" -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "Ugyldigt opdaterings host: " +#~ msgid " wants to trade with you, do you accept?" +#~ msgstr " vil gerne handle med dig, vil du acceptere?" -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "Advarsel: ingen protocol var aktiv som opdate host" +#~ msgid "Trading isn't possible. Trade partner is too far away." +#~ msgstr "Du kan ikke handle. Handle partneren er for langt væk." -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "Fejl: %s kan ikke laves, men findes ikke!" +#~ msgid "Trading isn't possible. Character doesn't exist." +#~ msgstr "Du kan ikke handle. Karakteren findes ikke." -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "Fejl under oprettelsen af opdateringen mappen!" +#~ msgid "Trade cancelled due to an unknown reason." +#~ msgstr "Handlen blev annulleret af en ukendt grund." -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "Fejl: %s/%s kan ikke laves, men findes ikke!" +#~ msgid "Trade: You and " +#~ msgstr "Handel: Dig og " -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr " kan ikke laves, men det findes ikke! Lukker." +#, fuzzy +#~ msgid "Trade with " +#~ msgstr "Handel med " -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "Starter Aethyra Version %s" +#, fuzzy +#~ msgid " cancelled" +#~ msgstr " afbrudt" -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "Starter Aethyra - Version er ikke defineret" +#~ msgid "Unhandled trade cancel packet" +#~ msgstr "Ubehandlet handel annullerede pakken" -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "Starter SDL..." +#~ msgid "Failed adding item. Trade partner is over weighted." +#~ msgstr "Fejlede i at tilføje genstand. Handels partneren bære pÃ¥ for meget." -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "Kunne ikke starte SDL: " +#~ msgid "Failed adding item. Trade partner has no free slot." +#~ msgstr "" +#~ "Fejlede i at tilføje genstand. Handels partneren har ikke flere frie " +#~ "pladser." -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr " kunne ikke blive sat til hjemmemappen! Lukker." +#~ msgid "Failed adding item for unknown reason." +#~ msgstr "Fejlede i at tilføje genstand af en ukendt grund." -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "Kan ikke finde ressourcernes mappe\n" +#~ msgid "Trade canceled." +#~ msgstr "Handel annulleret." -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "Starter configurationen..." +#~ msgid "Trade completed." +#~ msgstr "Handel er komplet." -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "Kunne ikke definere " +#~ msgid "Trying TMW's color file, %s." +#~ msgstr "Prøver TMW's farve fil, %s." -#: src/main.cpp:427 -msgid " video mode: " -msgstr " skærm opsætning: " +#~ msgid "ColorDB: Failed" +#~ msgstr "ColorDB: Fejlede" -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "Advarsel: %s" +#~ msgid "Unloading color database..." +#~ msgstr "Udlæser farve database..." -#: src/main.cpp:499 -msgid "aethyra" -msgstr "aethyra" +#~ msgid "ColorDB: Error, unknown dye ID# %d" +#~ msgstr "ColorDB: Fejl, ukendt dye ID# %d" -#: src/main.cpp:500 -msgid "Options: " -msgstr "Opsætning: " +#~ msgid "Initializing emote database..." +#~ msgstr "startede emote database..." -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr " -C --configfile : Configurations fil til brug" +#~ msgid "Emote Database: Error while loading emotes.xml!" +#~ msgstr "Emote Database: Fejl under læsning af emotes.xml!" -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr " -d --data : Mappen at indlæse spillets data fra" +#~ msgid "Emote Database: Emote with missing ID in emotes.xml!" +#~ msgstr "Emote Database: Emote med manglende ID i emotes.xml!" -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" -" -D --default : Overskriv login processen med normale indstillinger" +#~ msgid "EmoteDB: Warning, unknown emote ID %d requested" +#~ msgstr "EmoteDB: Warning, unknown emote ID %d requested" -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr " -h --help : Viser denne hjælp" +#~ msgid "Initializing item database..." +#~ msgstr "Startede genstans database..." -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr " -H --updatehost : Brug denne opdaterings host" +#~ msgid "Unknown item" +#~ msgstr "Ukendt genstand" -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr " -p --playername : Logind med denne bruger" +#~ msgid "ItemDB: Error while loading items.xml!" +#~ msgstr "ItemDB: Fejl under læsningen af items.xml!" -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr " -P --password : Logind med denne adgangskode" +#~ msgid "ItemDB: Invalid or missing item ID in items.xml!" +#~ msgstr "ItemDB: Ugyldig eller manglende genstand ID i items.xml!" -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr " -u --skipupdate : Spring opdateringerne over" +#~ msgid "ItemDB: Redefinition of item ID %d" +#~ msgstr "ItemDB: Ny definition af genstand ID %d" -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr " -U --username : Logind med dette brugernavn" +#~ msgid "Unloading item database..." +#~ msgstr "Udlæser genstands databasen..." -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr " -v --version : Viser den nuværende version" +#~ msgid "ItemDB: Error, unknown item ID# %d" +#~ msgstr "ItemDB: Fejl, ukendt genstand ID# %d" -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "Aethyra version " +#~ msgid "ItemDB: Ignoring unknown sound event '%s'" +#~ msgstr "ItemDB: Ignorerer ukendt lyd begivenhed '%s'" -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "(lokalt build?, PACKAGE_VERSION er ikke defineret)" +#~ msgid "unnamed" +#~ msgstr "unavngivet" -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Prøver at opretter forbindelse til bruger serveren..." +#~ msgid "Initializing monster database..." +#~ msgstr "Starter monster database..." -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "Brugernavn er %s" +#~ msgid "Monster Database: Error while loading monster.xml!" +#~ msgstr "Monster Database: Fejl under indlæsningen ad monster.xml!" -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Prøver at oprette forbindelse til karakter serveren..." +#~ msgid "" +#~ "MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized " +#~ "one" +#~ msgstr "" +#~ "MonsterDB: Ukendt mÃ¥l mus skriver \"%s\" for %s - at bruge en mellem " +#~ "størelse" -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "Husk den valgte karakter %s" +#~ msgid "" +#~ "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +#~ msgstr "" +#~ "MonsterDB: Advarsel, lyd effekt %s for ukendt begivenhed %s af monster %s" -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Prøver at oprette forbindelse til bane serveren..." +#~ msgid "MonsterDB: Warning, unknown monster ID %d requested" +#~ msgstr "MonsterDB: Advarsel, ukendt monster ID %d efterspurgt" -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Bane; %s" +#~ msgid "Initializing NPC database..." +#~ msgstr "Starter NPC database..." -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "Kunne ikke indlæse %s som background" +#~ msgid "NPC Database: Error while loading npcs.xml!" +#~ msgstr "NPC Database: Fejl under indlæsning af npcs.xml!" -#: src/main.cpp:863 -msgid "Got disconnected from server!" -msgstr "Blev smidt af serveren!" +#~ msgid "NPC Database: NPC with missing ID in npcs.xml!" +#~ msgstr "NPC Database: NPC med manglende ID i npcs.xml!" -#: src/main.cpp:1068 -#, fuzzy -msgid "Connecting to map server..." -msgstr "Opretter forbindelse til bane serveren..." +#~ msgid "NPCDB: Warning, unknown NPC ID %d requested" +#~ msgstr "NPCDB: Advarsel, ukendt NPC ID %d efterspurgt" -#: src/main.cpp:1076 -msgid "Connecting to character server..." -msgstr "Opretter forbindelse til karakter serveren..." +#~ msgid "Screenshot saved to ~/" +#~ msgstr "Skærmbillede gemt under ~/" -#: src/main.cpp:1084 -msgid "Connecting to account server..." -msgstr "Opretter forbindelse til bruger serveren..." +#~ msgid "Saving screenshot failed!" +#~ msgstr "Gemningen af skærmbilledet fejlede!" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" +#~ msgid "Error: could not save screenshot." +#~ msgstr "Fejl: kunne ikke gemme skærmbilledet." -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" +#~ msgid "Network Error" +#~ msgstr "Netværk Fejl" -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" +#~ msgid "The connection to the server was lost, the program will now quit" +#~ msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke" -#: src/party.cpp:84 -msgid "Left party." -msgstr "" +#~ msgid "Ignoring incoming trade requests" +#~ msgstr "Ignorer indkomne handels anmodninger" -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" +#~ msgid "Accepting incoming trade requests" +#~ msgstr "Accepter indkomne handels anmodninger" -#: src/party.cpp:97 #, fuzzy -msgid "Could not create party." -msgstr "Kunne ikke tilslutte sig gruppen!" +#~ msgid "Are you sure you want to quit?" +#~ msgstr "Er du sikker pÃ¥ at du gerne vil stoppe?" -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" +#~ msgid "no" +#~ msgstr "nej" -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" +#~ msgid "Warning: guichan input exception: %s" +#~ msgstr "Advarsel: guichan indput untagelse: %s" -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" +#~ msgid "Error: Invalid update host: %s" +#~ msgstr "Fejl: Ugyldigt opdaterings host: %s" -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" +#~ msgid "Invalid update host: " +#~ msgstr "Ugyldigt opdaterings host: " -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventarliste" +#~ msgid "Warning: no protocol was specified for the update host" +#~ msgstr "Advarsel: ingen protocol var aktiv som opdate host" -#: src/party.cpp:131 -#, fuzzy, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr " vil gerne handle med dig, vil du acceptere?" +#~ msgid "Error: %s/%s can't be made, but doesn't exist!" +#~ msgstr "Fejl: %s/%s kan ikke laves, men findes ikke!" -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" +#~ msgid "Error creating updates directory!" +#~ msgstr "Fejl under oprettelsen af opdateringen mappen!" -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" +#~ msgid " can't be created, but it doesn't exist! Exiting." +#~ msgstr " kan ikke laves, men det findes ikke! Lukker." -#: src/party.cpp:173 -#, fuzzy -msgid "Command: /party <command> <args>" -msgstr "Kommando: /help <kommando>" +#~ msgid "Initializing SDL..." +#~ msgstr "Starter SDL..." -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" +#~ msgid "Could not initialize SDL: " +#~ msgstr "Kunne ikke starte SDL: " -#: src/party.cpp:175 -msgid " /new" -msgstr "" +#~ msgid " couldn't be set as home directory! Exiting." +#~ msgstr " kunne ikke blive sat til hjemmemappen! Lukker." -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Opret" +#~ msgid "Can't find Resources directory\n" +#~ msgstr "Kan ikke finde ressourcernes mappe\n" -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" +#~ msgid "Initializing configuration..." +#~ msgstr "Starter configurationen..." -#: src/party.cpp:178 -msgid " /leave" -msgstr "" +#~ msgid "Warning: %s" +#~ msgstr "Advarsel: %s" -#: src/party.cpp:179 -#, fuzzy -msgid "This command implements the partying function." -msgstr "Denne kommando viser hjælp for <kommando>" +#~ msgid "aethyra" +#~ msgstr "aethyra" -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" +#~ msgid "Options: " +#~ msgstr "Opsætning: " -#: src/party.cpp:187 -#, fuzzy -msgid "Command: /party new <party-name>" -msgstr "Kommando /toggle <tilstand>" +#~ msgid " -C --configfile : Configuration file to use" +#~ msgstr " -C --configfile : Configurations fil til brug" -#: src/party.cpp:188 -#, fuzzy -msgid "Command: /party create <party-name>" -msgstr "Kommando /toggle <tilstand>" +#~ msgid " -d --data : Directory to load game data from" +#~ msgstr " -d --data : Mappen at indlæse spillets data fra" -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" +#~ msgid " -D --default : Bypass the login process with default settings" +#~ msgstr "" +#~ " -D --default : Overskriv login processen med normale indstillinger" -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" +#~ msgid " -h --help : Display this help" +#~ msgstr " -h --help : Viser denne hjælp" -#: src/party.cpp:196 -#, fuzzy -msgid "This command sets the party prefix character." -msgstr "Denne commando rydder chat loggen" +#~ msgid " -H --updatehost : Use this update host" +#~ msgstr " -H --updatehost : Brug denne opdaterings host" -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" +#~ msgid " -p --playername : Login with this player" +#~ msgstr " -p --playername : Logind med denne bruger" -#: src/party.cpp:200 -#, fuzzy -msgid "Command: /party prefix" -msgstr "Kommando: /present" +#~ msgid " -P --password : Login with this password" +#~ msgstr " -P --password : Logind med denne adgangskode" -#: src/party.cpp:201 -#, fuzzy -msgid "This command reports the current party prefix character." -msgstr "Denne commando rydder chat loggen" +#~ msgid " -u --skipupdate : Skip the update downloads" +#~ msgstr " -u --skipupdate : Spring opdateringerne over" -#: src/party.cpp:209 -#, fuzzy -msgid "Command: /party leave" -msgstr "Kommando: /present" +#~ msgid " -U --username : Login with this username" +#~ msgstr " -U --username : Logind med dette brugernavn" -#: src/party.cpp:210 -#, fuzzy -msgid "This command causes the player to leave the party." -msgstr "Denne kommando viser fokusering af chat vinduets status." +#~ msgid " -v --version : Display the version" +#~ msgstr " -v --version : Viser den nuværende version" -#: src/party.cpp:214 -#, fuzzy -msgid "Unknown /party command." -msgstr "Ukendt kommando" +#~ msgid "(local build?, PACKAGE_VERSION is not defined)" +#~ msgstr "(lokalt build?, PACKAGE_VERSION er ikke defineret)" -#: src/party.cpp:215 #, fuzzy -msgid "Type /help party for a list of options." -msgstr "Skriv /help for at fÃ¥ en liste med kommandoer" - -#~ msgid "The current server doesn't support spells" -#~ msgstr "Den nuværende server understøtter ikke trylleformulare" +#~ msgid "Trying to connect to account server..." +#~ msgstr "Prøver at opretter forbindelse til bruger serveren..." -#, fuzzy -#~ msgid "Weight: %d g / %d g" -#~ msgstr "Vægt: %d g / %d g" +#~ msgid "Username is %s" +#~ msgstr "Brugernavn er %s" #, fuzzy -#~ msgid "Map" -#~ msgstr "MiniKort" +#~ msgid "Trying to connect to char server..." +#~ msgstr "Prøver at oprette forbindelse til karakter serveren..." -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Beskrivelse@@" +#~ msgid "Memorizing selected character %s" +#~ msgstr "Husk den valgte karakter %s" #, fuzzy -#~ msgid "%s whispers:" -#~ msgstr "Tillad hviskere" - -#~ msgid "Remember Username" -#~ msgstr "Husk Brugernavn" - -#~ msgid "Welcome" -#~ msgstr "Velkommen" - -#~ msgid " g Slots: " -#~ msgstr " g Pladser: " +#~ msgid "Trying to connect to map server..." +#~ msgstr "Prøver at oprette forbindelse til bane serveren..." #, fuzzy -#~ msgid "Color:" -#~ msgstr "Farve:" +#~ msgid "Map: %s" +#~ msgstr "Bane; %s" + +#~ msgid "Couldn't load %s as wallpaper" +#~ msgstr "Kunne ikke indlæse %s som background" #, fuzzy #~ msgid "Description:" @@ -2334,6 +1622,9 @@ msgstr "Skriv /help for at fÃ¥ en liste med kommandoer" #~ msgid "Please remove %d points" #~ msgstr "Du skal fjerne %d points" +#~ msgid "Split" +#~ msgstr "Opdel" + #~ msgid "Select amount of items to split." #~ msgstr "Vælg hvor mange genstande du vil opdele." @@ -2359,7 +1650,7 @@ msgstr "Skriv /help for at fÃ¥ en liste med kommandoer" #~ msgstr "E-mail:" #~ msgid "Choose your Mana World Server" -#~ msgstr "Vælg din Aethyra Server" +#~ msgstr "Vælg din Mana World Server" #~ msgid "Please type both the address and the port of a server." #~ msgstr "Skriv bÃ¥de adressen og porten pÃ¥ serveren." @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2009-01-19 20:15+0000\n" "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n" "Language-Team: German\n" @@ -17,608 +17,415 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Kaufen" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Preis: %d GP / Summe: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Beenden" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Beschreibung: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effekt: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "Geschäft" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Verkaufen" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Abbrechen" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Bestätige Charakter-Löschung" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Spielfigur auswählen" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Neu" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Löschen" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Zurück" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Weiter" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Name : %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Stufe: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, c-format msgid "Job Level: %d" msgstr "" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Geld: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Neu" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Löschen" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Zurück" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Weiter" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "Gold: %d" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Charakter erstellen" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Name :" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Haarfarbe" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Frisur" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Erstellen" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "Server auswählen" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "Ok" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Erstellen" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 +#, c-format +msgid "%s whispers:" +msgstr "%s flüstert:" + +#: src/gui/chat.cpp:276 #, c-format msgid "Whispering to %s: %s" msgstr "Flüsternd zu %s: %s" -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -#, fuzzy -msgid "Unknown item" -msgstr "Unbekannter Befehl" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." -msgstr "" - -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "Unbekannter Befehl" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "Handel fehlgeschlagen!" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "Emote fehlgeschlagen!" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "Sitzen fehlgeschlagen!" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "Chat-Erstellung fehlgeschlagen!" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "Du kannst dies momentan nicht tun!" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "Schmalhans ist dein Küchenmeister... ;-)" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "Du brauchst noch einen roten Edelstein!" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "Du brauchst noch einen blauen Edelstein!" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "Du schleppst zuviel herum um das zu machen!" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "Eha? Was ist das?" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "Warp fehlgeschlagen..." -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "Konnte nichts stehlen..." -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "Das Gift hatte keine Wirkung..." -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Ändere OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "Unbekannter Befehl." -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "Hoch" - -#: src/gui/colour.cpp:34 -#, fuzzy -msgid "Player" -msgstr "Spieler" - -#: src/gui/colour.cpp:35 -#, fuzzy -msgid "Whisper" -msgstr "%s flüstert:" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Los!" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Ja" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Nein" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Verbinde..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Benutzen" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Ausrüstung" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Ablegen" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "Hilfe" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "Schließen" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventar" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Ausrüsten" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Benutzen" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Wegwerfen" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " -msgstr "" +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "Gewicht: %d / %d" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " -msgstr "" +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" +msgstr "Sockel benutzt: %d / %d" + +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Ablegen" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Ausrüsten" #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." @@ -628,244 +435,147 @@ msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest." msgid "Select amount of items to drop." msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Anmelden" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Passwort:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port:" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Benutzernamen merken" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Erinnern" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registrieren" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Status" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Fertigkeiten" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Einstellungen" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Ãœbersichtskarte" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registrieren" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Mit %s handeln@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|%s angreifen@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, fuzzy, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "@@guild|%s einladen@@" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "@@party|%s in deine Gruppe einladen@@" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Mit NSC reden@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Abbrechen@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|%s aufheben@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Ausrüsten@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Nutzen@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Fallen lassen@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Beschreibung@@" -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Verbinde..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Verbinde..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Verbinde..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Bestätigen:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Männlich" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Weiblich" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Das Passwort muss kürzer als %d Zeichen sein." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Passwörter stimmen nicht überein." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Fehler" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Ton" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Lautstärke der Klangeffekte" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Latustärke der Musik" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Anwenden" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Fenster zurücksetzen" @@ -886,384 +596,264 @@ msgid "Keyboard" msgstr "Tastatur" #: src/gui/setup.cpp:94 -#, fuzzy -msgid "Colors" -msgstr "Schließen" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "Spieler" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Knopf drücken um die Kalibrierung zu starten" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Kalibrieren" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Joystick aktivieren" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Stopp" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Kreise den Steuerknüppel" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "Zuordnen" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 msgid "Default" msgstr "Standard" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 msgid "Name" msgstr "Name" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "Beziehung" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "Neutral" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "Freund" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "Ignoriert" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "Spielerliste sichern" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "Handeln erlauben" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "Flüstern erlauben" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Vollbild" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Benutzerdefinierten Zeiger" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "FPS-Limit:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "GUI Transparenz" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Scroll-Radius" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Scroll-Trägheit" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Hintergrundeffekte" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "Aus" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "Niedrig" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "Hoch" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "Mittel" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "max" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Vollbild" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Wechsle zum Vollbildmodus" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Ändere OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung " "übernommen." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Fertigkeiten" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "Erhöhen" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Benutzen" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "Geld: %d GP" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -msgid "Job:" -msgstr "" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "Statistiken" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "Gesamt" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "Preis" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "Angriff:" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "Verteidigung:" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "M.Angriff:" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "M.Verteidigung:" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "% Genauigkeit" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "% Ausweichen:" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "% Reaktion:" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 msgid "Strength" msgstr "Stärke" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "Beweglichkeit" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "Gesundheit" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 msgid "Intelligence" msgstr "Intelligenz" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "Ausdauer" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "Glück" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -#, fuzzy -msgid "Trade: You" -msgstr "Handeln" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "Handeln" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Hinzufügen" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "Handeln" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Du erhälst %d GP." @@ -1272,952 +862,42 @@ msgstr "Du erhälst %d GP." msgid "You give:" msgstr "Du gibst:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "Aktualisiere..." -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "Los!" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "Fertig" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -#, fuzzy -msgid "You are not that alive anymore." -msgstr "Du kannst dies momentan nicht tun!" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Handeln" - -#: src/net/tradehandler.cpp:128 -#, fuzzy -msgid " cancelled" -msgstr "Abbrechen" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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 -#, fuzzy -msgid "Trade canceled." -msgstr "Handel fehlgeschlagen!" - -#: src/net/tradehandler.cpp:214 -#, fuzzy -msgid "Trade completed." -msgstr "Fertig" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "Unbenannt" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, c-format -msgid "ItemDB: Ignoring unknown sound event '%s'" -msgstr "" - -#: src/resources/monsterdb.cpp:44 -#, fuzzy -msgid "unnamed" -msgstr "Unbenannt" - -#: src/resources/monsterdb.cpp:46 -msgid "Initializing monster database..." -msgstr "" - -#: src/resources/monsterdb.cpp:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -#, fuzzy -msgid "Saving screenshot failed!" -msgstr "Sitzen fehlgeschlagen!" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Angriff:" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -#, fuzzy -msgid "Talk" -msgstr "Gesamt" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Angriff:" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -#, fuzzy -msgid "Target Player" -msgstr "Spieler" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Fenster zurücksetzen" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Aufteilen" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Tastenkürzel" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Fenster zurücksetzen" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Status" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventar" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Ausrüstung" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Fenster zurücksetzen" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Fenster zurücksetzen" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Fenster zurücksetzen" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Emote fehlgeschlagen!" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Tastenkürzel" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Server auswählen" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Verbinde zu [account server]..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Verbinde zu [character server]..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Verbinde zu [map server]..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Name : %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "Verbinde zu [map server]..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "Verbinde zu [character server]..." -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "Verbinde zu [account server]..." -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -#, fuzzy -msgid "Could not create party." -msgstr "Konnte nichts stehlen..." - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventar" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Erstellen" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -#, fuzzy -msgid "Unknown /party command." -msgstr "Unbekannter Befehl." - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Weight: %d g / %d g" -#~ msgstr "Gewicht: %d / %d" - -#~ msgid "Slots used: %d / %d" -#~ msgstr "Sockel benutzt: %d / %d" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Ãœbersichtskarte" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Beschreibung@@" - -#~ msgid "Remember Username" -#~ msgstr "Benutzernamen merken" - #~ msgid "Change" #~ msgstr "Ändern" @@ -2239,6 +919,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Bitte entferne %d Punkte" +#~ msgid "Split" +#~ msgstr "Aufteilen" + #~ msgid "Select amount of items to split." #~ msgstr "Wähle aus, wieviel Gegenstände Du aufteilen möchtest." @@ -2257,6 +940,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Wähle Deinen Mana World Spielserver" +#~ msgid "Port:" +#~ msgstr "Port:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Bitte die Adresse und den Port eines Servers eingeben" @@ -2281,6 +967,9 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d" +#~ msgid "Keep" +#~ msgstr "Erinnern" + #~ msgid "Account and Character Management" #~ msgstr "Account- und Charakterverwaltung" @@ -2296,5 +985,11 @@ msgstr "" #~ msgid "Guilds" #~ msgstr "Gilden" +#~ msgid "@@guild|Invite %s@@" +#~ msgstr "@@guild|%s einladen@@" + +#~ msgid "@@party|Invite %s to join your party@@" +#~ msgstr "@@party|%s in deine Gruppe einladen@@" + #~ msgid "Visible names" #~ msgstr "Sichtbare Namen" diff --git a/po/en_GB.po b/po/en_GB.po index 672445dd..f5cbb8ba 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,608 +17,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Buy" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Price: %d GP / Total: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Exit" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Description: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effect: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Stop" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Sell" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Cancel" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Are you sure you want to delete this character?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Select Character" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "New" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Delete" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Previous" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Next" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Name: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Level: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Level: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Money: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "New" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Delete" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Previous" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Next" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Create Character" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Name:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Hair Colour:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Hair Style:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Create" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Select Character" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Create" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Changing OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "high" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Port:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Yes" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "No" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Connecting..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Use" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Equipment" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Unequip" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventory" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Equip" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Use" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Drop" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Unequip" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Equip" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Select amount of items to trade." @@ -627,245 +437,148 @@ msgstr "Select amount of items to trade." msgid "Select amount of items to drop." msgstr "Select amount of items to drop." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Login" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Password:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Keep" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Register" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Status" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Skills" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Shortcut" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Setup" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "MiniMap" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Register" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Trade With %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Attack %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventory" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Talk To NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Cancel@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Pick Up %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Equip@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Equip@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Use@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Drop@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Connecting..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Connecting..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Connecting..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Description@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Confirm:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "The password needs to be less than %d characters long." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Passwords do not match." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Error" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Sound" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Sfx volume" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Music volume" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Apply" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Reset Windows" @@ -886,393 +599,274 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "Colours" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Press the button to start calibration" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Calibrate" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Enable joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Stop" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Rotate the stick" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Delete" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Name:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Full screen" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Custom cursor" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "FPS Limit:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Gui opacity" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Scroll radius" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Scroll laziness" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Ambient FX" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "off" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "low" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "high" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Full screen" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Switching to full screen" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Restart needed for changes to take effect." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Changing OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Applying change to OpenGL requires restart." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Restart needed for changes to take effect." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Restart needed for changes to take effect." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Skills" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Use" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Level: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Money: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Level: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Status" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Attack %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Defense %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Attack %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Defense %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Strength:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Agility:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitality:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Intelligence:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Dexterity:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Add" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "You get %d GP." @@ -1281,933 +875,43 @@ msgstr "You get %d GP." msgid "You give:" msgstr "You give:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Cancel" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Are you sure you want to delete this character?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Attack %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Attack %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Reset Windows" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Split" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Shortcut" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Reset Windows" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Status" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventory" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Equipment" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Reset Windows" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Reset Windows" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Reset Windows" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Reset Windows" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Shortcut" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Select Character" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Connecting..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Connecting..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Connecting..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Name: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Connecting..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventory" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Create" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "MiniMap" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Description@@" - #~ msgid "Unregister" #~ msgstr "Unregister" @@ -2226,6 +930,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Please remove %d points" +#~ msgid "Split" +#~ msgstr "Split" + #~ msgid "Select amount of items to split." #~ msgstr "Select amount of items to split." @@ -2244,6 +951,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Choose your Mana World Server" +#~ msgid "Port:" +#~ msgstr "Port:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Please type both the address and the port of a server." @@ -2270,3 +980,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Total Weight: %d - Maximum Weight: %d" + +#~ msgid "Keep" +#~ msgstr "Keep" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,599 +17,414 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 -#, c-format -msgid "Name: %s" +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" msgstr "" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 -#, c-format -msgid "Level: %d" +#: src/gui/char_select.cpp:86 +msgid "New" msgstr "" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 -#, c-format -msgid "Job Level: %d" +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" msgstr "" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 -#, c-format -msgid "Money: %d" +#: src/gui/char_select.cpp:88 +msgid "Previous" msgstr "" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" +#: src/gui/char_select.cpp:89 +msgid "Next" msgstr "" -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 +#, c-format +msgid "Name: %s" msgstr "" -#: src/gui/char_select.cpp:99 -msgid "Previous" +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 +#, c-format +msgid "Level: %d" msgstr "" -#: src/gui/char_select.cpp:100 -msgid "Next" +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 +#, c-format +msgid "Job Level: %d" msgstr "" -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 +#, c-format +msgid "Money: %d" msgstr "" -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -msgid "Chat" +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:146 -msgid "Global announcement: " -msgstr "" - -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -msgid "Party" -msgstr "" - -#: src/gui/colour.cpp:38 -msgid "Server" -msgstr "" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "" -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" msgstr "" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" msgstr "" #: src/gui/item_amount.cpp:76 @@ -620,240 +435,147 @@ msgstr "" msgid "Select amount of items to drop." msgstr "" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -msgid "Reset" -msgstr "" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, c-format msgid "@@trade|Trade With %s@@" msgstr "" -#: src/gui/popupmenu.cpp:79 +#: src/gui/popupmenu.cpp:83 #, c-format msgid "@@attack|Attack %s@@" msgstr "" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -msgid "Recorder" -msgstr "" - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" msgstr "" -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -msgid "Already recording." -msgstr "" - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -msgid "Recording..." -msgstr "" - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "" -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -874,375 +596,262 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 msgid "Default" msgstr "" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 msgid "Name" msgstr "" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." -msgstr "" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." -msgstr "" - -#: src/gui/skill.cpp:41 -msgid "skills.xml" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -msgid "use" -msgstr "" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -msgid "Job:" -msgstr "" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 msgid "Strength" msgstr "" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 msgid "Intelligence" msgstr "" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" +#: src/gui/trade.cpp:61 +msgid "Add" msgstr "" -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 +#: src/gui/trade.cpp:64 msgid "Trade" msgstr "" -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "" @@ -1251,901 +860,38 @@ msgstr "" msgid "You give:" msgstr "" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -msgid "Are you sure you want to quit?" -msgstr "" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -msgid "Sit" -msgstr "" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, c-format -msgid "Item Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -msgid "Status Window" -msgstr "" - -#: src/keyboardconfig.cpp:73 -msgid "Inventory Window" -msgstr "" - -#: src/keyboardconfig.cpp:74 -msgid "Equipment WIndow" -msgstr "" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, c-format -msgid "Emote Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -msgid "Select OK" -msgstr "" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -msgid "Trying to connect to account server..." -msgstr "" - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -msgid "Trying to connect to char server..." -msgstr "" - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -msgid "Trying to connect to map server..." -msgstr "" - -#: src/main.cpp:700 -#, c-format -msgid "Map: %s" -msgstr "" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "" -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" - -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -msgid "Invite to party" -msgstr "" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -msgid " /create" -msgstr "" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-10-15 01:37+0000\n" "Last-Translator: catalania <Unknown>\n" "Language-Team: Spanish <es@li.org>\n" @@ -17,608 +17,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Comprar" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Precio: %d GP / Total: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Salir" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Descripción: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Efecto: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Detener" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Vender" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Cancelar" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "¿Seguro que quieres borrar este personaje?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Seleccionar personaje" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Aceptar" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Nuevo" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Eliminar" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Anterior" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Siguiente" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Nombre: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Nivel: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Nivel: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Dinero: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Nuevo" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Eliminar" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Anterior" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Siguiente" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Aceptar" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Crear Personaje" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Nombre:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Color de pelo:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "corte de pelo" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Crear" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Seleccionar personaje" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Crear" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Servidor:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Cambiar a OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "alto" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Puerto:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Servidor:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "SÃ" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "No" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Conectando…" -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Usar" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Equipo" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "quitarselo" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventario" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Equipar" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Usar" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "tirar" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "quitarselo" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Equipar" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Seleccione objetos para comerciar." @@ -627,245 +437,148 @@ msgstr "Seleccione objetos para comerciar." msgid "Select amount of items to drop." msgstr "Seleccione objetos para soltar." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "conectarse" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Contraseña:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Puerto:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Mantener" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registrar" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Estado" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Habilidades" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Atajos" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Configuración" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Minimapa" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registrar" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Comerciar con %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Atacar a %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventario" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Hablar al NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Cancelar@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Recoger %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Equipar@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Equipar@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Usar@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Tirar@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Conectando…" - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Conectando…" - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Conectando…" - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Descripción@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Confirmar:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "La contraseña puede tener como máximo %d caracteres." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Las contraseñas no coinciden." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Error" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Sonido" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volumen efectos" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Volumen musica" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Aplicar" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Reiniciar ventanas" @@ -886,393 +599,274 @@ msgid "Keyboard" msgstr "Teclado" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Presione el botón para comenzar la calibración" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Calibrar" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Activar joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Detener" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Gire el stick" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Eliminar" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Nombre:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Pantalla completa" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Cursor propio" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "LÃmite de FPS:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Transparencia menus" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Ratio de scroll" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Velocidad de scroll" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Efectos ambientales" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "desactivado" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "bajo" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "alto" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Pantalla completa" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Cambiar a pantalla completa" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Se necesita reiniciar para aplicar los cambios." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Cambiar a OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Se necesita reiniciar para aplicar los cambios." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Se necesita reiniciar para aplicar los cambios." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Habilidades" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Usar" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Nivel: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Dinero: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Nivel: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Estado" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Ataque %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Defensa %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Ataque %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Defensa %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Fuerza:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Agilidad:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitalidad:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Inteligencia:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Destreza:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Añadir" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Tu consigues %d GP." @@ -1281,933 +875,43 @@ msgstr "Tu consigues %d GP." msgid "You give:" msgstr "Tu das:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Cancelar" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "¿Seguro que quieres borrar este personaje?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Ataque %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Ataque %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Reiniciar ventanas" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Dividir" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Atajos" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Reiniciar ventanas" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Estado" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventario" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Equipo" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Reiniciar ventanas" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Reiniciar ventanas" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Reiniciar ventanas" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Reiniciar ventanas" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Atajos" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Seleccionar personaje" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Conectando…" - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Conectando…" - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Conectando…" - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Nombre: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Conectando…" -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventario" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Crear" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Minimapa" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Descripción@@" - #~ msgid "Unregister" #~ msgstr "Cancelar Cuenta" @@ -2226,6 +930,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "por favor quita %d puntos" +#~ msgid "Split" +#~ msgstr "Dividir" + #~ msgid "Select amount of items to split." #~ msgstr "Seleccione objetos para dividir." @@ -2244,6 +951,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Elija su servidor de Mana World" +#~ msgid "Port:" +#~ msgstr "Puerto:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Escriba la dirección y el puerto de un servidor." @@ -2270,3 +980,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Peso Total: %d - Peso Máximo: %d" + +#~ msgid "Keep" +#~ msgstr "Mantener" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,609 +17,419 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Osta" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Kappalehinta: %d GP / Yhteensä: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Sulje" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Kuvaus: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Vaikutus: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Lopeta" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Myy" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Peru" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Vahvista hahmon poistopyyntö" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Oletko varma, että haluat poistaa tämän hahmon?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 #, fuzzy msgid "Select Character" msgstr "Luo hahmo" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Uusi" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Poista" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Edellinen" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Seuraava" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Nimi: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Taso: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Taso: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Rahatilanne: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Uusi" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Poista" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Edellinen" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Seuraava" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Luo hahmo" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Nimi:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Hiusten väri:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Hiustyyli:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Luo" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Vaihda palvelinta" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Luo" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Palvelin:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Vaihdetaan OpenGL -toimintatilaan" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "korkea" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Portti:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Palvelin:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Kyllä" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Ei" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Yhdistetään..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Käytä" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Varusteet" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Poista varuste käytöstä" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Tavaraluettelo" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Ota käyttöön" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Käytä" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Pudota" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Poista varuste käytöstä" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Ota käyttöön" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Anna vaihdettavien tavaroiden määrä." @@ -628,245 +438,148 @@ msgstr "Anna vaihdettavien tavaroiden määrä." msgid "Select amount of items to drop." msgstr "Anna pudotettavien tavaroiden määrä." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Kirjaudu sisään" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Salasana:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Portti:" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Muista käyttäjätunnus" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Rekisteröidy" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Hahmon tiedot" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Taidot" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Pikavalinnat" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Asetukset" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Apukartta" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Rekisteröidy" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "Epäpelattava hahmo" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Vaihda tavaroita %s kanssa@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Hyökkää %s kimppuun@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, fuzzy, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "@@guild|Kutsu %s mukaan kiltaan@@" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "@@party|Kutsu %s mukaan ryhmääsi@@" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Puhu epäpelattavalle hahmolle@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Peruuta@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Poimi %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Ota varuste käyttöön@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Ota varuste käyttöön@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Käytä@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Pudota maahan@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Yhdistetään..." +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Kuvaus@@" -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Yhdistetään..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Yhdistetään..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Vahvista:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Miespuolinen" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Naispuolinen" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Salasanan tulee olla alle %d merkkiä pitkä." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Salasanat eivät täsmää." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Virhe" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Ääni" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Äänitehosteiden voimakkuus" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Musiikin voimakkuus" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Käytä" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Palauta ikkunoiden oletusasetukset" @@ -887,393 +600,274 @@ msgid "Keyboard" msgstr "Näppäimistö" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Kalibroi" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Peliohjaintuki päälle" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Lopeta" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Käytä ohjain ääriasennoissaan pyörittämällä" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Poista" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Nimi:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Kokoruututila" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Tyylitelty hiiren osoitin" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Käyttöliittymän läpinäkyvyys" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Kameran perässälaahaus" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Kameran perässälaahauksen tiukkuus" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Taustaäänet" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "pois päältä" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "matala" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "korkea" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Kokoruututila" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Kokoruututilaan siirtyminen" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Vaihdetaan OpenGL -toimintatilaan" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Taidot" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Käytä" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Taso: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Rahatilanne: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Taso: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Hahmon tiedot" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Hyökkäys %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Puolustus %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Hyökkäys %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Puolustus %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Voima:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Ketteryys:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Elinvoima:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Älykkyys:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Näppäryys:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Lisää" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Sait %d GP" @@ -1282,936 +876,43 @@ msgstr "Sait %d GP" msgid "You give:" msgstr "Annat:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Peru" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Oletko varma, että haluat poistaa tämän hahmon?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Hyökkäys %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Hyökkäys %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Palauta ikkunoiden oletusasetukset" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Jaa" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Pikavalinnat" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Palauta ikkunoiden oletusasetukset" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Hahmon tiedot" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Tavaraluettelo" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Varusteet" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Palauta ikkunoiden oletusasetukset" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Palauta ikkunoiden oletusasetukset" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Palauta ikkunoiden oletusasetukset" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Palauta ikkunoiden oletusasetukset" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Pikavalinnat" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Vaihda palvelinta" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Yhdistetään..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Yhdistetään..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Yhdistetään..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Nimi: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Yhdistetään..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Tavaraluettelo" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Luo" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Apukartta" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Kuvaus@@" - -#~ msgid "Remember Username" -#~ msgstr "Muista käyttäjätunnus" - #~ msgid "Account and Character Management" #~ msgstr "Tilin ja hahmojen hallinta" @@ -2242,12 +943,21 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "%d pistettä liikaa" +#~ msgid "Split" +#~ msgstr "Jaa" + #~ msgid "Select amount of items to split." #~ msgstr "Anna eri pinoon jaettavien tavaroiden määrä." #~ msgid "Guilds" #~ msgstr "Kiltatoiminta" +#~ msgid "@@guild|Invite %s@@" +#~ msgstr "@@guild|Kutsu %s mukaan kiltaan@@" + +#~ msgid "@@party|Invite %s to join your party@@" +#~ msgstr "@@party|Kutsu %s mukaan ryhmääsi@@" + #~ msgid "@@split|Split@@" #~ msgstr "@@split|Pinon jako@@" @@ -2260,6 +970,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Valitse Mana World -palvelimesi" +#~ msgid "Port:" +#~ msgstr "Portti:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-12-26 10:43+0000\n" "Last-Translator: Johan Serre <Unknown>\n" "Language-Team: French\n" @@ -18,608 +18,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Acheter" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Prix : %d PO / Total : %d PO" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Quitter" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Description : %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effet : %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Stop" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Vendre" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Annuler" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Confirmer la suppression du personnage" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Choix du personnage" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Nouveau" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Supprimer" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Précédent" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Suivant" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Nom : %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Niveau : %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Niveau : %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Argent : %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Nouveau" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Supprimer" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Précédent" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Suivant" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Création du personnage" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Nom :" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Couleur des cheveux" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Coiffure :" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Créer" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Choix du personnage" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Créer" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Serveur :" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Changement OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "complet" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Port :" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Serveur :" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Oui" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Non" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Connexion..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Utiliser" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Équipement" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Retirer" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventaire" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Équiper" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Utiliser" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Lâcher" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Retirer" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Équiper" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Choisissez le nombre d'objets à troquer." @@ -628,245 +438,148 @@ msgstr "Choisissez le nombre d'objets à troquer." msgid "Select amount of items to drop." msgstr "Choisissez le nombre d'objets à lâcher." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Connexion" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Mot de passe :" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port :" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Se souvenir du nom d'utilisateur" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Conserver" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "S'inscrire" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Statut" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Compétences" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Raccourci" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Configuration" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Plan" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "S'inscrire" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "PNJ" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Troquer avec %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Attaquer %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, fuzzy, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "@@guilde|Invite %s@@" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "@@partie| Invitation de %s à joindre votre partie @@" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Parler au PNJ@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Annuler@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Ramasser %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Équiper@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Équiper@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Utiliser@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Lâcher@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Connexion..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Connexion..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Connexion..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Description@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Vérification :" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Masculin" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Féminin" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, 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." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Les deux mots de passe ne correspondent pas." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Erreur" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Son" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volume des effets sonores" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Volume de la musique" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Appliquer" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Rétablir les fenêtres" @@ -887,397 +600,276 @@ msgid "Keyboard" msgstr "Clavier" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Presser le bouton pour démarrer la calibration" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Calibrer" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Activer le joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Stop" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Tourner le joystick" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Supprimer" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Nom :" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Plein écran" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Curseur personnalisé" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Limite FPS :" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Opacité de l'interface" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Rayon du scrolling" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Paresse du scrolling" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Effets ambiants" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "aucun" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "léger" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "complet" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Plein écran" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Passage en plein écran" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" "Les changements ne seront pris en compte qu'au prochain démarrage du jeu." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Changement OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "" -"Les changements ne seront pris en compte qu'au prochain démarrage du jeu." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -"Les changements ne seront pris en compte qu'au prochain démarrage du jeu." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Compétences" -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Utiliser" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Niveau : %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Argent : %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Niveau : %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Statut" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Attaque %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Défense %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Attaque %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Défense %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Force :" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Agilité :" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitalité :" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Intelligence :" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Dextérité :" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Ajouter" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Vous obtenez %d PO." @@ -1286,936 +878,43 @@ msgstr "Vous obtenez %d PO." msgid "You give:" msgstr "Vous donnez :" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Annuler" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Attaque %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Attaque %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Rétablir les fenêtres" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Partager" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Raccourci" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Rétablir les fenêtres" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Statut" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventaire" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Équipement" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Rétablir les fenêtres" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Rétablir les fenêtres" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Rétablir les fenêtres" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Rétablir les fenêtres" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Raccourci" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Choix du personnage" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Connexion..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Connexion..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Connexion..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Nom : %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Connexion..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventaire" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Créer" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Plan" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Description@@" - -#~ msgid "Remember Username" -#~ msgstr "Se souvenir du nom d'utilisateur" - #~ msgid "Account and Character Management" #~ msgstr "Gestion du compte et du personnage" @@ -2246,12 +945,21 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Veuillez retirer %d points" +#~ msgid "Split" +#~ msgstr "Partager" + #~ msgid "Select amount of items to split." #~ msgstr "Choisissez le nombre d'objets à déplacer." #~ msgid "Guilds" #~ msgstr "Guildes" +#~ msgid "@@guild|Invite %s@@" +#~ msgstr "@@guilde|Invite %s@@" + +#~ msgid "@@party|Invite %s to join your party@@" +#~ msgstr "@@partie| Invitation de %s à joindre votre partie @@" + #~ msgid "@@split|Split@@" #~ msgstr "@@split|Partager@@" @@ -2267,6 +975,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Choisissez votre serveur The Mana World" +#~ msgid "Port:" +#~ msgstr "Port :" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Veuillez entrer l'adresse et le port du serveur." @@ -2296,3 +1007,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Poids total : %d - Poids maximal : %d" + +#~ msgid "Keep" +#~ msgstr "Conserver" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,609 +17,419 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "×§× ×”" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "מחיר: %d זהב / סה\"×› %d זהב" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "יצי××”" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "תי×ור: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "השפעה: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "עצור" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "מכר" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "ביטול" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "×שר מחיקת שחקן" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "×”×× ×תה בטוח ×›×™ ×‘×¨×¦×•× ×š למחוק ×ת השחקן?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 #, fuzzy msgid "Select Character" msgstr "צור שחקן" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "×ישור" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "חדש" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "מחק" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "הקוד×" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "הב×" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "ש×: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "רמה: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "רמה: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "זהב: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "חדש" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "מחק" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "הקוד×" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "הב×" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "×ישור" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "צור שחקן" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "ש×:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "צבע שיער:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "תיספורת:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "צור" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "החלף שרת" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "צור" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "שרת:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "×ž×©× ×” OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "גבוה" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "פורט:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "שרת:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "כן" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "ל×" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "מתחבר..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "השתמש" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "ציוד" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "הורד" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "ציוד" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "החזק" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "השתמש" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "השלך" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "הורד" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "החזק" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "בחר כמות ×—×¤×¦×™× ×œ×¡×—×•×¨." @@ -628,245 +438,148 @@ msgstr "בחר כמות ×—×¤×¦×™× ×œ×¡×—×•×¨." msgid "Select amount of items to drop." msgstr "בחר כמות ×—×¤×¦×™× ×œ×”×©×œ×™×š." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "התחברות" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "סיסמה:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "פורט:" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "זכור ×©× ×ž×©×ª×ž×©" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "הרש×" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "מצב" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "כישורי×" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "קיצור-דרך" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "הגדרות" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "×ž×™× ×™-מפה" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "הרש×" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|סחור ×¢× %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|תקוף ×ת %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, fuzzy, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "@@guild|הזמן ×ת %s@@" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "@@party|הזמן ×ת %s להצטרף למסיבה@@" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|דבר ×ל NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|ביטול@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|×”×¨× %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|החזק@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|החזק@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Use@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|השלך@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "מתחבר..." +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|תי×ור@@" -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "מתחבר..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "מתחבר..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "×שר:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "זכר" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "× ×§×‘×”" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "×©× ×”×ž×©×ª×ž×© חייב להכיל לפחות %d תוי×." -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "×©× ×”×ž×©×ª×ž×© חייב להכיל פחות מ-%d תוי×." -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "הסיסמה חייבת להכיל לפחות %d תוי×." -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "הסיסמה חייבת להכיל פחות מ-%d תוי×." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "הסיסמ×ות ××™× ×Ÿ תו×מות." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "שגי××”" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "צליל" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "עוצמת SFX" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "עוצמת מוזיקה" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "×שר" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "×תחל ×—×œ×•× ×•×ª" @@ -887,393 +600,274 @@ msgid "Keyboard" msgstr "מקלדת" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "לחץ על הכפתור בכדי להתחיל בכיול" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "כייל" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "×פשר ×’'ויסטיק" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "עצור" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "סובב ×ת המקל" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "מחק" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "ש×:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "מסך מל×" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "â€OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "סמן-עכבר מות××" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "הגבלת FPS:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "×טימות Gui" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "תווך גלילה" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "×¢×¦×œ× ×•×ª גלילה" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "×ופף FX" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "כבוי" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "× ×ž×•×š" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "גבוה" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "מסך מל×" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "מחליף למסך מל×" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "× ×“×¨×© ×יתחול כדי ×©×”×©×™× ×•×™×™× ×™×”×™×• ברי-תוקף." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "×ž×©× ×” OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "×ישור ×©×™× ×•×™×™× ×¢×‘×•×¨ OpenGL דורש ×יתחול." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "× ×“×¨×© ×יתחול כדי ×©×”×©×™× ×•×™×™× ×™×”×™×• ברי-תוקף." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "× ×“×¨×© ×יתחול כדי ×©×”×©×™× ×•×™×™× ×™×”×™×• ברי-תוקף." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "כישורי×" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "השתמש" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "רמה: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "זהב: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "רמה: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "מצב" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "התקפה %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "×”×’× ×” %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "התקפה %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "×”×’× ×” %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "עוצמה:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "זריזות:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "×—×™×•× ×™×•×ª:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "×ª×‘×•× ×”:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "×ž×™×•×ž× ×•×ª:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "הוסף" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "×תה מקבל %d זהב." @@ -1282,936 +876,43 @@ msgstr "×תה מקבל %d זהב." msgid "You give:" msgstr "×תה × ×•×ª×Ÿ:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "ביטול" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "×”×× ×תה בטוח ×›×™ ×‘×¨×¦×•× ×š למחוק ×ת השחקן?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "התקפה %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "התקפה %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "×תחל ×—×œ×•× ×•×ª" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "פצל" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "קיצור-דרך" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "×תחל ×—×œ×•× ×•×ª" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "מצב" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "ציוד" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "ציוד" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "×תחל ×—×œ×•× ×•×ª" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "×תחל ×—×œ×•× ×•×ª" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "×תחל ×—×œ×•× ×•×ª" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "×תחל ×—×œ×•× ×•×ª" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "קיצור-דרך" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "החלף שרת" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "מתחבר..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "מתחבר..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "מתחבר..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "ש×: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "מתחבר..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "ציוד" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "צור" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "×ž×™× ×™-מפה" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|תי×ור@@" - -#~ msgid "Remember Username" -#~ msgstr "זכור ×©× ×ž×©×ª×ž×©" - #~ msgid "Account and Character Management" #~ msgstr "× ×™×”×•×œ משתמש ושחקן" @@ -2242,12 +943,21 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "×× × ×”×¡×¨ %d × ×§×•×“×•×ª" +#~ msgid "Split" +#~ msgstr "פצל" + #~ msgid "Select amount of items to split." #~ msgstr "בחר כמות ×—×¤×¦×™× ×œ×¤×¦×œ." #~ msgid "Guilds" #~ msgstr "גילדות" +#~ msgid "@@guild|Invite %s@@" +#~ msgstr "@@guild|הזמן ×ת %s@@" + +#~ msgid "@@party|Invite %s to join your party@@" +#~ msgstr "@@party|הזמן ×ת %s להצטרף למסיבה@@" + #~ msgid "@@split|Split@@" #~ msgstr "@@split|פצל@@" @@ -2260,6 +970,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "בחר ×ת שרת ×”-Mana World" +#~ msgid "Port:" +#~ msgstr "פורט:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "×× × ×”×›× ×¡ ×’× ×ת כתובת ×•×’× ×ת פורט השרת." @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,603 +17,417 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Kupi" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Izlaz" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Opis: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "UÄinak: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "PoniÅ¡ti" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Potvrdi Brisanje Lika" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Da li ste sigurni da želite obrisati ovog lika?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 #, fuzzy msgid "Select Character" msgstr "Stvori Lika" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "U redu" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Novi" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "ObriÅ¡i" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Prethodni" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Slijedeći" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Ime: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Nivo: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Nivo: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Novac: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Novi" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "ObriÅ¡i" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Prethodni" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Slijedeći" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "U redu" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Stvori Lika" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Ime:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Boja kose:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Frizura:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Stvori" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Stvori" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -msgid "Party" -msgstr "" - -#: src/gui/colour.cpp:38 -msgid "Server" -msgstr "" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Da" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Ne" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Spajanje..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Upotrijebi" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Oprema" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Skini opremu" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Zalihe" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Opremi" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Upotrijebi" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Ispusti" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Skini opremu" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Opremi" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Odaberi koliÄinu predmeta za razmjenu." @@ -622,245 +436,148 @@ msgstr "Odaberi koliÄinu predmeta za razmjenu." msgid "Select amount of items to drop." msgstr "Odaberi koliÄinu predmeta za ispuÅ¡tanje." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "KorisniÄko ime" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Lozinka" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Zapamti korisniÄko ime" -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registriraj se" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Stanje" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "VjeÅ¡tine" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Kratica" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "PodeÅ¡avanje" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Karta" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registriraj se" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, c-format msgid "@@trade|Trade With %s@@" msgstr "" -#: src/gui/popupmenu.cpp:79 +#: src/gui/popupmenu.cpp:83 #, c-format msgid "@@attack|Attack %s@@" msgstr "" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Zalihe" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "Skini opremu" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Spajanje..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Spajanje..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" msgstr "" -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Spajanje..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "MuÅ¡ko" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Žensko" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "" -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "GreÅ¡ka" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -881,386 +598,270 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "ObriÅ¡i" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Ime:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." -msgstr "" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "VjeÅ¡tine" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Upotrijebi" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Nivo: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Novac: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Nivo: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Stanje" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Snaga:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Okretnost:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitalnost:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Inteligencija:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Spretnost:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" +#: src/gui/trade.cpp:61 +msgid "Add" msgstr "" -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 +#: src/gui/trade.cpp:64 msgid "Trade" msgstr "" -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "" @@ -1269,924 +870,43 @@ msgstr "" msgid "You give:" msgstr "" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Da li ste sigurni da želite obrisati ovog lika?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Razdvoji" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Kratica" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Stanje" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Zalihe" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Oprema" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Kratica" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -msgid "Select OK" -msgstr "" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Spajanje..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Spajanje..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Spajanje..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Ime: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Spajanje..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Zalihe" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Stvori" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Karta" - -#~ msgid "Remember Username" -#~ msgstr "Zapamti korisniÄko ime" - #~ msgid "Account and Character Management" #~ msgstr "Upravljanje RaÄunom i Likovima" @@ -2217,6 +937,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Molimo, oduzmi %d bodova" +#~ msgid "Split" +#~ msgstr "Razdvoji" + #~ msgid "Select amount of items to split." #~ msgstr "Odaberi koliÄinu predmeta za razdvajanje." @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,606 +17,416 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Beli" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Harga: %d GP / Jumlah: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Keluar" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Deskripsi: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Efek: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Berhenti" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Jual" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Batal" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Pilih Karakter" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Buat baru" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Hapus" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Sebelumnya" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Berikutnya" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Nama: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Tingkatan: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Tingkatan: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Uang: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Buat baru" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Hapus" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Sebelumnya" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Berikutnya" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Buat Karakter" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Nama:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Warna Rambut:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Gaya Rambut:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Buat" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Pilih Karakter" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Buat" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Mengubah OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "tinggi" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Port:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Ya" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Tidak" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Menyambung..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Gunakan" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Perlengkapan" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventaris" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Gunakan" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Jatuh" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" msgstr "" #: src/gui/item_amount.cpp:76 @@ -627,245 +437,148 @@ msgstr "Pilih jumlah item yang mau di perdagangkan" msgid "Select amount of items to drop." msgstr "Pilih jumlah item yang mau di buang" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Login" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Kata Sandi:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Pertahankan" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Mendaftar" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Status" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Keahlian" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Tombol Singkat" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Atur" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "MiniMap" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Mendaftar" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Dagang Dengan %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Serang%s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventaris" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Bicara dengan NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Batal@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Ambil %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Melengkapi@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Melengkapi@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Gunakan@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Buang@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Deskripsi@@" -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Menyambung..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Menyambung..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Menyambung..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Konfirmasi:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Panjang username setidak-tidaknya %d karakter" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Kata sandi tidak sama." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Kesalahan" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Suara" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volume sfx" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Volume Musik" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Terapkan" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -886,393 +599,274 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Tekan tombol untuk memulai kalibrasi" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Kalibrasi" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Membolehkan joistik" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Berhenti" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Memutar tongkat" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Hapus" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Nama:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Layar penuh" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Batas FPS" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Radius gulungan" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "mati" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "rendah" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "tinggi" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Layar penuh" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Mengganti ke layar penuh" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Memulai dari awal di butuhkan untuk melihat efek" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Mengubah OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Memulai dari awal di butuhkan untuk melihat efek" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Memulai dari awal di butuhkan untuk melihat efek" - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Keahlian" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Gunakan" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Tingkatan: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Uang: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Tingkatan: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Status" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Serangan %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Pertahanan %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Serangan %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Pertahanan %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Kekuatan" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Daya/Tenaga Hidup" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Daya/Tenaga Hidup" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Kecerdasan" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Ketangkasan" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Tambah" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Anda mendapatkan %d GP." @@ -1281,927 +875,43 @@ msgstr "Anda mendapatkan %d GP." msgid "You give:" msgstr "Anda memberikan:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Batal" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Serangan %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Serangan %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Pecah" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Tombol Singkat" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Status" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventaris" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Perlengkapan" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Tombol Singkat" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Pilih Karakter" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Menyambung..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Menyambung..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Menyambung..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Nama: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Menyambung..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventaris" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Buat" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "MiniMap" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Deskripsi@@" - #~ msgid "Unregister" #~ msgstr "Tidak terdaftar" @@ -2220,6 +930,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Tolong hilangkan %d point" +#~ msgid "Split" +#~ msgstr "Pecah" + #~ msgid "Select amount of items to split." #~ msgstr "Pilih jumlah item yang mau di pisahkan" @@ -2238,6 +951,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Pilih Server Mana World" +#~ msgid "Port:" +#~ msgstr "Port:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Tolong tulis address dan port dari server" @@ -2264,3 +980,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Jumlah Berat: %d - Berat Maksimum: %d" + +#~ msgid "Keep" +#~ msgstr "Pertahankan" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2007-12-03 01:45+0000\n" "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n" "Language-Team: Italian\n" @@ -19,608 +19,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Compra" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Prezzo: %d GP / Totale: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Esci" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Descrizione : %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effetto : %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Ferma" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Vendi" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Cancella" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Sei sicuro di voler cancellare questo personaggio?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Scelta Personaggio" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Nuovo" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Elimina" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Precedente" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Prossimo" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Nome : %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Livello: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Livello: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Monete: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Nuovo" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Elimina" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Precedente" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Prossimo" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Crea Personaggio" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Nome :" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Colore Capelli" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Stile Capelli:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Create" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Scelta Personaggio" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Create" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Modifica OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "Alto" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Porta:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Si" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "No" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Connessione..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Usa" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Equipaggiamento" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Rimuovi" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventario" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Equipaggia" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Usa" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Lascia" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Rimuovi" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Equipaggia" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Seleziona la quantità di oggetti da scambiare." @@ -629,245 +439,148 @@ msgstr "Seleziona la quantità di oggetti da scambiare." msgid "Select amount of items to drop." msgstr "Seleziona la quantità di oggetti da lasciare." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Autenticazione" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Password:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Porta:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Mantieni" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registra" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Stato" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Abilità " -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Scorciatoia" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Impostazioni" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Mini mappa" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registra" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Scambia Con %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Attacca %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventario" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Parla con NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Cancella@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Raccogli %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Equipaggia@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Equipaggia@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@usa|Usa@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Lascia@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Connessione..." +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Descrizione@@" -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Connessione..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Connessione..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Conferma:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "La password deve contenere meno di %d caratteri." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Le password non corrispondono." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Errore" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Suono" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volume effetti sonori" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Volume musica" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Applica" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Resetta finestre" @@ -888,393 +601,274 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Premi il pulsante per cominciare la calibrazione" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Calibra" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Abilita joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Ferma" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Ruota la manopola" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Elimina" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Nome :" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Schermo intero" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Cursore personalizzato" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Limita FPS:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Opacità IU" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Raggio dello scroll" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Lentezza dello scroll" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Suoni ambientali" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "Spento" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "Basso" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "Alto" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Schermo intero" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Modalità a schermo intero" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Modifica OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Applicare le modifiche ad OpenGL richiede il riavvio." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Abilità " - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Usa" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Livello: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Monete: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Livello: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Stato" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Attacco %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Difesa %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Attacco %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Difesa %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Forza:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Agilità :" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitalità :" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Intelligenza:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Destrezza:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Aggiungi" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Ottieni %d GP." @@ -1283,933 +877,43 @@ msgstr "Ottieni %d GP." msgid "You give:" msgstr "Dai:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Cancella" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Sei sicuro di voler cancellare questo personaggio?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Attacco %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Attacco %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Resetta finestre" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Lascia" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Scorciatoia" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Resetta finestre" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Stato" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventario" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Equipaggiamento" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Resetta finestre" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Resetta finestre" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Resetta finestre" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Resetta finestre" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Scorciatoia" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Scelta Personaggio" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Connessione..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Connessione..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Connessione..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Nome : %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Connessione..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventario" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Create" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Mini mappa" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Descrizione@@" - #~ msgid "Unregister" #~ msgstr "Cancella registrazione" @@ -2228,6 +932,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Prego rimuovi %d punti" +#~ msgid "Split" +#~ msgstr "Lascia" + #~ msgid "Select amount of items to split." #~ msgstr "Seleziona la quantità di oggetti da lasciare." @@ -2246,6 +953,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Scegli il tuo server Mana World" +#~ msgid "Port:" +#~ msgstr "Porta:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Per favore inserisci l'indirizzo e la porta del server." @@ -2272,3 +982,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Peso totale : %d - Peso massimo : %d" + +#~ msgid "Keep" +#~ msgstr "Mantieni" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-06-28 16:27+0000\n" "Last-Translator: fate <Unknown>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -17,603 +17,415 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "è²·ã†" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "ä¾¡æ ¼: %d GP / åˆè¨ˆ: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "終了" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "å状: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "効用: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "å–消" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "ã“ã®ã‚ャラã¯æ¶ˆã—ã¦ã‚‚ã„ã„ã§ã™ã‹?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "ã‚ャラをé¸æŠž" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "了解" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "æ–°è¦" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "削除" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "å‰ã¸" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "次ã¸" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "åå‰: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "レベル: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "レベル: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "GP: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "æ–°è¦" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "削除" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "å‰ã¸" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "次ã¸" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "了解" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "ã‚ャラを作æˆ" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "åå‰:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "髪ã®è‰²ï¼š" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "髪型：" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "作æˆ" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "ã‚ャラをé¸æŠž" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "作æˆ" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "サーãƒ:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "ãƒãƒ¼ãƒˆ:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "サーãƒ:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "ã¯ã„" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "ã„ã„ãˆ" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "接続ã—ã¦ã„ã¾ã™..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "使ã†" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "使ã†" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" msgstr "" #: src/gui/item_amount.cpp:76 @@ -624,244 +436,148 @@ msgstr "" msgid "Select amount of items to drop." msgstr "" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "ãƒã‚°ã‚¤ãƒ³" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "パスワード:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "ãƒãƒ¼ãƒˆ:" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "状態" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "セットアップ" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -msgid "Reset" -msgstr "" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, c-format msgid "@@trade|Trade With %s@@" msgstr "" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|%sを攻撃ã™ã‚‹@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|NPCã‚’å–‹ã‚‹@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|使ã†@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|使ã†@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" msgstr "" -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "接続ã—ã¦ã„ã¾ã™..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "接続ã—ã¦ã„ã¾ã™..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "接続ã—ã¦ã„ã¾ã™..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "パスワードãŒä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“。" -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "エラー" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -882,385 +598,270 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "削除" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "åå‰:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." -msgstr "" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." -msgstr "" - -#: src/gui/skill.cpp:41 -msgid "skills.xml" -msgstr "" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "使ã†" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "レベル: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "GP: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "レベル: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "状態" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "ç‹åŠ›:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "ç´ æ—©ã•:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "体力:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "知性:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "æ•æ·:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" +#: src/gui/trade.cpp:61 +msgid "Add" msgstr "" -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 +#: src/gui/trade.cpp:64 msgid "Trade" msgstr "" -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "" @@ -1269,915 +870,43 @@ msgstr "" msgid "You give:" msgstr "" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "å–消" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "ã“ã®ã‚ャラã¯æ¶ˆã—ã¦ã‚‚ã„ã„ã§ã™ã‹?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "分割" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, c-format -msgid "Item Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "状態" - -#: src/keyboardconfig.cpp:73 -msgid "Inventory Window" -msgstr "" - -#: src/keyboardconfig.cpp:74 -msgid "Equipment WIndow" -msgstr "" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, c-format -msgid "Emote Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "ã‚ャラをé¸æŠž" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "接続ã—ã¦ã„ã¾ã™..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "接続ã—ã¦ã„ã¾ã™..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "接続ã—ã¦ã„ã¾ã™..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "åå‰: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "接続ã—ã¦ã„ã¾ã™..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -msgid "Invite to party" -msgstr "" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "作æˆ" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - #~ msgid "Unregister" #~ msgstr "登録削除" @@ -2187,9 +916,15 @@ msgstr "" #~ msgid "Please distribute %d points" #~ msgstr "%d ãƒã‚¤ãƒ³ãƒˆã‚’å–り分ã‘ãã ã•ã„" +#~ msgid "Split" +#~ msgstr "分割" + #~ msgid "Email:" #~ msgstr "Eメール：" +#~ msgid "Port:" +#~ msgstr "ãƒãƒ¼ãƒˆ:" + #~ msgid "Confirm" #~ msgstr "確èª" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2009-01-18 16:53+0000\n" "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n" "Language-Team: Dutch\n" @@ -17,616 +17,416 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Kopen" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Afsluiten" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Beschrijving: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effect: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "Winkel" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Verkopen" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Annuleren" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Weet je zeker dat je deze personage wilt verwijderen?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Kies Personage" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "OK" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Nieuw" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Verwijderen" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Vorige" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Volgende" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Naam: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Level: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, c-format msgid "Job Level: %d" msgstr "" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Geld: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Nieuw" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Verwijderen" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Vorige" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Volgende" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "OK" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "Goud: %d" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Personage Aanmaken" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Naam:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Haarkleur:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Haarstijl:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Aanmaken" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "Server Selecteren" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "OK" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Aanmaken" - -#: src/gui/chat.cpp:146 -#, fuzzy -msgid "Global announcement: " -msgstr "/announce: Globale aankondiging (alleen voor GM)" +#: src/gui/chat.cpp:115 +msgid "Global announcement:" +msgstr "" -#: src/gui/chat.cpp:151 -#, fuzzy, c-format -msgid "Global announcement from %s: " -msgstr "/announce: Globale aankondiging (alleen voor GM)" +#: src/gui/chat.cpp:118 +#, c-format +msgid "Global announcement from %s:" +msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -#, fuzzy -msgid "Unknown item" -msgstr "Onbekende opdracht" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" +msgid "%s whispers:" +msgstr "%s fluistert:" -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "Onbekende opdracht" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "Zitten niet mogelijk!" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "Het ziet ernaar uit dat je meer geld nodig hebt... ;-)" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "Je draagt teveel bij je om dit te doen!" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Veranderen van OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "/announce: Globale aankondiging (alleen voor GM)" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "/who: Geef het aantal online gebruikers weer" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "Commando: /announce <msg>" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "Commando: /clear" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "Commando: /help" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "Commando: /help <commando>" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -#, fuzzy -msgid "Command: /present" -msgstr "Commando: /where" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -#, fuzzy -msgid "Command: /record <filename>" -msgstr "Commando: /clear" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -#, fuzzy -msgid "Command: /record" -msgstr "Commando: /clear" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -#, fuzzy -msgid "Command: /toggle <state>" -msgstr "Commando: /announce <msg>" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -#, fuzzy -msgid "Command: /toggle" -msgstr "Commando: /clear" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "Commando: /where" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -#, fuzzy -msgid "Command: /msg <nick> <msg>" -msgstr "Commando: /announce <msg>" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "Type /help voor een lijst van commando's." -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "hoog" - -#: src/gui/colour.cpp:34 -#, fuzzy -msgid "Player" -msgstr "Spelers" - -#: src/gui/colour.cpp:35 -#, fuzzy -msgid "Whisper" -msgstr "%s fluistert:" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Spelen" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Ja" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Nee" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Verbinden..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Gebruiken" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Uitrusting" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Afdoen" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "Sluiten" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventaris" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Uitrusten" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Gebruiken" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Neerleggen" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " -msgstr "" +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "Gewicht: %d / %d" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Afdoen" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Uitrusten" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Selecteer het aantal exemplaren om te verhandelen" @@ -635,244 +435,147 @@ msgstr "Selecteer het aantal exemplaren om te verhandelen" msgid "Select amount of items to drop." msgstr "Selecteer het aantal exemplaren om neer te leggen" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Inloggen" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Wachtwoord:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Poort:" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Behouden" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Onthoud Naam" -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Aanmelden" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Status" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Vaardigheden" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Sneltoets" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Configureren" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Kaartje" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Aanmelden" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Handelen met %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|%s aanvallen@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventaris" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Praat met NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Annuleren@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|%s oppakken@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Uitrusten@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Gebruiken@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Neerleggen@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Verbinden..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Beschrijving@@" -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Verbinden..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Verbinden..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Bevestigen:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Mannelijk" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Vrouwelijk" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Wachtwoorden komen niet overeen." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Fout" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Geluid" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volume van geluiden" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Muziek volume" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Toepassen" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Vensters in beginstand" @@ -893,381 +596,262 @@ msgid "Keyboard" msgstr "Toetsenbord" #: src/gui/setup.cpp:94 -#, fuzzy -msgid "Colors" -msgstr "Sluiten" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "Spelers" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Druk op de knop om het kalibreren te starten" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Kalibreren" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Joystick activeren" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Stoppen" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Maak rondjes met de stick" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "Toewijzen" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 msgid "Default" msgstr "Standaard" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 msgid "Name" msgstr "Naam" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "Relatie" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "Neutraal" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "Vriend" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "Genegeerd" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Volledig scherm" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Aangepaste cursor" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "FPS limiet:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Dekking van de GUI" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Scroll radius" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Scroll vertraging" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Omgevingseffecten" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "uit" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "laag" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "hoog" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "gemiddeld" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "max" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Volledig scherm" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Overgaan naar volledig scherm" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "De veranderingen worden pas actief na opnieuw opstarten" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Veranderen van OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "De veranderingen worden pas actief na opnieuw opstarten" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "De veranderingen worden pas actief na opnieuw opstarten" - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Vaardigheden" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Gebruiken" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "Geld: %d GP" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -msgid "Job:" -msgstr "" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "Totaal" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "Kosten" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 msgid "Strength" msgstr "" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 msgid "Intelligence" msgstr "" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Toevoegen" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Jij krijgt %d GP." @@ -1276,948 +860,42 @@ msgstr "Jij krijgt %d GP." msgid "You give:" msgstr "Je geeft:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "Actualiseren..." -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "Spelen" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "Voltooid" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Annuleren" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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 -#, fuzzy -msgid "Trade completed." -msgstr "Voltooid" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "Naamloos" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, c-format -msgid "ItemDB: Ignoring unknown sound event '%s'" -msgstr "" - -#: src/resources/monsterdb.cpp:44 -#, fuzzy -msgid "unnamed" -msgstr "Naamloos" - -#: src/resources/monsterdb.cpp:46 -msgid "Initializing monster database..." -msgstr "" - -#: src/resources/monsterdb.cpp:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -#, fuzzy -msgid "Saving screenshot failed!" -msgstr "Zitten niet mogelijk!" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Weet je zeker dat je deze personage wilt verwijderen?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -#, fuzzy -msgid "Talk" -msgstr "Totaal" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -#, fuzzy -msgid "Target Player" -msgstr "Spelers" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Vensters in beginstand" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Splitsen" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Sneltoets" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Vensters in beginstand" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Status" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventaris" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Uitrusting" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Vensters in beginstand" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Vensters in beginstand" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Vensters in beginstand" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Vensters in beginstand" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Sneltoets" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Server Selecteren" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Verbinden met de account server..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Verbinden met de karakter server..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Verbinden met de map server..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Naam: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "De verbinding met de server werd verbroken!" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "Verbinden met de map server..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "Verbinden met de karakter server..." -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "Verbinden met de account server..." -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventaris" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -#, fuzzy -msgid "Command: /party <command> <args>" -msgstr "Commando: /help <commando>" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Aanmaken" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -#, fuzzy -msgid "Command: /party new <party-name>" -msgstr "Commando: /announce <msg>" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -#, fuzzy -msgid "Command: /party prefix" -msgstr "Commando: /clear" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -#, fuzzy -msgid "Command: /party leave" -msgstr "Commando: /clear" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -#, fuzzy -msgid "Unknown /party command." -msgstr "Onbekende opdracht" - -#: src/party.cpp:215 -#, fuzzy -msgid "Type /help party for a list of options." -msgstr "Type /help voor een lijst van commando's." - -#, fuzzy -#~ msgid "Weight: %d g / %d g" -#~ msgstr "Gewicht: %d / %d" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Kaartje" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Beschrijving@@" - -#~ msgid "Remember Username" -#~ msgstr "Onthoud Naam" - #~ msgid "Unregister" #~ msgstr "Registreren" @@ -2236,6 +914,9 @@ msgstr "Type /help voor een lijst van commando's." #~ msgid "Please remove %d points" #~ msgstr "Verwijder alstublieft %d punten" +#~ msgid "Split" +#~ msgstr "Splitsen" + #~ msgid "Switch server" #~ msgstr "Van server wisselen" @@ -2248,6 +929,9 @@ msgstr "Type /help voor een lijst van commando's." #~ msgid "Choose your Mana World Server" #~ msgstr "Kies uw Mana World server" +#~ msgid "Port:" +#~ msgstr "Poort:" + #~ msgid "Confirm" #~ msgstr "Bevestigen" @@ -2256,3 +940,6 @@ msgstr "Type /help voor een lijst van commando's." #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Totaal gewicht: %d - Maximum gewicht: %d" + +#~ msgid "Keep" +#~ msgstr "Behouden" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-10-10 05:26+0000\n" "Last-Translator: MichaÅ‚ Trzebiatowski <Unknown>\n" "Language-Team: <pl@li.org>\n" @@ -19,608 +19,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Kup" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Cena: %d GP / Razem: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Wyjdź" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Opis: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Efekt: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Zatrzymaj" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Sprzedaj" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Anuluj" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Czy jesteÅ› pewien, że chcesz usunąć tÄ™ postać?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Wybierz postać" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Nowa" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "UsuÅ„" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Poprzedni" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "NastÄ™pny" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "ImiÄ™: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Poziom: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Poziom: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "PieniÄ…dze: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Nowa" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "UsuÅ„" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Poprzedni" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "NastÄ™pny" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Stwórz postać" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "ImiÄ™:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Kolor wÅ‚osów:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Fryzura:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Stwórz" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Wybierz postać" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Stwórz" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Serwer:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "ZmieÅ„ ustawienia OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "wysokie" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Port:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Serwer:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Tak" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Nie" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "ÅÄ…czenie..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Użyj" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Ekwipunek" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Zdejmij" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inwentarz" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Załóż" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Użyj" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Upuść" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Zdejmij" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Załóż" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Wybierz ilość przedmiotów do wymiany." @@ -629,245 +439,148 @@ msgstr "Wybierz ilość przedmiotów do wymiany." msgid "Select amount of items to drop." msgstr "Wybierz ilość przedmiotów do upuszczenia." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Użytkownik" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "HasÅ‚o:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Zachowaj" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Rejestruj" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Stan" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "ZdolnoÅ›ci" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Skrót" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Konfiguracja" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "MiniMapa" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Rejestruj" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Targ z %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Atakuj %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inwentarz" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Rozmawiaj z NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Anuluj@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|PodnieÅ› %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Załóż@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Załóż@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Użyj@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Upuść@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "ÅÄ…czenie..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "ÅÄ…czenie..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "ÅÄ…czenie..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Opis@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Potwierdź:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Mężczyzna" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Kobieta" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, 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." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "HasÅ‚a nie zgadzajÄ… siÄ™." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "BÅ‚Ä…d" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "DźwiÄ™k" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "GÅ‚oÅ›ność efektów dźwiÄ™kowych" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "GÅ‚oÅ›ność muzyki" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Zastosuj" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Zresetuj okna" @@ -888,394 +601,275 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "WciÅ›nij przycisk aby rozpocząć kalibracjÄ™" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Kalibruj" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "WÅ‚Ä…cz joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Zatrzymaj" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Obróć drążek" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "UsuÅ„" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "ImiÄ™:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "PeÅ‚en ekran" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "WÅ‚asny kursor" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Limit FPS:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Przezroczystość GUI" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Skok przy przewijaniu ekranu" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Opóźnienie przy przewijaniu ekranu" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "DźwiÄ™ki otoczenia" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "wyÅ‚Ä…czone" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "niskie" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "wysokie" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "PeÅ‚en ekran" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "PrzeÅ‚Ä…czanie na peÅ‚en ekran" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "ZmieÅ„ ustawienia OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "ZdolnoÅ›ci" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Użyj" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Poziom: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "PieniÄ…dze: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Poziom: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Stan" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Atak %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Obrona %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Atak %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Obrona %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "SiÅ‚a:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Zwinność:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Witalność:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Inteligencja:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "ZrÄ™czność:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Dodaj" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Otrzymujesz %d GP" @@ -1284,933 +878,43 @@ msgstr "Otrzymujesz %d GP" msgid "You give:" msgstr "Dajesz:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Anuluj" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Czy jesteÅ› pewien, że chcesz usunąć tÄ™ postać?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Atak %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Atak %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Zresetuj okna" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Podziel" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Skrót" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Zresetuj okna" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Stan" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inwentarz" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Ekwipunek" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Zresetuj okna" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Zresetuj okna" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Zresetuj okna" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Zresetuj okna" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Skrót" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Wybierz postać" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "ÅÄ…czenie..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "ÅÄ…czenie..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "ÅÄ…czenie..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "ImiÄ™: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "ÅÄ…czenie..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inwentarz" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Stwórz" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "MiniMapa" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Opis@@" - #~ msgid "Unregister" #~ msgstr "Wyrejestruj" @@ -2232,6 +936,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "ProszÄ™ usunąć %d punktów" +#~ msgid "Split" +#~ msgstr "Podziel" + #~ msgid "Select amount of items to split." #~ msgstr "Wybierz ilość przedmiotów do podziaÅ‚u." @@ -2250,6 +957,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Wybierz serwer Mana World" +#~ msgid "Port:" +#~ msgstr "Port:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "ProszÄ™ wpisać adres i port serwera" @@ -2276,3 +986,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "CaÅ‚kowita waga: %d - Maksymalna waga: %d" + +#~ msgid "Keep" +#~ msgstr "Zachowaj" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-02-03 10:14+0000\n" "Last-Translator: Tiago Silva <Unknown>\n" "Language-Team: Portuguese <pt@li.org>\n" @@ -17,608 +17,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Comprar" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Preço: %d GP / Total: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Sair" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Descrição: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Efeito: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Parar" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Vender" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Cancelar" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Tem a certeza que quer apagar este personagem" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Seleccione um Personagem" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Novo" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Eliminar" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Anterior" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Seguinte" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Nome: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "NÃvel: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "NÃvel: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Dinheiro: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Novo" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Eliminar" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Anterior" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Seguinte" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Criar Personagem" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Nome:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Cor de Cabelo:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Estilo do Cabelo:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Criar" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Seleccione um Personagem" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Criar" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Servidor:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Mudando OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "elevado" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Porta:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Servidor:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Sim" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Não" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Usar" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Equipamento" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Desequipar" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventário" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Equipar" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Usar" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Largar" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Desequipar" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Equipar" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Seleccionar a quantidade de itens a negociar." @@ -627,245 +437,148 @@ msgstr "Seleccionar a quantidade de itens a negociar." msgid "Select amount of items to drop." msgstr "Seleccionar a quantidade de itens a largar." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Autenticar" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Senha:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Porta:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Manter" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registo" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Estado" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Competências" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Atalho" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Configuração" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "MiniMapa" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registo" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Negociar com %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Atacar %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventário" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Falar com o NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Cancelar@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Apanhar %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Equipar@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Equipar@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Usar@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Largar@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Conectando..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Conectando..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Conectando..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@descrição|Descrição@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Confirmar:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "A password só pode ter até %d caracteres." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "As senhas não coincidem." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Erro" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Som" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volume dos Efeitos" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Volume da Música" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Aplicar" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Reiniciar Janelas" @@ -886,401 +599,282 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Pressione o botão para começar a calibragem" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Calibrar" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Habilitar Joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Parar" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Rode o manipulo" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Eliminar" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Nome:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Ecrã completo" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Cursor personalizado" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Limite de FPS:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Opacidade do Interface" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Efeitos Ambientais" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "desligado" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "baixo" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "elevado" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Ecrã completo" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Mudar para ecrã completo" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "É necessário reiniciar para as alterações terem efeito." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Mudando OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "É necessário reiniciar para as alterações terem efeito." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "É necessário reiniciar para as alterações terem efeito." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Competências" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Usar" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "NÃvel: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Dinheiro: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "NÃvel: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "Estado" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "" "Copy text \t\r\n" "Ataque %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "" "Copy text \t\r\n" "Defesa %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "" "Copy text \t\r\n" "Ataque %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "" "Copy text \t\r\n" "Defesa %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Força:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Agilidade:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitalidade:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Inteligência:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Destreza:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Adicionar" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Recebe %d GP." @@ -1289,937 +883,43 @@ msgstr "Recebe %d GP." msgid "You give:" msgstr "Dá:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Cancelar" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Tem a certeza que quer apagar este personagem" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "" -"Copy text \t\r\n" -"Ataque %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "" -"Copy text \t\r\n" -"Ataque %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Reiniciar Janelas" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Dividir" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Atalho" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Reiniciar Janelas" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Estado" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventário" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Equipamento" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Reiniciar Janelas" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Reiniciar Janelas" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Reiniciar Janelas" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Reiniciar Janelas" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Atalho" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Seleccione um Personagem" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Conectando..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Conectando..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Conectando..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Nome: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Conectando..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventário" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Criar" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "MiniMapa" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@descrição|Descrição@@" - #~ msgid "Unregister" #~ msgstr "Remover o Registo" @@ -2238,6 +938,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Por favor remova %d pontos" +#~ msgid "Split" +#~ msgstr "Dividir" + #~ msgid "Select amount of items to split." #~ msgstr "Seleccionar a quantidade de itens a dividir." @@ -2256,6 +959,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Escolha o seu Servidor de Mana World" +#~ msgid "Port:" +#~ msgstr "Porta:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Por favor escreva o endereço e a porta do servidor." @@ -2282,3 +988,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Peso Total: %d - Peso Máximo: %d" + +#~ msgid "Keep" +#~ msgstr "Manter" diff --git a/po/pt_BR.po b/po/pt_BR.po index 82845f7b..4f3948fd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2009-01-21 20:48+0000\n" "Last-Translator: Bruno <brunorafaelcardoso@gmail.com>\n" "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n" @@ -17,620 +17,415 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Comprar" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Preço: %d GP / Total: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Sair" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Descrição: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Efeito: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "Loja" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Vender" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Cancelar" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Confimar exclusão do personagem" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Tem certeza que deseja excluir este personagem?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Selecionar personagem" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Novo" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Excluir" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Anterior" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Próximo" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Nome: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "NÃvel: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, c-format msgid "Job Level: %d" msgstr "NÃvel de Trabalho: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Dinheiro: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Novo" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Excluir" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Anterior" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Próximo" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "Ouro: %d" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Criar Personagem" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Nome:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Cor do Cabelo:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Estilo do Cabelo:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Criar" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "Selecionar Servidor" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "OK" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Criar" - -#: src/gui/chat.cpp:146 -#, fuzzy -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "Anúncio geral:" -#: src/gui/chat.cpp:151 -#, fuzzy, c-format -msgid "Global announcement from %s: " +#: src/gui/chat.cpp:118 +#, c-format +msgid "Global announcement from %s:" msgstr "Anúncio geral de %s:" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Servidor:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 +#, c-format +msgid "%s whispers:" +msgstr "%s sussura:" + +#: src/gui/chat.cpp:276 #, c-format msgid "Whispering to %s: %s" msgstr "Sussurrando para %s: %s" -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -#, fuzzy -msgid "Unknown item" -msgstr "Comando desconhecido" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." -msgstr "" - -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "Comando desconhecido" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "Falha na negociação!" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "Falha no Emote!" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "Falha ao sentar!" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "Falha ao criar Chat!" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "Impossivel entrar no grupo!" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "Impossivel gritar!" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "Você ainda não tem nivel necessário!" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "HP insuficiente!" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "SP insuficiente!" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "Você não tem nenhuma nota armazenada" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "Você não pode fazer isso agora!" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "Parece que você precisa de mais Zenyz... ;-)" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "Você não pode usar essa Skill com esse tipo de arma." -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "Você precisa de outra gema vermelha!" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "Você precisa de outra gema azul!" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "Você está com muita carga para fazer isso!" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "Hã? O que é isso?" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "Falha ao transportar..." -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "Não foi possÃvel roubar nada..." -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "Veneno não surtiu efeito..." -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Trocando OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "--Ajuda--" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "/announce: Aviso geral (Apenas GM)" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "/clear: limpa esta janela" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "/help: Mostra esta ajuda" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -#, fuzzy -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "/w <nick> <mensagem>: Forma mais curta para /whisper" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "/where: mostra o nome do mapa" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" -msgstr "/w <nick> <mensagem>: Forma mais curta para /whisper" - -#: src/gui/chat.cpp:804 +#: src/gui/chat.cpp:496 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "/whisper <nick> <mensagem>: Envia uma mensagem particular" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" +msgstr "/w <nick> <mensagem>: Forma mais curta para /whisper" + +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "/who Mostra os jogadores online" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "Para mais informações, digite /help <comando>" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "Comandos: /announce <msg>" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "*** Disponivel apenas para GM's ***" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "Este comando envia uma mensagem <msg> para todos os jogadores online." -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "Comandos: /clear" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "Limpa os logs do chat anterior." -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "Comando: /help" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "Exibe uma lista de todos os comandos disponiveis." -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "Comando: /help <comando>" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "Exibe o conteudo de ajuda de <comando>" -#: src/gui/chat.cpp:836 -#, fuzzy -msgid "Command: /present" -msgstr "Comando: /where" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -#, fuzzy -msgid "Command: /record <filename>" -msgstr "Comandos: /clear" - -#: src/gui/chat.cpp:844 -#, fuzzy -msgid "This command starts recording the chat log to the file <filename>." -msgstr "Limpa os logs do chat anterior." - -#: src/gui/chat.cpp:846 -#, fuzzy -msgid "Command: /record" -msgstr "Comandos: /clear" - -#: src/gui/chat.cpp:847 -#, fuzzy -msgid "This command finishes a recording session." -msgstr "Exibe o conteudo de ajuda de <comando>" - -#: src/gui/chat.cpp:851 -#, fuzzy -msgid "Command: /toggle <state>" -msgstr "Comandos: /announce <msg>" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -#, fuzzy -msgid "Command: /toggle" -msgstr "Comandos: /clear" - -#: src/gui/chat.cpp:859 -#, fuzzy -msgid "This command displays the return toggle status." -msgstr "Mostra o nome do mapa atual." - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "Comando: /where" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "Mostra o nome do mapa atual." -#: src/gui/chat.cpp:869 -#, fuzzy -msgid "Command: /msg <nick> <msg>" -msgstr "Comando: /w <nick> <msg>" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "Comando: /whisper <nick> <msg>" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "Comando: /w <nick> <msg>" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "Envia uma mensagem <msg> para <nick>." -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "Se <nick> possuir espaços, coloque dentro de parenteses (\")." -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "Comando: /who" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "Exibe o total de jogadores online." -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "Digite /help para uma lista de todos os comandos." -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "alto" - -#: src/gui/colour.cpp:34 -#, fuzzy -msgid "Player" -msgstr "Jogadores" - -#: src/gui/colour.cpp:35 -#, fuzzy -msgid "Whisper" -msgstr "%s sussura:" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Jogar" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Servidor:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Sim" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Não" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Usar" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Equipamento" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Desequipar" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "Ajuda" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "Fechar" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventório" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Equipar" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Usar" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Descartar" -#: src/gui/inventorywindow.cpp:84 -#, fuzzy -msgid "Slots: " -msgstr "Pontos de habilidade: %d" +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "Capacidade: %d / %d" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " -msgstr "" +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" +msgstr "Slots usados: %d/%d" + +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Desequipar" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Equipar" #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." @@ -640,244 +435,147 @@ msgstr "Selecionar montante de itens para negociar." msgid "Select amount of items to drop." msgstr "Selecionar montante de itens para descartar." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Login" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Senha:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Porta:" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "Manter" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Lembrar nome de usuário" -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registrar" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Status" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Habilidades" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Atalho" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Configurar" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "MiniMapa" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registrar" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@Negociar|Negociar com %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@atacar|Atacar %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, fuzzy, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "Desconsiderado" - -#: src/gui/popupmenu.cpp:89 -#, fuzzy, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "@@guilda|convidar %s@@" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "@@grupo|Convidar %s para entrar para o seu grupo" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@falar|Falar com NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancelar|Cancelar@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pegar|Pegar %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "@@usar|Desequipar@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@usar|Equipar@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@usar|Usar@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@descartar|Descartar@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Conectando..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Conectando..." +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@descrição|Descrição@@" -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Conectando..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Confirmar:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Homem" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Mulher" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "A senha deve ser menor que %d caracteres." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Senhas não conferem." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Erro" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Som" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volume Sfx" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Volume da Música" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Aplicar" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Restaurar janelas" @@ -898,384 +596,262 @@ msgid "Keyboard" msgstr "Teclado" #: src/gui/setup.cpp:94 -#, fuzzy -msgid "Colors" -msgstr "Fechar" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "Jogadores" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Aperto o botão para começar a calibração" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Calibrar" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Habilitar joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Parar" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Gire o bastão" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "Atribuir" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 msgid "Default" msgstr "Padrão" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "Conflitos nas teclas detectado." -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha." -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 msgid "Name" msgstr "Nome" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "Relação" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "Neutro" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "Amigo" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "Desconsiderado" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "Ignorado" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "Salvar lista de jogadores" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "Permitir trocas" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "Permitir sussuros" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "Quando ignorado:" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Tela cheia" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Cursor customizado" -#: src/gui/setup_video.cpp:120 -#, fuzzy -msgid "Particle effects" -msgstr "Detalhe de partÃculas" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Limite FPS:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Opacidade da GUI" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Rolar radius" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Rolar Laziness" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Ambiente FX" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "Detalhe de partÃculas" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "desligado" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "baixo" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "alto" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "médio" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "máximo" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Tela cheia" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Mudando para Tela cheia" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "É preciso reiniciar para as mudanças terem efeito." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Trocando OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "É preciso reiniciar para as mudanças terem efeito." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "É preciso reiniciar para as mudanças terem efeito." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Habilidades" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" +msgstr "Habilidade Mistério" -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "Pontos de habilidade: %d" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "Acima" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Usar" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "Trabalho: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "Dinheiro: %d GP" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Trabalho: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "Status" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "Total" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "Custo" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "Ataque:" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "Defesa:" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "M. Ataque:" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "M. Defesa:" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "% Acuracidade:" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "% Evasão:" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "% Reflexo:" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 msgid "Strength" msgstr "Força" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "Agilidade" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "Vitalidade" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 msgid "Intelligence" msgstr "Inteligência" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "Destreza" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "Sorte" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "Pontos de Status Restantes: %d" -#: src/gui/trade.cpp:49 -#, fuzzy -msgid "Trade: You" -msgstr "Comércio" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "Comércio" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Adicionar" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "Comércio" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Voc pegou %d GP." @@ -1284,969 +860,43 @@ msgstr "Voc pegou %d GP." msgid "You give:" msgstr "Você dá:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" "Falha ao adicionar item. Você não pode duplicar um tipo de item na janela." -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "Atualizando..." -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "Jogar" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "ConcluÃdo" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -#, fuzzy -msgid "You are not that alive anymore." -msgstr "Você não pode fazer isso agora!" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -#, fuzzy -msgid "You are no more." -msgstr "Você não tem nenhuma nota armazenada" - -#: src/net/playerhandler.cpp:234 -#, fuzzy -msgid "You have ceased to be." -msgstr "Você não tem nenhuma nota armazenada" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Comércio" - -#: src/net/tradehandler.cpp:128 -#, fuzzy -msgid " cancelled" -msgstr "Cancelar" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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 -#, fuzzy -msgid "Trade canceled." -msgstr "Falha na negociação!" - -#: src/net/tradehandler.cpp:214 -#, fuzzy -msgid "Trade completed." -msgstr "ConcluÃdo" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "Sem nome" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, c-format -msgid "ItemDB: Ignoring unknown sound event '%s'" -msgstr "" - -#: src/resources/monsterdb.cpp:44 -#, fuzzy -msgid "unnamed" -msgstr "Sem nome" - -#: src/resources/monsterdb.cpp:46 -msgid "Initializing monster database..." -msgstr "" - -#: src/resources/monsterdb.cpp:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -#, fuzzy -msgid "Saving screenshot failed!" -msgstr "Falha ao sentar!" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Tem certeza que deseja excluir este personagem?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Ataque:" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -#, fuzzy -msgid "Talk" -msgstr "Total" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Ataque:" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -#, fuzzy -msgid "Target Player" -msgstr "Jogadores" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Restaurar janelas" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Dividir" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Atalho" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Restaurar janelas" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Status" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventório" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Equipamento" - -#: src/keyboardconfig.cpp:75 -#, fuzzy -msgid "Skill Window" -msgstr "Pontos de habilidade: %d" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Restaurar janelas" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Restaurar janelas" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Restaurar janelas" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Falha no Emote!" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Atalho" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Selecionar Servidor" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -#, fuzzy -msgid " -h --help : Display this help" -msgstr "/help: Mostra esta ajuda" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Conectando ao servidor de contas..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Conectando ao servidor de personagens..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Conectando ao servidor de mapas..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Nome: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "Você foi desconectado do servidor!" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "Conectando ao servidor de mapas..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "Conectando ao servidor de personagens..." -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "Conectando ao servidor de contas..." -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -#, fuzzy -msgid "Could not create party." -msgstr "Impossivel entrar no grupo!" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventório" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -#, fuzzy -msgid "Command: /party <command> <args>" -msgstr "Comando: /help <comando>" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Criar" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -#, fuzzy -msgid "This command implements the partying function." -msgstr "Exibe o conteudo de ajuda de <comando>" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -#, fuzzy -msgid "Command: /party new <party-name>" -msgstr "Comandos: /announce <msg>" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -#, fuzzy -msgid "This command sets the party prefix character." -msgstr "Limpa os logs do chat anterior." - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -#, fuzzy -msgid "Command: /party prefix" -msgstr "Comandos: /clear" - -#: src/party.cpp:201 -#, fuzzy -msgid "This command reports the current party prefix character." -msgstr "Limpa os logs do chat anterior." - -#: src/party.cpp:209 -#, fuzzy -msgid "Command: /party leave" -msgstr "Comandos: /clear" - -#: src/party.cpp:210 -#, fuzzy -msgid "This command causes the player to leave the party." -msgstr "Limpa os logs do chat anterior." - -#: src/party.cpp:214 -#, fuzzy -msgid "Unknown /party command." -msgstr "Comando desconhecido." - -#: src/party.cpp:215 -#, fuzzy -msgid "Type /help party for a list of options." -msgstr "Digite /help para uma lista de todos os comandos." - -#, fuzzy -#~ msgid "Weight: %d g / %d g" -#~ msgstr "Capacidade: %d / %d" - -#~ msgid "Slots used: %d / %d" -#~ msgstr "Slots usados: %d/%d" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "MiniMapa" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@descrição|Descrição@@" - -#~ msgid "Remember Username" -#~ msgstr "Lembrar nome de usuário" - -#~ msgid "Mystery Skill" -#~ msgstr "Habilidade Mistério" - #~ msgid "Change" #~ msgstr "Mudar" @@ -2268,6 +918,9 @@ msgstr "Digite /help para uma lista de todos os comandos." #~ msgid "Please remove %d points" #~ msgstr "Por favor remova %d pontos" +#~ msgid "Split" +#~ msgstr "Dividir" + #~ msgid "Select amount of items to split." #~ msgstr "Selecionar montante de itens para dividir." @@ -2286,6 +939,9 @@ msgstr "Digite /help para uma lista de todos os comandos." #~ msgid "Choose your Mana World Server" #~ msgstr "Escolha seu Servidor de Mana World" +#~ msgid "Port:" +#~ msgstr "Porta:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Por favor especifique ambos os Endereços e a Porta do servidor" @@ -2310,6 +966,9 @@ msgstr "Digite /help para uma lista de todos os comandos." #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Peso Total: %d - Peso Máximo: %d" +#~ msgid "Keep" +#~ msgstr "Manter" + #~ msgid "Account and Character Management" #~ msgstr "Gerenciamento de Conta e Personagem" @@ -2325,5 +984,11 @@ msgstr "Digite /help para uma lista de todos os comandos." #~ msgid "Guilds" #~ msgstr "Guildas" +#~ msgid "@@guild|Invite %s@@" +#~ msgstr "@@guilda|convidar %s@@" + +#~ msgid "@@party|Invite %s to join your party@@" +#~ msgstr "@@grupo|Convidar %s para entrar para o seu grupo" + #~ msgid "Visible names" #~ msgstr "Nomes visÃveis" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-01-08 11:50+0000\n" "Last-Translator: idle sign <Unknown>\n" "Language-Team: Russian <ru@li.org>\n" @@ -17,608 +17,418 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Купить" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "СтоимоÑÑ‚ÑŒ: %d GP / Ð’Ñегоl: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Выход" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "ОпиÑание: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Ðффект: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 #, fuzzy msgid "Shop" msgstr "Стоп" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Продать" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Отмена" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтого перÑонажа?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Выбор перÑонажа" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Ðовый" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Удалить" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Предыдущий" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Следующий" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "ИмÑ: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Уровень: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Уровень: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Деньги: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Ðовый" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Удалить" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Предыдущий" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Следующий" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Создать перÑонажа" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "ИмÑ:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Цвет волоÑ:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Стрижка:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Создать" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 #, fuzzy msgid "Select Server" msgstr "Выбор перÑонажа" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Создать" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Сервер:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Переключение на OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "выÑ." - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Порт:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Сервер:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Да" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Ðет" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Соединение..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "ИÑпользовать" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "СнарÑжение" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "СнÑÑ‚ÑŒ" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Инвентарь" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Ðадеть" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "ИÑпользовать" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "СброÑить" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "СнÑÑ‚ÑŒ" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Ðадеть" + #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." msgstr "Сколько предметов продать." @@ -627,245 +437,148 @@ msgstr "Сколько предметов продать." msgid "Select amount of items to drop." msgstr "Сколько предметов ÑброÑить." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Вход" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Пароль:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Порт:" - -#: src/gui/login.cpp:55 -msgid "Recent:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "ОÑтавить" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "ЗарегиÑтрироватьÑÑ" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "СоÑтоÑние" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "УмениÑ" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Клавиша" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "ÐаÑтройка" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "МиниКарта" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "ЗарегиÑтрироватьÑÑ" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Торговать Ñ %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Ðтаковать %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Инвентарь" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Говорить Ñ NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancelОтмена@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Подобрать %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 #, fuzzy msgid "@@use|Unequip@@" msgstr "@@use|Ðадеть@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Ðадеть@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|ИÑпользовать@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|СброÑить@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Соединение..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Соединение..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Соединение..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|ОпиÑание@@" -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Подтвердите:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать не менее %d Ñимволов." -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ðµ должно Ñодержать более %d Ñимволов." -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Пароль должен Ñодержать не менее %d Ñимволов." -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Пароль не должен Ñодержать более %d Ñимволов." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Пароли не Ñовпадают." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Ошибка" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Звук" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "ГромкоÑÑ‚ÑŒ Ñффектов" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "ГромкоÑÑ‚ÑŒ музыки" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Применить" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "ВоÑÑтановить раÑположение окон" @@ -886,393 +599,274 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Ðажмите кнопку, чтобы начать калибровку" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Калибровать" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "ИÑпользовать джойÑтик" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Стоп" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Вращайте рукоÑÑ‚ÑŒ" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "Удалить" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "ИмÑ:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Ðа полный Ñкран" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Выборочный курÑор" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "Ограничение кадр/Ñ:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "ПрозрачноÑÑ‚ÑŒ интерфейÑа" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Ð Ð°Ð´Ð¸ÑƒÑ Ð¿Ñ€Ð¾ÐºÑ€ÑƒÑ‚ÐºÐ¸" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "ЗаторможенноÑÑ‚ÑŒ прокрутки" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Ðффекты окружающей Ñреды" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "выкл" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "низ." -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "выÑ." -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Ðа полный Ñкран" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Переключение в полноÑкранный режим" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² Ñилу выбранных наÑтроек требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° игры." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Переключение на OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Переход к OpenGL требует перезагрузки игры." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² Ñилу выбранных наÑтроек требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° игры." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² Ñилу выбранных наÑтроек требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° игры." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "УмениÑ" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "ИÑпользовать" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Уровень: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Деньги: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Уровень: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "СоÑтоÑние" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 #, fuzzy msgid "Attack:" msgstr "Ðтака %+d" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 #, fuzzy msgid "Defense:" msgstr "Защита %+d" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 #, fuzzy msgid "M.Attack:" msgstr "Ðтака %+d" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 #, fuzzy msgid "M.Defense:" msgstr "Защита %+d" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Сила:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "ВыноÑливоÑÑ‚ÑŒ:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "ЖивучеÑÑ‚ÑŒ:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Интеллект:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "ЛовкоÑÑ‚ÑŒ:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Добавить" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Ð’Ñ‹ получили %d GP." @@ -1281,933 +875,43 @@ msgstr "Ð’Ñ‹ получили %d GP." msgid "You give:" msgstr "Ð’Ñ‹ отдаете:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Отмена" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтого перÑонажа?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Ðтака %+d" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Ðтака %+d" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "ВоÑÑтановить раÑположение окон" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Разделить" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Клавиша" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "ВоÑÑтановить раÑположение окон" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "СоÑтоÑние" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Инвентарь" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "СнарÑжение" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "ВоÑÑтановить раÑположение окон" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "ВоÑÑтановить раÑположение окон" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "ВоÑÑтановить раÑположение окон" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "ВоÑÑтановить раÑположение окон" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Клавиша" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Выбор перÑонажа" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Соединение..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Соединение..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Соединение..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "ИмÑ: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "Соединение..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Инвентарь" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Создать" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "МиниКарта" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|ОпиÑание@@" - #~ msgid "Unregister" #~ msgstr "Удалить региÑтрацию" @@ -2226,6 +930,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Снимите очки (%d)" +#~ msgid "Split" +#~ msgstr "Разделить" + #~ msgid "Select amount of items to split." #~ msgstr "Сколько предметов разделить." @@ -2244,6 +951,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Выберите Ñервер Mana World" +#~ msgid "Port:" +#~ msgstr "Порт:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Следует указать Ð°Ð´Ñ€ÐµÑ Ð¸ порт Ñервера." @@ -2270,3 +980,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Суммарный веÑ: %d - МакÑ. веÑ: %d" + +#~ msgid "Keep" +#~ msgstr "ОÑтавить" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\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" @@ -17,601 +17,415 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "KúpiÅ¥" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Cena: %d GP / Spolu: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "UkonÄiÅ¥" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Popis: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effekt: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "ZruÅ¡iÅ¥" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Potvrdte zmazanie postavy" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Naozaj chcete odstrániÅ¥ túto postavu?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 #, fuzzy msgid "Select Character" msgstr "VytvoriÅ¥ postavu" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ano" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Nový" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "VymazaÅ¥" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "Predchádzajúci" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Nasledujúci" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "Level: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, fuzzy, c-format msgid "Job Level: %d" msgstr "Level: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Peniaze: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Nový" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "VymazaÅ¥" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "Predchádzajúci" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Nasledujúci" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ano" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "VytvoriÅ¥ postavu" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Meno" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "Farba vlasov:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Å týl vlasov:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "VytvoriÅ¥" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "VytvoriÅ¥" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -msgid "Party" -msgstr "" - -#: src/gui/colour.cpp:38 -msgid "Server" -msgstr "" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "" -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" msgstr "" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" msgstr "" #: src/gui/item_amount.cpp:76 @@ -622,240 +436,147 @@ msgstr "" msgid "Select amount of items to drop." msgstr "" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -msgid "Reset" -msgstr "" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, c-format msgid "@@trade|Trade With %s@@" msgstr "" -#: src/gui/popupmenu.cpp:79 +#: src/gui/popupmenu.cpp:83 #, c-format msgid "@@attack|Attack %s@@" msgstr "" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -msgid "Recorder" -msgstr "" - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -msgid "Already recording." -msgstr "" - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" msgstr "" -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -msgid "Recording..." -msgstr "" - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Muž" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Žena" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "" -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -876,380 +597,266 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "VymazaÅ¥" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "Meno" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." -msgstr "" - -#: src/gui/skill.cpp:41 -msgid "skills.xml" -msgstr "" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -msgid "use" -msgstr "" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, fuzzy, c-format msgid "Job: %d" msgstr "Level: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, fuzzy, c-format msgid "Money: %d GP" msgstr "Peniaze: %d" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "Level: %d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Sila:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Inteligencia:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" +#: src/gui/trade.cpp:61 +msgid "Add" msgstr "" -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 +#: src/gui/trade.cpp:64 msgid "Trade" msgstr "" -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "" @@ -1258,908 +865,42 @@ msgstr "" msgid "You give:" msgstr "" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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Å¥" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Naozaj chcete odstrániÅ¥ túto postavu?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -msgid "Sit" -msgstr "" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, c-format -msgid "Item Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -msgid "Status Window" -msgstr "" - -#: src/keyboardconfig.cpp:73 -msgid "Inventory Window" -msgstr "" - -#: src/keyboardconfig.cpp:74 -msgid "Equipment WIndow" -msgstr "" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, c-format -msgid "Emote Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -msgid "Select OK" -msgstr "" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -msgid "Trying to connect to account server..." -msgstr "" - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -msgid "Trying to connect to char server..." -msgstr "" - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -msgid "Trying to connect to map server..." -msgstr "" - -#: src/main.cpp:700 -#, c-format -msgid "Map: %s" -msgstr "" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "" -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -msgid "Invite to party" -msgstr "" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "VytvoriÅ¥" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - #~ msgid "Account and Character Management" #~ msgstr "ÚÄet a správa postáv" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2009-01-29 01:20+0100\n" "Last-Translator: Kess Vargavind <vargavind@gmail.com>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -17,610 +17,417 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "Köp" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "Pris: %d GP / Totalt: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "Avsluta" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "Beskrivning: %s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "Effekt: %s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "Affär" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "Sälj" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "Avbryt" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "Bekräfta borttagning av karaktär" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "Är du säker pÃ¥ att du vill ta bort den här karaktären?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "Välj karaktär" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "Ok" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "Ny" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "Ta bort" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "FöregÃ¥ende" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "Nästa" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "Namn: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "NivÃ¥: %d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, c-format msgid "Job Level: %d" msgstr "JobbnivÃ¥: %d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "Pengar: %d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "Ny" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "Ta bort" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "FöregÃ¥ende" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "Nästa" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "Ok" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "Guld: %d" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "Skapa karaktär" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "Namn:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "HÃ¥rfärg:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "Frisyr:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "Skapa" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "Välj server" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "Ok" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "Skapa" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " -msgstr "Globalt meddelande: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" +msgstr "Globalt meddelande:" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " -msgstr "Globalt meddelande frÃ¥n %s: " +msgid "Global announcement from %s:" +msgstr "Globalt meddelande frÃ¥n %s:" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "Server:" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 +#, c-format +msgid "%s whispers:" +msgstr "%s viskar:" + +#: src/gui/chat.cpp:276 #, c-format msgid "Whispering to %s: %s" msgstr "Viskar till %s: %s" -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." -msgstr "" - -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "Okänt kommando" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "Byteshandel misslyckades!" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "Kan inte visa smiley!" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "Kan inte sitta ned!" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "Kan inte skicka chattmeddelande!" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "Kan inte ansluta till gruppen!" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "Kan inte skrika!" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "Du har inte nÃ¥tt en tillräckligt hög nivÃ¥ än!" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "Otillräckligt med HP!" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "Otillräckligt med SP!" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "Du har inga anteckningar!" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "Du kan inte göra det just nu!" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "Verkar som att du behöver mer zeny... ;-)" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "Det gÃ¥r inte att använda den här förmÃ¥gan med det där vapenslaget!" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "Du behöver en till röd juvel!" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "Du behöver en till blÃ¥ juvel!" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "Du bär pÃ¥ för mycket för att kunna göra det här!" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "Öh? Vad är det där?" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "Kartförflyttning misslyckades..." -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "Kunde inte stjäla nÃ¥got..." -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "Giftet tog inte..." -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "Ändrar OpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "-- Hjälp --" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "/announce: Globalt meddelande (endast GM)" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "/clear: Tömmer det här fönstret pÃ¥ text" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "/help: Visar den här hjälptexten" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "/where: Visar namnet pÃ¥ kartan där du befinner dig" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" -msgstr "/w <namn> <text>: Kortare variant av /whisper" - -#: src/gui/chat.cpp:804 +#: src/gui/chat.cpp:496 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "/whisper <namn> <text>: Skickar ett privat meddelande till en spelare" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" +msgstr "/w <namn> <text>: Kortare variant av /whisper" + +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "/who: Visar antalet inloggade spelare" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "För mer information skriv /help <kommando>" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "Kommando: /announce <text>" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "*** endast en GM kan använda det här kommandot ***" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" "Det här kommandot skickar meddelandet <text> till alla inloggade spelare." -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "Kommando: /clear" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "Det här kommandot tömmer chattloggen." -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "Kommando: /help" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon." -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "Kommando: /help <kommando>" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "Det här kommandot ger mer information om <kommando>." -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -#, fuzzy -msgid "Command: /record <filename>" -msgstr "Kommando: /clear" - -#: src/gui/chat.cpp:844 -#, fuzzy -msgid "This command starts recording the chat log to the file <filename>." -msgstr "Det här kommandot tömmer chattloggen." - -#: src/gui/chat.cpp:846 -#, fuzzy -msgid "Command: /record" -msgstr "Kommando: /clear" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "Kommando: /where" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "Det här kommandot visar namnet pÃ¥ den karta där du befinner dig." -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "Kommando: /whisper <namn> <text>" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "Kommando: /w <namn> <text>" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "Det här kommandot skickar meddelandet <text> till karaktären <namn>." -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" "Om <namn> innehÃ¥ller mellanslag, mÃ¥ste du sätta citattecken (\") runt det." -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "Kommando: /who" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "Det här kommandot visar antalet spelare som är inloggade just nu." -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "Okänt kommando." -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "Skriv /help för en lista med kommandon." -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "hög" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "Port:" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "Server:" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "Ja" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "Nej" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "Ansluter..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "Använd" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "Utrustning" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "Avrusta" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "Hjälp" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "Stäng" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "Inventarium" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "Utrusta" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "Använd" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "Släpp" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " -msgstr "Utrymme: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "Vikt: %d / %d" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" +msgstr "Utrymme: %d / %d" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " -msgstr "Vikt: " +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "Avrusta" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "Utrusta" #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." @@ -630,244 +437,147 @@ msgstr "Välj antal föremÃ¥l att handla med." msgid "Select amount of items to drop." msgstr "Välj antal föremÃ¥l att släppa." -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "Användarnamn" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "Lösenord:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "Port:" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "Kom ihÃ¥g användarnamnet" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "BehÃ¥ll" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "Registrera" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "Status" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "Färdigheter" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "Genvägar" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "Inställningar" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "Minikarta" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "Registrera" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@trade|Handla med %s@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@attack|Attackera %s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "Inventarium" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@talk|Prata med NPC@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@cancel|Avbryt@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@pickup|Plocka upp %s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "@@use|Avrusta@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@use|Utrusta@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@use|Använd@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@drop|Släpp@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "Ansluter..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "Ansluter..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@description|Beskrivning@@" -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "Ansluter..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "Bekräfta:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "Man" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "Kvinna" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, 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:172 +#: src/gui/register.cpp:167 #, 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:180 +#: src/gui/register.cpp:175 #, 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:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Lösenordet mÃ¥ste vara kortare än %d tecken." -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "Lösenorden stämmer inte överens." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "Fel" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "Ljud" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "Volym för ljudeffekter" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "Musikvolym" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "Verkställ" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "Ã…terställ fönster" @@ -888,380 +598,262 @@ msgid "Keyboard" msgstr "Tangentbord" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "Spelare" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "Klicka pÃ¥ knappen för att starta kalibreringen" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "Kalibrera" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "Aktivera joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "Stopp" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "Rotera spaken" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "Tilldela" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 msgid "Default" msgstr "Förval" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "Samma tangent används pÃ¥ flera ställen." -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter." -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 msgid "Name" msgstr "Namn" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "Relation" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "Neutral" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "Vän" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "Förbisedd" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "Ignorerad" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "Kom ihÃ¥g spelarlista" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "TillÃ¥t byteshandel" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "TillÃ¥t viskningar" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "Vid ignorering:" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "Helskärm" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "Särskild muspekare" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "FPS-gräns:" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Genomskinlighet" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "Rullningsradie" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "Tröghet för rullning" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "Omgivande FX" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "Partikeldetaljer" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "av" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "lÃ¥g" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "hög" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "medium" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "maximal" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "Helskärm" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "Byte till helskärm" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "Omstart krävs för att ändringarna ska synas." -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "Ändrar OpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "Ändringar i OpenGL kräver omstart." -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" +msgstr "Mystisk förmÃ¥ga" -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "Omstart krävs för att ändringarna ska synas." - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "Omstart krävs för att ändringarna ska synas." - -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "Färdigheter" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "Färdighetspoäng: %d" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "Upp" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "Använd" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "Jobb: %d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "Pengar: %d GP" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -msgid "Job:" -msgstr "Jobb:" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "Statistik" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "Totalt" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "Kostnad" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "Attack:" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "Försvar:" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "M. attack:" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "M. försvar:" -#: src/gui/status.cpp:81 -#, fuzzy, c-format +#: src/gui/status.cpp:136 +#, fuzzy, no-c-format msgid "% Accuracy:" msgstr "% Precision:" -#: src/gui/status.cpp:82 -#, fuzzy, c-format +#: src/gui/status.cpp:137 +#, fuzzy, no-c-format msgid "% Evade:" msgstr "% Undvikan:" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "% Reflexer:" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 msgid "Strength" msgstr "Styrka" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "Smidighet" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "Hälsa" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 msgid "Intelligence" msgstr "Intelligens" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "Skicklighet" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "Tur" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "Ã…terstÃ¥ende statuspoäng: %d" -#: src/gui/trade.cpp:49 -msgid "Trade: You" -msgstr "" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "Byteshandla" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "Lägg till" -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "Byteshandla" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "Du fÃ¥r %d GP." @@ -1270,937 +862,44 @@ msgstr "Du fÃ¥r %d GP." msgid "You give:" msgstr "Du ger:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" "Kan inte lägga till vald sak. Det gÃ¥r inte att byteshandla med samma slags " "sak flera gÃ¥nger." -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "Uppdaterar..." -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "Spela" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "Färdig" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "Avbryt" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "Namnlös" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, c-format -msgid "ItemDB: Ignoring unknown sound event '%s'" -msgstr "" - -#: src/resources/monsterdb.cpp:44 -msgid "unnamed" -msgstr "Namnlös" - -#: src/resources/monsterdb.cpp:46 -msgid "Initializing monster database..." -msgstr "" - -#: src/resources/monsterdb.cpp:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "Är du säker pÃ¥ att du vill ta bort den här karaktären?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "Attack:" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -#, fuzzy -msgid "Talk" -msgstr "Totalt" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "Attack:" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -#, fuzzy -msgid "Target Player" -msgstr "Spelare" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "Ã…terställ fönster" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "Dela" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "Genvägar" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "Ã…terställ fönster" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "Status" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "Inventarium" - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "Utrustning" - -#: src/keyboardconfig.cpp:75 -#, fuzzy -msgid "Skill Window" -msgstr "Färdighetspoäng: %d" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "Ã…terställ fönster" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "Ã…terställ fönster" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "Ã…terställ fönster" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "Kan inte visa smiley!" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "Genvägar" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "Välj server" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "Ansluter..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "Ansluter..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "Ansluter..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "Namn: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "Kopplades frÃ¥n servern!" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "Ansluter till kartservern..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "Ansluter till karaktärsservern..." -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "Ansluter till kontoservern..." -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "Inventarium" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "Skapa" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "Minikarta" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@description|Beskrivning@@" - #~ msgid "Unregister" #~ msgstr "Avregistrera" @@ -2219,6 +918,9 @@ msgstr "" #~ msgid "Please remove %d points" #~ msgstr "Var vänlig ta bort %d poäng" +#~ msgid "Split" +#~ msgstr "Dela" + #~ msgid "Select amount of items to split." #~ msgstr "Välj antal föremÃ¥l att dela." @@ -2237,6 +939,9 @@ msgstr "" #~ msgid "Choose your Mana World Server" #~ msgstr "Välj din Mana World-server" +#~ msgid "Port:" +#~ msgstr "Port:" + #~ msgid "Please type both the address and the port of a server." #~ msgstr "Var vänlig skriv bÃ¥de adressen och porten till en server." @@ -2263,3 +968,6 @@ msgstr "" #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "Nuvarande vikt: %d - Maxvikt: %d" + +#~ msgid "Keep" +#~ msgstr "BehÃ¥ll" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" "PO-Revision-Date: 2008-11-25 06:16+0000\n" "Last-Translator: Tharawut Paripaiboon <Unknown>\n" "Language-Team: Thai <th@li.org>\n" @@ -17,601 +17,415 @@ msgstr "" "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 msgid "Buy" msgstr "ซื้à¸" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "ราคา: %d GP / ทั้งหมด: %d GP" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 msgid "Quit" msgstr "à¸à¸à¸" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 #, c-format msgid "Description: %s" msgstr "" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 msgid "Sell" msgstr "" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "ยà¸à¹€à¸¥à¸´à¸" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "ยืนยันà¸à¸²à¸£à¸¥à¸šà¸•à¸±à¸§à¸¥à¸°à¸„ร" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¹à¸¥à¹‰à¸§à¸«à¸£à¸·à¸à¸—ี่จะลบตัวละครนี้?" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 #, fuzzy msgid "Select Character" msgstr "สร้างตัวละคร" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "ตà¸à¸¥à¸‡" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "สร้างใหม่" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "ลบทิ้ง" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "ถัดไป" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 #, c-format msgid "Name: %s" msgstr "ชื่à¸: %s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, c-format msgid "Job Level: %d" msgstr "" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "สร้างใหม่" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "ลบทิ้ง" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "ถัดไป" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "ตà¸à¸¥à¸‡" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "สร้างตัวละคร" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 msgid "Name:" msgstr "ชื่à¸:" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "สีผม:" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "ทรงผม:" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "สร้าง" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "สร้าง" - -#: src/gui/chat.cpp:146 -msgid "Global announcement: " +#: src/gui/chat.cpp:115 +msgid "Global announcement:" msgstr "" -#: src/gui/chat.cpp:151 +#: src/gui/chat.cpp:118 #, c-format -msgid "Global announcement from %s: " +msgid "Global announcement from %s:" msgstr "" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 msgid "Server:" msgstr "" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:139 #, c-format -msgid "Whispering to %s: %s" -msgstr "" - -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -msgid "Unknown item" -msgstr "" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." +msgid "%s whispers:" msgstr "" -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" msgstr "" -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:349 msgid "Unknown command" msgstr "" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:359 msgid "Trade failed!" msgstr "" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:362 msgid "Emote failed!" msgstr "" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:365 msgid "Sit failed!" msgstr "" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:368 msgid "Chat creating failed!" msgstr "" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:371 msgid "Could not join party!" msgstr "" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:374 msgid "Cannot shout!" msgstr "" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:382 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:385 msgid "Insufficient HP!" msgstr "" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:388 msgid "Insufficient SP!" msgstr "" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:391 msgid "You have no memos!" msgstr "" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:394 msgid "You cannot do that right now!" msgstr "" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:397 msgid "Seems you need more Zeny... ;-)" msgstr "" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:400 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:403 msgid "You need another red gem!" msgstr "" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:406 msgid "You need another blue gem!" msgstr "" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:409 msgid "You're carrying to much to do this!" msgstr "" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:412 msgid "Huh? What's that?" msgstr "" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:418 msgid "Warp failed..." msgstr "" -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:421 msgid "Could not steal anything..." msgstr "" -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:424 msgid "Poison had no effect..." msgstr "" -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -msgid "Changing prefix to " -msgstr "" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:489 msgid "-- Help --" msgstr "" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:492 msgid "/announce: Global announcement (GM only)" msgstr "" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:493 msgid "/clear: Clears this window" msgstr "" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:494 msgid "/help: Display this help" msgstr "" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:495 msgid "/where: Display map name" msgstr "" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "" -#: src/gui/chat.cpp:804 -msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" msgstr "" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:499 msgid "/who: Display number of online users" msgstr "" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:500 msgid "For more information, type /help <command>" msgstr "" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:505 msgid "Command: /announce <msg>" msgstr "" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:506 msgid "*** only available to a GM ***" msgstr "" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:507 msgid "This command sends the message <msg> to all players currently online." msgstr "" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:513 msgid "Command: /clear" msgstr "" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:514 msgid "This command clears the chat log of previous chat." msgstr "" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:520 msgid "Command: /help" msgstr "" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:521 msgid "This command displays a list of all commands available." msgstr "" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:523 msgid "Command: /help <command>" msgstr "" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:524 msgid "This command displays help on <command>." msgstr "" -#: src/gui/chat.cpp:836 -msgid "Command: /present" -msgstr "" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -msgid "Command: /record <filename>" -msgstr "" - -#: src/gui/chat.cpp:844 -msgid "This command starts recording the chat log to the file <filename>." -msgstr "" - -#: src/gui/chat.cpp:846 -msgid "Command: /record" -msgstr "" - -#: src/gui/chat.cpp:847 -msgid "This command finishes a recording session." -msgstr "" - -#: src/gui/chat.cpp:851 -msgid "Command: /toggle <state>" -msgstr "" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -msgid "Command: /toggle" -msgstr "" - -#: src/gui/chat.cpp:859 -msgid "This command displays the return toggle status." -msgstr "" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:529 msgid "Command: /where" msgstr "" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:530 msgid "This command displays the name of the current map." msgstr "" -#: src/gui/chat.cpp:869 -msgid "Command: /msg <nick> <msg>" -msgstr "" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:536 msgid "Command: /whisper <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:537 msgid "Command: /w <nick> <msg>" msgstr "" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:538 msgid "This command sends the message <msg> to <nick>." msgstr "" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:540 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:546 msgid "Command: /who" msgstr "" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:547 msgid "This command displays the number of players currently online." msgstr "" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:551 msgid "Unknown command." msgstr "" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:552 msgid "Type /help for a list of commands." msgstr "" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -msgid "Highlight" -msgstr "" - -#: src/gui/colour.cpp:34 -msgid "Player" -msgstr "" - -#: src/gui/colour.cpp:35 -msgid "Whisper" -msgstr "" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -msgid "Party" -msgstr "" - -#: src/gui/colour.cpp:38 -msgid "Server" -msgstr "" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "ใช่" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "ไม่" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "ใช้" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "" -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "" +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "ใช้" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "ทิ้ง" -#: src/gui/inventorywindow.cpp:84 -msgid "Slots: " +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" msgstr "" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" msgstr "" #: src/gui/item_amount.cpp:76 @@ -622,244 +436,147 @@ msgstr "" msgid "Select amount of items to drop." msgstr "" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "เข้าระบบ" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 src/gui/register.cpp:80 msgid "Password:" msgstr "รหัสผ่าน:" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" +#: src/gui/login.cpp:50 +msgid "Remember Username" msgstr "" -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "" - -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 msgid "Register" msgstr "สมัครสมาชิà¸" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "สถานะ" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 msgid "Skills" msgstr "" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 msgid "Setup" msgstr "ตั้งค่า" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "สมัครสมาชิà¸" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 +#: src/gui/popupmenu.cpp:81 #, c-format msgid "@@trade|Trade With %s@@" msgstr "" -#: src/gui/popupmenu.cpp:79 +#: src/gui/popupmenu.cpp:83 #, c-format msgid "@@attack|Attack %s@@" msgstr "" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "" - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" msgstr "" -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" - -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "ยืนยัน:" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "ชาย" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "หà¸à¸´à¸‡" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "" -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 src/main.cpp:945 msgid "Error" msgstr "ผิดพลาด" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Apply" msgstr "" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:58 msgid "Reset Windows" msgstr "" @@ -880,384 +597,270 @@ msgid "Keyboard" msgstr "" #: src/gui/setup.cpp:94 -msgid "Colors" -msgstr "" - -#: src/gui/setup.cpp:98 msgid "Players" msgstr "" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 #, fuzzy msgid "Default" msgstr "ลบทิ้ง" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 #, fuzzy msgid "Name" msgstr "ชื่à¸:" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 msgid "Disregarded" msgstr "" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "" -#: src/gui/setup_video.cpp:120 -msgid "Particle effects" -msgstr "" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 msgid "Ambient FX" msgstr "" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 msgid "off" msgstr "" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 msgid "low" msgstr "" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 msgid "high" msgstr "" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 msgid "medium" msgstr "" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 msgid "max" msgstr "" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "fullscreen" -msgstr "" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -msgid "Restart your client for the change to take effect." -msgstr "" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -msgid "Restart your client or change maps for the change to take effect." +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" msgstr "" -#: src/gui/skill.cpp:41 -msgid "skills.xml" -msgstr "" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "ใช้" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -msgid "Job:" -msgstr "" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 #, fuzzy msgid "Stats" msgstr "สถานะ" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 #, fuzzy msgid "Strength" msgstr "Strength:" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 #, fuzzy msgid "Agility" msgstr "Agility:" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 #, fuzzy msgid "Vitality" msgstr "Vitality:" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 #, fuzzy msgid "Intelligence" msgstr "Intelligence:" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 #, fuzzy msgid "Dexterity" msgstr "Dexterity:" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "" -#: src/gui/trade.cpp:49 -msgid "Trade: You" +#: src/gui/trade.cpp:61 +msgid "Add" msgstr "" -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 +#: src/gui/trade.cpp:64 msgid "Trade" msgstr "" -#: src/gui/trade.cpp:61 -msgid "Add" -msgstr "" - -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 #, c-format msgid "You get %d GP." msgstr "" @@ -1266,913 +869,43 @@ msgstr "" msgid "You give:" msgstr "" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:290 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -msgid "You are not that alive anymore." -msgstr "" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -msgid "You are no more." -msgstr "" - -#: src/net/playerhandler.cpp:234 -msgid "You have ceased to be." -msgstr "" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "ยà¸à¹€à¸¥à¸´à¸" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, 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:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -msgid "Saving screenshot failed!" -msgstr "" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¹à¸¥à¹‰à¸§à¸«à¸£à¸·à¸à¸—ี่จะลบตัวละครนี้?" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -msgid "Attack" -msgstr "" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -msgid "Talk" -msgstr "" - -#: src/keyboardconfig.cpp:49 -msgid "Stop Attack" -msgstr "" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -msgid "Target Player" -msgstr "" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -msgid "Hide Windows" -msgstr "" - -#: src/keyboardconfig.cpp:55 -msgid "Sit" -msgstr "" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, c-format -msgid "Item Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:71 -msgid "Help Window" -msgstr "" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "สถานะ" - -#: src/keyboardconfig.cpp:73 -msgid "Inventory Window" -msgstr "" - -#: src/keyboardconfig.cpp:74 -msgid "Equipment WIndow" -msgstr "" - -#: src/keyboardconfig.cpp:75 -msgid "Skill Window" -msgstr "" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -msgid "Chat Window" -msgstr "" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -msgid "Setup Window" -msgstr "" - -#: src/keyboardconfig.cpp:80 -msgid "Debug Window" -msgstr "" - -#: src/keyboardconfig.cpp:81 -msgid "Emote Window" -msgstr "" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, c-format -msgid "Emote Shortcut %d" -msgstr "" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -msgid "Select OK" -msgstr "" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -msgid " -h --help : Display this help" -msgstr "" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "ชื่à¸: %s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "" -#: src/main.cpp:1068 +#: src/main.cpp:956 #, fuzzy msgid "Connecting to map server..." msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "" -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "" -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -msgid "Could not create party." -msgstr "" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -msgid "Invite to party" -msgstr "" - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -msgid "Command: /party <command> <args>" -msgstr "" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "สร้าง" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -msgid "This command implements the partying function." -msgstr "" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -msgid "Command: /party new <party-name>" -msgstr "" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -msgid "This command sets the party prefix character." -msgstr "" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -msgid "Command: /party prefix" -msgstr "" - -#: src/party.cpp:201 -msgid "This command reports the current party prefix character." -msgstr "" - -#: src/party.cpp:209 -msgid "Command: /party leave" -msgstr "" - -#: src/party.cpp:210 -msgid "This command causes the player to leave the party." -msgstr "" - -#: src/party.cpp:214 -msgid "Unknown /party command." -msgstr "" - -#: src/party.cpp:215 -msgid "Type /help party for a list of options." -msgstr "" - #~ msgid "Change Password" #~ msgstr "เปลี่ยนรหัสผ่าน" diff --git a/po/tmw.pot b/po/tmw.pot new file mode 100644 index 00000000..a418576f --- /dev/null +++ b/po/tmw.pot @@ -0,0 +1,896 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The Mana World Development Team +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-25 22:01+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35 +msgid "Buy" +msgstr "" + +#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 +#, c-format +msgid "Price: %d GP / Total: %d GP" +msgstr "" + +#: src/gui/buy.cpp:62 src/gui/sell.cpp:69 +msgid "Quit" +msgstr "" + +#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 src/gui/trade.cpp:272 +#, c-format +msgid "Description: %s" +msgstr "" + +#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245 +#, c-format +msgid "Effect: %s" +msgstr "" + +#: src/gui/buysell.cpp:31 +msgid "Shop" +msgstr "" + +#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68 +msgid "Sell" +msgstr "" + +#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58 +#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118 +msgid "Cancel" +msgstr "" + +#: src/gui/char_select.cpp:63 +msgid "Confirm Character Delete" +msgstr "" + +#: src/gui/char_select.cpp:64 +msgid "Are you sure you want to delete this character?" +msgstr "" + +#: src/gui/char_select.cpp:81 +msgid "Select Character" +msgstr "" + +#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62 +msgid "Ok" +msgstr "" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "" + +#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "" + +#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:269 +#, c-format +msgid "Name: %s" +msgstr "" + +#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232 +#, c-format +msgid "Level: %d" +msgstr "" + +#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 +#, c-format +msgid "Job Level: %d" +msgstr "" + +#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186 +#, c-format +msgid "Money: %d" +msgstr "" + +#: src/gui/char_select.cpp:174 +#, c-format +msgid "Gold: %d" +msgstr "" + +#: src/gui/char_select.cpp:243 +msgid "Create Character" +msgstr "" + +#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:79 +msgid "Name:" +msgstr "" + +#: src/gui/char_select.cpp:253 +msgid "Hair Color:" +msgstr "" + +#: src/gui/char_select.cpp:256 +msgid "Hair Style:" +msgstr "" + +#: src/gui/char_select.cpp:257 +msgid "Create" +msgstr "" + +#: src/gui/char_server.cpp:52 +msgid "Select Server" +msgstr "" + +#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 +msgid "OK" +msgstr "" + +#: src/gui/chat.cpp:115 +msgid "Global announcement:" +msgstr "" + +#: src/gui/chat.cpp:118 +#, c-format +msgid "Global announcement from %s:" +msgstr "" + +#: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82 +msgid "Server:" +msgstr "" + +#: src/gui/chat.cpp:139 +#, c-format +msgid "%s whispers:" +msgstr "" + +#: src/gui/chat.cpp:276 +#, c-format +msgid "Whispering to %s: %s" +msgstr "" + +#: src/gui/chat.cpp:349 +msgid "Unknown command" +msgstr "" + +#: src/gui/chat.cpp:359 +msgid "Trade failed!" +msgstr "" + +#: src/gui/chat.cpp:362 +msgid "Emote failed!" +msgstr "" + +#: src/gui/chat.cpp:365 +msgid "Sit failed!" +msgstr "" + +#: src/gui/chat.cpp:368 +msgid "Chat creating failed!" +msgstr "" + +#: src/gui/chat.cpp:371 +msgid "Could not join party!" +msgstr "" + +#: src/gui/chat.cpp:374 +msgid "Cannot shout!" +msgstr "" + +#: src/gui/chat.cpp:382 +msgid "You have not yet reached a high enough lvl!" +msgstr "" + +#: src/gui/chat.cpp:385 +msgid "Insufficient HP!" +msgstr "" + +#: src/gui/chat.cpp:388 +msgid "Insufficient SP!" +msgstr "" + +#: src/gui/chat.cpp:391 +msgid "You have no memos!" +msgstr "" + +#: src/gui/chat.cpp:394 +msgid "You cannot do that right now!" +msgstr "" + +#: src/gui/chat.cpp:397 +msgid "Seems you need more Zeny... ;-)" +msgstr "" + +#: src/gui/chat.cpp:400 +msgid "You cannot use this skill with that kind of weapon!" +msgstr "" + +#: src/gui/chat.cpp:403 +msgid "You need another red gem!" +msgstr "" + +#: src/gui/chat.cpp:406 +msgid "You need another blue gem!" +msgstr "" + +#: src/gui/chat.cpp:409 +msgid "You're carrying to much to do this!" +msgstr "" + +#: src/gui/chat.cpp:412 +msgid "Huh? What's that?" +msgstr "" + +#: src/gui/chat.cpp:418 +msgid "Warp failed..." +msgstr "" + +#: src/gui/chat.cpp:421 +msgid "Could not steal anything..." +msgstr "" + +#: src/gui/chat.cpp:424 +msgid "Poison had no effect..." +msgstr "" + +#: src/gui/chat.cpp:489 +msgid "-- Help --" +msgstr "" + +#: src/gui/chat.cpp:492 +msgid "/announce: Global announcement (GM only)" +msgstr "" + +#: src/gui/chat.cpp:493 +msgid "/clear: Clears this window" +msgstr "" + +#: src/gui/chat.cpp:494 +msgid "/help: Display this help" +msgstr "" + +#: src/gui/chat.cpp:495 +msgid "/where: Display map name" +msgstr "" + +#: src/gui/chat.cpp:496 +msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" +msgstr "" + +#: src/gui/chat.cpp:498 +msgid "/w <nick> <message>: Short form for /whisper" +msgstr "" + +#: src/gui/chat.cpp:499 +msgid "/who: Display number of online users" +msgstr "" + +#: src/gui/chat.cpp:500 +msgid "For more information, type /help <command>" +msgstr "" + +#: src/gui/chat.cpp:505 +msgid "Command: /announce <msg>" +msgstr "" + +#: src/gui/chat.cpp:506 +msgid "*** only available to a GM ***" +msgstr "" + +#: src/gui/chat.cpp:507 +msgid "This command sends the message <msg> to all players currently online." +msgstr "" + +#: src/gui/chat.cpp:513 +msgid "Command: /clear" +msgstr "" + +#: src/gui/chat.cpp:514 +msgid "This command clears the chat log of previous chat." +msgstr "" + +#: src/gui/chat.cpp:520 +msgid "Command: /help" +msgstr "" + +#: src/gui/chat.cpp:521 +msgid "This command displays a list of all commands available." +msgstr "" + +#: src/gui/chat.cpp:523 +msgid "Command: /help <command>" +msgstr "" + +#: src/gui/chat.cpp:524 +msgid "This command displays help on <command>." +msgstr "" + +#: src/gui/chat.cpp:529 +msgid "Command: /where" +msgstr "" + +#: src/gui/chat.cpp:530 +msgid "This command displays the name of the current map." +msgstr "" + +#: src/gui/chat.cpp:536 +msgid "Command: /whisper <nick> <msg>" +msgstr "" + +#: src/gui/chat.cpp:537 +msgid "Command: /w <nick> <msg>" +msgstr "" + +#: src/gui/chat.cpp:538 +msgid "This command sends the message <msg> to <nick>." +msgstr "" + +#: src/gui/chat.cpp:540 +msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." +msgstr "" + +#: src/gui/chat.cpp:546 +msgid "Command: /who" +msgstr "" + +#: src/gui/chat.cpp:547 +msgid "This command displays the number of players currently online." +msgstr "" + +#: src/gui/chat.cpp:551 +msgid "Unknown command." +msgstr "" + +#: src/gui/chat.cpp:552 +msgid "Type /help for a list of commands." +msgstr "" + +#: src/gui/confirm_dialog.cpp:35 +msgid "Yes" +msgstr "" + +#: src/gui/confirm_dialog.cpp:36 +msgid "No" +msgstr "" + +#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116 +msgid "Connecting..." +msgstr "" + +#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62 +msgid "Equipment" +msgstr "" + +#: src/gui/help.cpp:33 +msgid "Help" +msgstr "" + +#: src/gui/help.cpp:41 +msgid "Close" +msgstr "" + +#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63 +msgid "Inventory" +msgstr "" + +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "" + +#: src/gui/inventorywindow.cpp:57 +msgid "Drop" +msgstr "" + +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "" + +#: src/gui/item_amount.cpp:76 +msgid "Select amount of items to trade." +msgstr "" + +#: src/gui/item_amount.cpp:80 +msgid "Select amount of items to drop." +msgstr "" + +#: src/gui/login.cpp:42 +msgid "Login" +msgstr "" + +#: src/gui/login.cpp:45 src/gui/register.cpp:80 +msgid "Password:" +msgstr "" + +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "" + +#: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89 +msgid "Register" +msgstr "" + +#: src/gui/menuwindow.cpp:61 +msgid "Status" +msgstr "" + +#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119 +msgid "Skills" +msgstr "" + +#: src/gui/menuwindow.cpp:65 +msgid "Shortcut" +msgstr "" + +#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716 +msgid "Setup" +msgstr "" + +#: src/gui/minimap.cpp:34 +msgid "MiniMap" +msgstr "" + +#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35 +msgid "NPC" +msgstr "" + +#: src/gui/popupmenu.cpp:81 +#, c-format +msgid "@@trade|Trade With %s@@" +msgstr "" + +#: src/gui/popupmenu.cpp:83 +#, c-format +msgid "@@attack|Attack %s@@" +msgstr "" + +#: src/gui/popupmenu.cpp:114 +msgid "@@talk|Talk To NPC@@" +msgstr "" + +#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 +msgid "@@cancel|Cancel@@" +msgstr "" + +#: src/gui/popupmenu.cpp:136 +#, c-format +msgid "@@pickup|Pick Up %s@@" +msgstr "" + +#: src/gui/popupmenu.cpp:283 +msgid "@@use|Unequip@@" +msgstr "" + +#: src/gui/popupmenu.cpp:285 +msgid "@@use|Equip@@" +msgstr "" + +#: src/gui/popupmenu.cpp:288 +msgid "@@use|Use@@" +msgstr "" + +#: src/gui/popupmenu.cpp:290 +msgid "@@drop|Drop@@" +msgstr "" + +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "" + +#: src/gui/register.cpp:81 +msgid "Confirm:" +msgstr "" + +#: src/gui/register.cpp:87 +msgid "Male" +msgstr "" + +#: src/gui/register.cpp:88 +msgid "Female" +msgstr "" + +#: src/gui/register.cpp:159 +#, c-format +msgid "The username needs to be at least %d characters long." +msgstr "" + +#: src/gui/register.cpp:167 +#, c-format +msgid "The username needs to be less than %d characters long." +msgstr "" + +#: src/gui/register.cpp:175 +#, c-format +msgid "The password needs to be at least %d characters long." +msgstr "" + +#: src/gui/register.cpp:183 +#, c-format +msgid "The password needs to be less than %d characters long." +msgstr "" + +#: src/gui/register.cpp:190 +msgid "Passwords do not match." +msgstr "" + +#: src/gui/register.cpp:210 src/main.cpp:945 +msgid "Error" +msgstr "" + +#: src/gui/setup_audio.cpp:42 +msgid "Sound" +msgstr "" + +#: src/gui/setup_audio.cpp:48 +msgid "Sfx volume" +msgstr "" + +#: src/gui/setup_audio.cpp:49 +msgid "Music volume" +msgstr "" + +#: src/gui/setup.cpp:58 +msgid "Apply" +msgstr "" + +#: src/gui/setup.cpp:58 +msgid "Reset Windows" +msgstr "" + +#: src/gui/setup.cpp:78 +msgid "Video" +msgstr "" + +#: src/gui/setup.cpp:82 +msgid "Audio" +msgstr "" + +#: src/gui/setup.cpp:86 +msgid "Joystick" +msgstr "" + +#: src/gui/setup.cpp:90 +msgid "Keyboard" +msgstr "" + +#: src/gui/setup.cpp:94 +msgid "Players" +msgstr "" + +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78 +msgid "Press the button to start calibration" +msgstr "" + +#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:76 +msgid "Calibrate" +msgstr "" + +#: src/gui/setup_joystick.cpp:41 +msgid "Enable joystick" +msgstr "" + +#: src/gui/setup_joystick.cpp:81 +msgid "Stop" +msgstr "" + +#: src/gui/setup_joystick.cpp:82 +msgid "Rotate the stick" +msgstr "" + +#: src/gui/setup_keyboard.cpp:88 +msgid "Assign" +msgstr "" + +#: src/gui/setup_keyboard.cpp:92 +msgid "Default" +msgstr "" + +#: src/gui/setup_keyboard.cpp:121 +msgid "Key Conflict(s) Detected." +msgstr "" + +#: src/gui/setup_keyboard.cpp:122 +msgid "Resolve them, or gameplay may result in strange behaviour." +msgstr "" + +#: src/gui/setup_players.cpp:55 +msgid "Name" +msgstr "" + +#: src/gui/setup_players.cpp:56 +msgid "Relation" +msgstr "" + +#: src/gui/setup_players.cpp:60 +msgid "Neutral" +msgstr "" + +#: src/gui/setup_players.cpp:61 +msgid "Friend" +msgstr "" + +#: src/gui/setup_players.cpp:62 +msgid "Disregarded" +msgstr "" + +#: src/gui/setup_players.cpp:63 +msgid "Ignored" +msgstr "" + +#: src/gui/setup_players.cpp:217 +msgid "Save player list" +msgstr "" + +#: src/gui/setup_players.cpp:219 +msgid "Allow trading" +msgstr "" + +#: src/gui/setup_players.cpp:221 +msgid "Allow whispers" +msgstr "" + +#: src/gui/setup_players.cpp:248 +msgid "When ignoring:" +msgstr "" + +#: src/gui/setup_video.cpp:114 +msgid "Full screen" +msgstr "" + +#: src/gui/setup_video.cpp:115 +msgid "OpenGL" +msgstr "" + +#: src/gui/setup_video.cpp:116 +msgid "Custom cursor" +msgstr "" + +#: src/gui/setup_video.cpp:118 +msgid "FPS Limit:" +msgstr "" + +#: src/gui/setup_video.cpp:139 +msgid "Gui opacity" +msgstr "" + +#: src/gui/setup_video.cpp:141 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_video.cpp:142 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_video.cpp:143 +msgid "Ambient FX" +msgstr "" + +#: src/gui/setup_video.cpp:144 +msgid "Particle Detail" +msgstr "" + +#: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398 +msgid "off" +msgstr "" + +#: src/gui/setup_video.cpp:201 src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 src/gui/setup_video.cpp:415 +msgid "low" +msgstr "" + +#: src/gui/setup_video.cpp:204 src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 src/gui/setup_video.cpp:421 +msgid "high" +msgstr "" + +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418 +msgid "medium" +msgstr "" + +#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424 +msgid "max" +msgstr "" + +#: src/gui/setup_video.cpp:296 +msgid "Switching to full screen" +msgstr "" + +#: src/gui/setup_video.cpp:297 +msgid "Restart needed for changes to take effect." +msgstr "" + +#: src/gui/setup_video.cpp:309 +msgid "Changing OpenGL" +msgstr "" + +#: src/gui/setup_video.cpp:310 +msgid "Applying change to OpenGL requires restart." +msgstr "" + +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" +msgstr "" + +#: src/gui/skill.cpp:132 src/gui/skill.cpp:188 +#, c-format +msgid "Skill points: %d" +msgstr "" + +#: src/gui/skill.cpp:133 +msgid "Up" +msgstr "" + +#: src/gui/status.cpp:52 src/gui/status.cpp:235 +#, c-format +msgid "Job: %d" +msgstr "" + +#: src/gui/status.cpp:53 src/gui/status.cpp:238 +#, c-format +msgid "Money: %d GP" +msgstr "" + +#: src/gui/status.cpp:127 +msgid "Stats" +msgstr "" + +#: src/gui/status.cpp:128 +msgid "Total" +msgstr "" + +#: src/gui/status.cpp:129 +msgid "Cost" +msgstr "" + +#: src/gui/status.cpp:132 +msgid "Attack:" +msgstr "" + +#: src/gui/status.cpp:133 +msgid "Defense:" +msgstr "" + +#: src/gui/status.cpp:134 +msgid "M.Attack:" +msgstr "" + +#: src/gui/status.cpp:135 +msgid "M.Defense:" +msgstr "" + +#: src/gui/status.cpp:136 +#, c-format +msgid "% Accuracy:" +msgstr "" + +#: src/gui/status.cpp:137 +#, c-format +msgid "% Evade:" +msgstr "" + +#: src/gui/status.cpp:138 +msgid "% Reflex:" +msgstr "" + +#: src/gui/status.cpp:282 +msgid "Strength" +msgstr "" + +#: src/gui/status.cpp:283 +msgid "Agility" +msgstr "" + +#: src/gui/status.cpp:284 +msgid "Vitality" +msgstr "" + +#: src/gui/status.cpp:285 +msgid "Intelligence" +msgstr "" + +#: src/gui/status.cpp:286 +msgid "Dexterity" +msgstr "" + +#: src/gui/status.cpp:287 +msgid "Luck" +msgstr "" + +#: src/gui/status.cpp:305 +#, c-format +msgid "Remaining Status Points: %d" +msgstr "" + +#: src/gui/trade.cpp:61 +msgid "Add" +msgstr "" + +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "" + +#: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209 +#, c-format +msgid "You get %d GP." +msgstr "" + +#: src/gui/trade.cpp:81 +msgid "You give:" +msgstr "" + +#: src/gui/trade.cpp:290 +msgid "Failed adding item. You can not overlap one kind of item on the window." +msgstr "" + +#: src/gui/updatewindow.cpp:93 +msgid "Updating..." +msgstr "" + +#: src/gui/updatewindow.cpp:119 +msgid "Play" +msgstr "" + +#: src/gui/updatewindow.cpp:526 +msgid "Completed" +msgstr "" + +#: src/resources/itemdb.cpp:99 +msgid "Unnamed" +msgstr "" + +#: src/main.cpp:769 +msgid "Got disconnected from server!" +msgstr "" + +#: src/main.cpp:956 +msgid "Connecting to map server..." +msgstr "" + +#: src/main.cpp:964 +msgid "Connecting to character server..." +msgstr "" + +#: src/main.cpp:972 +msgid "Connecting to account server..." +msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 23a46815..fa60898c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,12 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" -"Report-Msgid-Bugs-To: irarice@gmail.com\n" -"POT-Creation-Date: 2009-02-07 15:45-0700\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2009-01-19 21:00+0100\n" "PO-Revision-Date: 2009-01-21 22:42+0800\n" "Last-Translator: Hong Hao <oahong@gmail.com>\n" -"Language-Team: Simplified Chinese <themanaworld-devel@lists.sourceforge." -"net>\n" +"Language-Team: Simplified Chinese <themanaworld-devel@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,621 +21,463 @@ msgstr "" "X-Poedit-Country: China\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/gui/buy.cpp:42 src/gui/buy.cpp:45 src/gui/buy.cpp:60 -#: src/gui/buysell.cpp:34 +#: src/gui/buy.cpp:43 +#: src/gui/buy.cpp:61 +#: src/gui/buysell.cpp:35 msgid "Buy" msgstr "è´ä¹°" -#: src/gui/buy.cpp:57 src/gui/buy.cpp:238 src/gui/sell.cpp:59 -#: src/gui/sell.cpp:253 +#: src/gui/buy.cpp:58 +#: src/gui/buy.cpp:239 +#: src/gui/sell.cpp:65 +#: src/gui/sell.cpp:259 #, c-format msgid "Price: %d GP / Total: %d GP" msgstr "ä»·æ ¼ï¼š%d 金å¸/总数：%d 金å¸" -#: src/gui/buy.cpp:61 src/gui/sell.cpp:63 src/game.cpp:602 -#: src/keyboardconfig.cpp:99 +#: src/gui/buy.cpp:62 +#: src/gui/sell.cpp:69 msgid "Quit" msgstr "退出" -#: src/gui/buy.cpp:62 src/gui/buy.cpp:205 src/gui/buy.cpp:223 -#: src/gui/sell.cpp:64 src/gui/sell.cpp:224 src/gui/sell.cpp:238 +#: src/gui/buy.cpp:63 +#: src/gui/buy.cpp:206 +#: src/gui/buy.cpp:224 +#: src/gui/inventorywindow.cpp:150 +#: src/gui/inventorywindow.cpp:160 +#: src/gui/sell.cpp:70 +#: src/gui/sell.cpp:230 +#: src/gui/sell.cpp:244 +#: src/gui/trade.cpp:94 +#: src/gui/trade.cpp:266 #, c-format msgid "Description: %s" msgstr "æ述：%s" -#: src/gui/buy.cpp:63 src/gui/buy.cpp:207 src/gui/buy.cpp:224 -#: src/gui/sell.cpp:65 src/gui/sell.cpp:226 src/gui/sell.cpp:239 +#: src/gui/buy.cpp:64 +#: src/gui/buy.cpp:208 +#: src/gui/buy.cpp:225 +#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:158 +#: src/gui/sell.cpp:71 +#: src/gui/sell.cpp:232 +#: src/gui/sell.cpp:245 #, c-format msgid "Effect: %s" msgstr "效果：%s" -#: src/gui/buysell.cpp:30 +#: src/gui/buysell.cpp:31 msgid "Shop" msgstr "商店" -#: src/gui/buysell.cpp:34 src/gui/sell.cpp:42 src/gui/sell.cpp:62 +#: src/gui/buysell.cpp:35 +#: src/gui/sell.cpp:48 +#: src/gui/sell.cpp:68 msgid "Sell" msgstr "出售" -#: src/gui/buysell.cpp:34 src/gui/char_select.cpp:103 -#: src/gui/char_select.cpp:267 src/gui/char_server.cpp:57 -#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:60 src/gui/login.cpp:80 -#: src/gui/npcintegerdialog.cpp:40 src/gui/npclistdialog.cpp:49 -#: src/gui/npcstringdialog.cpp:38 src/gui/register.cpp:89 src/gui/setup.cpp:57 -#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:114 +#: src/gui/buysell.cpp:35 +#: src/gui/char_select.cpp:85 +#: src/gui/char_select.cpp:258 +#: src/gui/char_server.cpp:60 +#: src/gui/connection.cpp:47 +#: src/gui/item_amount.cpp:61 +#: src/gui/login.cpp:52 +#: src/gui/npclistdialog.cpp:45 +#: src/gui/register.cpp:90 +#: src/gui/setup.cpp:59 +#: src/gui/trade.cpp:63 +#: src/gui/updatewindow.cpp:118 msgid "Cancel" msgstr "å–消" -#: src/gui/char_select.cpp:64 +#: src/gui/char_select.cpp:63 msgid "Confirm Character Delete" msgstr "ç¡®è®¤åˆ é™¤è§’è‰²" -#: src/gui/char_select.cpp:65 +#: src/gui/char_select.cpp:64 msgid "Are you sure you want to delete this character?" msgstr "ä½ ç¡®å®šæƒ³åˆ é™¤è¿™ä¸ªè§’è‰²ï¼Ÿ" -#: src/gui/char_select.cpp:83 +#: src/gui/char_select.cpp:81 msgid "Select Character" msgstr "选择角色" -#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:177 -#: src/gui/char_select.cpp:189 +#: src/gui/char_select.cpp:84 +#: src/gui/item_amount.cpp:60 +#: src/gui/login.cpp:51 +#: src/gui/ok_dialog.cpp:37 +#: src/gui/trade.cpp:62 +msgid "Ok" +msgstr "确认" + +#: src/gui/char_select.cpp:86 +msgid "New" +msgstr "新建" + +#: src/gui/char_select.cpp:87 +#: src/gui/setup_players.cpp:223 +msgid "Delete" +msgstr "åˆ é™¤" + +#: src/gui/char_select.cpp:88 +msgid "Previous" +msgstr "上一个" + +#: src/gui/char_select.cpp:89 +msgid "Next" +msgstr "下一个" + +#: src/gui/char_select.cpp:91 +#: src/gui/char_select.cpp:171 +#: src/gui/char_select.cpp:183 +#: src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:156 +#: src/gui/trade.cpp:92 +#: src/gui/trade.cpp:264 #, c-format msgid "Name: %s" msgstr "姓å：%s" -#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:178 -#: src/gui/char_select.cpp:190 src/gui/status.cpp:50 src/gui/status.cpp:165 +#: src/gui/char_select.cpp:92 +#: src/gui/char_select.cpp:172 +#: src/gui/char_select.cpp:184 +#: src/gui/status.cpp:51 +#: src/gui/status.cpp:232 #, c-format msgid "Level: %d" msgstr "ç‰çº§ï¼š%d" -#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:179 -#: src/gui/char_select.cpp:191 +#: src/gui/char_select.cpp:93 +#: src/gui/char_select.cpp:173 +#: src/gui/char_select.cpp:185 #, c-format msgid "Job Level: %d" msgstr "èŒä¸šç‰çº§ï¼š%d" -#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:192 +#: src/gui/char_select.cpp:94 +#: src/gui/char_select.cpp:186 #, c-format msgid "Money: %d" msgstr "金钱：%d" -#: src/gui/char_select.cpp:95 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:193 -msgid "New" -msgstr "新建" - -#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:97 -#: src/gui/char_select.cpp:183 src/gui/setup_players.cpp:228 -msgid "Delete" -msgstr "åˆ é™¤" - -#: src/gui/char_select.cpp:99 -msgid "Previous" -msgstr "上一个" - -#: src/gui/char_select.cpp:100 -msgid "Next" -msgstr "下一个" - -#: src/gui/char_select.cpp:102 src/gui/item_amount.cpp:59 -#: src/gui/ok_dialog.cpp:40 src/gui/trade.cpp:62 -msgid "Ok" -msgstr "确认" - -#: src/gui/char_select.cpp:180 +#: src/gui/char_select.cpp:174 #, c-format msgid "Gold: %d" msgstr "金å¸ï¼š%d" -#: src/gui/char_select.cpp:249 +#: src/gui/char_select.cpp:243 msgid "Create Character" msgstr "创建角色" -#: src/gui/char_select.cpp:259 src/gui/login.cpp:51 src/gui/register.cpp:76 +#: src/gui/char_select.cpp:250 +#: src/gui/login.cpp:44 +#: src/gui/register.cpp:79 msgid "Name:" msgstr "姓å：" -#: src/gui/char_select.cpp:262 +#: src/gui/char_select.cpp:253 msgid "Hair Color:" msgstr "å‘色：" -#: src/gui/char_select.cpp:265 +#: src/gui/char_select.cpp:256 msgid "Hair Style:" msgstr "å‘型：" -#: src/gui/char_select.cpp:266 +#: src/gui/char_select.cpp:257 msgid "Create" msgstr "建立" -#: src/gui/char_server.cpp:49 +#: src/gui/char_server.cpp:52 msgid "Select Server" msgstr "选择æœåŠ¡å™¨" -#: src/gui/char_server.cpp:56 src/gui/login.cpp:79 -#: src/gui/npcintegerdialog.cpp:39 src/gui/npclistdialog.cpp:48 -#: src/gui/npcstringdialog.cpp:37 src/gui/npc_text.cpp:48 +#: src/gui/char_server.cpp:59 +#: src/gui/npclistdialog.cpp:44 +#: src/gui/npc_text.cpp:46 msgid "OK" msgstr "确定" -#: src/gui/chat.cpp:55 src/gui/colour.cpp:31 src/gui/menuwindow.cpp:62 -#: src/gui/menuwindow.cpp:97 -#, fuzzy -msgid "Chat" -msgstr "建立" - -#: src/gui/chat.cpp:146 -#, fuzzy -msgid "Global announcement: " +#: src/gui/chat.cpp:122 +msgid "Global announcement:" msgstr "全局公告：" -#: src/gui/chat.cpp:151 -#, fuzzy, c-format -msgid "Global announcement from %s: " +#: src/gui/chat.cpp:125 +#, c-format +msgid "Global announcement from %s:" msgstr "%s 全局公告：" -#: src/gui/chat.cpp:165 src/gui/login.cpp:53 src/gui/register.cpp:79 +#: src/gui/chat.cpp:140 +#: src/gui/login.cpp:46 +#: src/gui/register.cpp:82 msgid "Server:" msgstr "æœåŠ¡å™¨ï¼š" -#: src/gui/chat.cpp:327 +#: src/gui/chat.cpp:146 +#, c-format +msgid "%s whispers:" +msgstr "%sæ‚„æ‚„å¯¹ä½ è¯´ï¼š" + +#: src/gui/chat.cpp:283 #, c-format msgid "Whispering to %s: %s" msgstr "对%s窃窃ç§è¯ï¼š%s" -#: src/gui/chat.cpp:351 -msgid "Trying to send a blank party message." -msgstr "" - -#: src/gui/chat.cpp:386 src/resources/itemdb.cpp:57 -#, fuzzy -msgid "Unknown item" -msgstr "未知指令" - -#: src/gui/chat.cpp:479 -msgid "Return toggles chat." -msgstr "" - -#: src/gui/chat.cpp:480 -msgid "Message closes chat." -msgstr "" - -#: src/gui/chat.cpp:490 -msgid "Return now toggles chat." -msgstr "" - -#: src/gui/chat.cpp:498 -msgid "Message now closes chat." -msgstr "" - -#: src/gui/chat.cpp:503 -msgid "" -"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -msgstr "" - -#: src/gui/chat.cpp:510 -msgid "Unknown party command... Type \"/help\" party for more information." -msgstr "" - -#: src/gui/chat.cpp:554 -msgid "No such spell!" -msgstr "" - -#: src/gui/chat.cpp:589 src/gui/chat.cpp:594 -msgid "Present: " -msgstr "" - -#: src/gui/chat.cpp:590 -msgid "Attendance written to record log." -msgstr "" - -#: src/gui/chat.cpp:599 +#: src/gui/chat.cpp:356 msgid "Unknown command" msgstr "未知指令" -#: src/gui/chat.cpp:611 +#: src/gui/chat.cpp:366 msgid "Trade failed!" msgstr "交易失败ï¼" -#: src/gui/chat.cpp:614 +#: src/gui/chat.cpp:369 msgid "Emote failed!" msgstr "å‘é€è¡¨æƒ…失败ï¼" -#: src/gui/chat.cpp:617 +#: src/gui/chat.cpp:372 msgid "Sit failed!" msgstr "原地休æ¯å¤±è´¥ï¼" -#: src/gui/chat.cpp:620 +#: src/gui/chat.cpp:375 msgid "Chat creating failed!" msgstr "èŠå¤©åˆ›å»ºå¤±è´¥ï¼" -#: src/gui/chat.cpp:623 +#: src/gui/chat.cpp:378 msgid "Could not join party!" msgstr "ä¸èƒ½åŠ 入工会ï¼" -#: src/gui/chat.cpp:626 +#: src/gui/chat.cpp:381 msgid "Cannot shout!" msgstr "æ— æ³•å‘¼å–Šï¼" -#: src/gui/chat.cpp:635 +#: src/gui/chat.cpp:389 msgid "You have not yet reached a high enough lvl!" msgstr "ä½ è¿˜æ²¡æœ‰è¾¾åˆ°è¶³å¤Ÿçš„ç‰çº§ï¼" -#: src/gui/chat.cpp:638 +#: src/gui/chat.cpp:392 msgid "Insufficient HP!" msgstr "HPä¸è¶³ï¼" -#: src/gui/chat.cpp:641 +#: src/gui/chat.cpp:395 msgid "Insufficient SP!" msgstr "SPä¸è¶³ï¼" -#: src/gui/chat.cpp:644 +#: src/gui/chat.cpp:398 msgid "You have no memos!" msgstr "没有备忘录" -#: src/gui/chat.cpp:647 +#: src/gui/chat.cpp:401 #, fuzzy msgid "You cannot do that right now!" msgstr "ä½ çŽ°åœ¨æ— æ³•åŠžåˆ°ï¼" -#: src/gui/chat.cpp:650 +#: src/gui/chat.cpp:404 msgid "Seems you need more Zeny... ;-)" msgstr "ä½ éœ€è¦æ›´å¤šé’žç¥¨â€¦â€¦;-)" -#: src/gui/chat.cpp:653 +#: src/gui/chat.cpp:407 msgid "You cannot use this skill with that kind of weapon!" msgstr "æ¤æ¦å™¨æ— 法用æ¥ä½¿ç”¨æ¤é¡¹æŠ€èƒ½ï¼" -#: src/gui/chat.cpp:656 +#: src/gui/chat.cpp:410 msgid "You need another red gem!" msgstr "ä½ éœ€è¦å¦ä¸€é¢—红å®çŸ³ï¼" -#: src/gui/chat.cpp:659 +#: src/gui/chat.cpp:413 msgid "You need another blue gem!" msgstr "ä½ éœ€è¦å¦ä¸€é¢—è“å®çŸ³ï¼" -#: src/gui/chat.cpp:662 +#: src/gui/chat.cpp:416 msgid "You're carrying to much to do this!" msgstr "ä½ å·²è´Ÿé‡å¤ªå¤šï¼Œæ— 法办到ï¼" -#: src/gui/chat.cpp:665 +#: src/gui/chat.cpp:419 msgid "Huh? What's that?" msgstr "啊？那是什么？" -#: src/gui/chat.cpp:674 +#: src/gui/chat.cpp:425 msgid "Warp failed..." msgstr "ä¼ é€å¤±è´¥..." -#: src/gui/chat.cpp:677 +#: src/gui/chat.cpp:428 msgid "Could not steal anything..." msgstr "æ— æ³•å·å–任何物å“..." -#: src/gui/chat.cpp:680 +#: src/gui/chat.cpp:431 msgid "Poison had no effect..." msgstr "毒è¯æ— 效..." -#: src/gui/chat.cpp:763 -msgid "The current party prefix is " -msgstr "" - -#: src/gui/chat.cpp:768 -msgid "Party prefix must be one character long." -msgstr "" - -#: src/gui/chat.cpp:774 -msgid "Cannot use a '/' as the prefix." -msgstr "" - -#: src/gui/chat.cpp:779 -#, fuzzy -msgid "Changing prefix to " -msgstr "改å˜æˆOpenGL" - -#: src/gui/chat.cpp:789 +#: src/gui/chat.cpp:496 msgid "-- Help --" msgstr "-- 帮助 --" -#: src/gui/chat.cpp:792 +#: src/gui/chat.cpp:499 msgid "/announce: Global announcement (GM only)" msgstr "/announce: 全局通告（åªæœ‰GMå¯ä½¿ç”¨ï¼‰" -#: src/gui/chat.cpp:793 +#: src/gui/chat.cpp:500 msgid "/clear: Clears this window" msgstr "/clear: 清除èŠå¤©è®°å½•" -#: src/gui/chat.cpp:794 +#: src/gui/chat.cpp:501 msgid "/help: Display this help" msgstr "/help: 显示帮助信æ¯" -#: src/gui/chat.cpp:795 -msgid "/party <command> <params>: Party commands." -msgstr "" - -#: src/gui/chat.cpp:796 -#, fuzzy -msgid "/msg <nick> <message>: Alternate form for /whisper" -msgstr "/w <昵称> <ä¿¡æ¯>: /whisper的缩写形å¼" - -#: src/gui/chat.cpp:797 -msgid "/present: Get list of players present" -msgstr "" - -#: src/gui/chat.cpp:798 -msgid "/record <filename>: Start recording the chat to an external file." -msgstr "" - -#: src/gui/chat.cpp:800 -msgid "/toggle: Determine whether <return> toggles the chat log." -msgstr "" - -#: src/gui/chat.cpp:802 +#: src/gui/chat.cpp:502 msgid "/where: Display map name" msgstr "/where: 显示地图å称" -#: src/gui/chat.cpp:803 -msgid "/w <nick> <message>: Short form for /whisper" -msgstr "/w <昵称> <ä¿¡æ¯>: /whisper的缩写形å¼" - -#: src/gui/chat.cpp:804 +#: src/gui/chat.cpp:503 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>" msgstr "/whisper <昵称> <ä¿¡æ¯>： å‘é€ä¸€æ¡ç§å¯†ä¿¡æ¯ <ä¿¡æ¯> ç»™ <昵称>" -#: src/gui/chat.cpp:806 +#: src/gui/chat.cpp:505 +msgid "/w <nick> <message>: Short form for /whisper" +msgstr "/w <昵称> <ä¿¡æ¯>: /whisper的缩写形å¼" + +#: src/gui/chat.cpp:506 msgid "/who: Display number of online users" msgstr "/who: 显示在线用户数" -#: src/gui/chat.cpp:807 +#: src/gui/chat.cpp:507 msgid "For more information, type /help <command>" msgstr "输入/help <指令> 获å–更多帮助信æ¯" -#: src/gui/chat.cpp:811 +#: src/gui/chat.cpp:512 msgid "Command: /announce <msg>" msgstr "指令： /announce <ä¿¡æ¯>" -#: src/gui/chat.cpp:812 +#: src/gui/chat.cpp:513 msgid "*** only available to a GM ***" msgstr "*** åªæœ‰GMå¯ç”¨ ***" -#: src/gui/chat.cpp:813 +#: src/gui/chat.cpp:514 msgid "This command sends the message <msg> to all players currently online." msgstr "该指令会å‘é€<ä¿¡æ¯>给所有在线用户。" -#: src/gui/chat.cpp:818 +#: src/gui/chat.cpp:520 msgid "Command: /clear" msgstr "指令： /clear" -#: src/gui/chat.cpp:819 +#: src/gui/chat.cpp:521 msgid "This command clears the chat log of previous chat." msgstr "该指令å¯æ¸…除历å²èŠå¤©è®°å½•ã€‚" -#: src/gui/chat.cpp:824 +#: src/gui/chat.cpp:527 msgid "Command: /help" msgstr "指令： /help" -#: src/gui/chat.cpp:825 +#: src/gui/chat.cpp:528 msgid "This command displays a list of all commands available." msgstr "该指令å¯æ˜¾ç¤ºæ‰€æœ‰å¯ç”¨æŒ‡ä»¤ã€‚" -#: src/gui/chat.cpp:827 +#: src/gui/chat.cpp:530 msgid "Command: /help <command>" msgstr "指令： /help <指令>" -#: src/gui/chat.cpp:828 +#: src/gui/chat.cpp:531 msgid "This command displays help on <command>." msgstr "该指令显现<指令>的帮助信æ¯" -#: src/gui/chat.cpp:836 -#, fuzzy -msgid "Command: /present" -msgstr "指令: /where" - -#: src/gui/chat.cpp:837 -msgid "" -"This command gets a list of players within hearing and sends it to either " -"the record log if recording, or the chat log otherwise." -msgstr "" - -#: src/gui/chat.cpp:843 -#, fuzzy -msgid "Command: /record <filename>" -msgstr "指令： /clear" - -#: src/gui/chat.cpp:844 -#, fuzzy -msgid "This command starts recording the chat log to the file <filename>." -msgstr "该指令å¯æ¸…除历å²èŠå¤©è®°å½•ã€‚" - -#: src/gui/chat.cpp:846 -#, fuzzy -msgid "Command: /record" -msgstr "指令： /clear" - -#: src/gui/chat.cpp:847 -#, fuzzy -msgid "This command finishes a recording session." -msgstr "该指令显现<指令>的帮助信æ¯" - -#: src/gui/chat.cpp:851 -#, fuzzy -msgid "Command: /toggle <state>" -msgstr "指令： /announce <ä¿¡æ¯>" - -#: src/gui/chat.cpp:852 -msgid "" -"This command sets whether the return key should toggle thechat log, or " -"whether the chat log turns off automatically." -msgstr "" - -#: src/gui/chat.cpp:855 -msgid "" -"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0" -"\", \"no\", \"false\" to turn the toggle off." -msgstr "" - -#: src/gui/chat.cpp:858 -#, fuzzy -msgid "Command: /toggle" -msgstr "指令： /clear" - -#: src/gui/chat.cpp:859 -#, fuzzy -msgid "This command displays the return toggle status." -msgstr "该æ¡æŒ‡ä»¤æ˜¾ç¤ºå½“å‰åœ°å›¾å。" - -#: src/gui/chat.cpp:863 +#: src/gui/chat.cpp:536 msgid "Command: /where" msgstr "指令: /where" -#: src/gui/chat.cpp:864 +#: src/gui/chat.cpp:537 msgid "This command displays the name of the current map." msgstr "该æ¡æŒ‡ä»¤æ˜¾ç¤ºå½“å‰åœ°å›¾å。" -#: src/gui/chat.cpp:869 -#, fuzzy -msgid "Command: /msg <nick> <msg>" -msgstr "指令： /w <昵称> <ä¿¡æ¯>" - -#: src/gui/chat.cpp:870 +#: src/gui/chat.cpp:543 msgid "Command: /whisper <nick> <msg>" msgstr "指令： /whisper <昵称> <ä¿¡æ¯>" -#: src/gui/chat.cpp:871 +#: src/gui/chat.cpp:544 msgid "Command: /w <nick> <msg>" msgstr "指令： /w <昵称> <ä¿¡æ¯>" -#: src/gui/chat.cpp:872 +#: src/gui/chat.cpp:545 msgid "This command sends the message <msg> to <nick>." msgstr "该æ¡æŒ‡ä»¤å‘é€ä¿¡æ¯ <msg> ç»™ <nick>" -#: src/gui/chat.cpp:874 +#: src/gui/chat.cpp:547 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "如果<昵称>ä¹‹é—´æœ‰ç©ºæ ¼ï¼Œç”¨åŒå¼•å·(\")括起æ¥ã€‚" -#: src/gui/chat.cpp:879 +#: src/gui/chat.cpp:553 msgid "Command: /who" msgstr "指令： /who" -#: src/gui/chat.cpp:880 +#: src/gui/chat.cpp:554 msgid "This command displays the number of players currently online." msgstr "该æ¡æŒ‡ä»¤å¯æ˜¾çŽ°å½“å‰åœ¨çº¿ç”¨æˆ·æ€»æ•°ã€‚" -#: src/gui/chat.cpp:885 +#: src/gui/chat.cpp:558 msgid "Unknown command." msgstr "未知命令" -#: src/gui/chat.cpp:886 +#: src/gui/chat.cpp:559 msgid "Type /help for a list of commands." msgstr "输入 /help 获å–指令列表。" -#: src/gui/colour.cpp:32 -msgid "GM" -msgstr "" - -#: src/gui/colour.cpp:33 -#, fuzzy -msgid "Highlight" -msgstr "高" - -#: src/gui/colour.cpp:34 -#, fuzzy -msgid "Player" -msgstr "玩家" - -#: src/gui/colour.cpp:35 -#, fuzzy -msgid "Whisper" -msgstr "%sæ‚„æ‚„å¯¹ä½ è¯´ï¼š" - -#: src/gui/colour.cpp:36 -msgid "Is" -msgstr "" - -#: src/gui/colour.cpp:37 -#, fuzzy -msgid "Party" -msgstr "开始" - -#: src/gui/colour.cpp:38 -#, fuzzy -msgid "Server" -msgstr "æœåŠ¡å™¨ï¼š" - -#: src/gui/colour.cpp:39 -msgid "Logger" -msgstr "" - -#: src/gui/colour.cpp:40 -msgid "Hyperlink" -msgstr "" - -#: src/gui/confirm_dialog.cpp:40 +#: src/gui/confirm_dialog.cpp:35 msgid "Yes" msgstr "是" -#: src/gui/confirm_dialog.cpp:41 +#: src/gui/confirm_dialog.cpp:36 msgid "No" msgstr "å¦" -#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:112 +#: src/gui/connection.cpp:49 +#: src/gui/updatewindow.cpp:116 msgid "Connecting..." msgstr "连接ä¸..." -#: src/gui/emotecontainer.cpp:60 -msgid "Unable to load selection.png" -msgstr "" - -#: src/gui/emotewindow.cpp:36 src/gui/emotewindow.cpp:38 -#: src/gui/menuwindow.cpp:68 src/gui/menuwindow.cpp:121 -msgid "Emote" -msgstr "" - -#: src/gui/emotewindow.cpp:45 src/gui/inventorywindow.cpp:62 -#: src/gui/inventorywindow.cpp:63 src/gui/inventorywindow.cpp:226 -#: src/gui/skill.cpp:144 -msgid "Use" -msgstr "使用" - -#: src/gui/equipmentwindow.cpp:62 src/gui/menuwindow.cpp:64 -#: src/gui/menuwindow.cpp:105 +#: src/gui/equipmentwindow.cpp:38 +#: src/gui/menuwindow.cpp:62 msgid "Equipment" msgstr "装备" -#: src/gui/equipmentwindow.cpp:77 src/gui/inventorywindow.cpp:66 -#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:221 -msgid "Unequip" -msgstr "å¸ä¸‹è£…备" - -#: src/gui/help.cpp:34 src/gui/help.cpp:39 +#: src/gui/help.cpp:33 msgid "Help" msgstr "帮助" -#: src/gui/help.cpp:45 +#: src/gui/help.cpp:41 msgid "Close" msgstr "å…³é—" -#: src/gui/inventorywindow.cpp:50 src/gui/inventorywindow.cpp:54 -#: src/gui/menuwindow.cpp:65 src/gui/menuwindow.cpp:109 +#: src/gui/inventorywindow.cpp:46 +#: src/gui/menuwindow.cpp:63 msgid "Inventory" msgstr "物å“æ " -#: src/gui/inventorywindow.cpp:61 src/gui/inventorywindow.cpp:63 -#: src/gui/inventorywindow.cpp:223 -msgid "Equip" -msgstr "装备" +#: src/gui/inventorywindow.cpp:56 +#: src/gui/inventorywindow.cpp:232 +#: src/gui/skill.cpp:134 +msgid "Use" +msgstr "使用" -#: src/gui/inventorywindow.cpp:72 +#: src/gui/inventorywindow.cpp:57 msgid "Drop" msgstr "丢弃" -#: src/gui/inventorywindow.cpp:84 -#, fuzzy -msgid "Slots: " -msgstr "技能点数：%d" +#: src/gui/inventorywindow.cpp:99 +#, c-format +msgid "Weight: %d / %d" +msgstr "è´Ÿé‡ï¼š%d / %d" -#: src/gui/inventorywindow.cpp:85 src/gui/itempopup.cpp:111 -msgid "Weight: " -msgstr "" +#: src/gui/inventorywindow.cpp:104 +#, c-format +msgid "Slots used: %d / %d" +msgstr "已使用槽： %d / %d" + +#: src/gui/inventorywindow.cpp:225 +msgid "Unequip" +msgstr "å¸ä¸‹è£…备" + +#: src/gui/inventorywindow.cpp:228 +msgid "Equip" +msgstr "装备" #: src/gui/item_amount.cpp:76 msgid "Select amount of items to trade." @@ -646,644 +487,448 @@ msgstr "请选择交易的物å“æ•°é‡" msgid "Select amount of items to drop." msgstr "请选择丢弃的物å“æ•°é‡" -#: src/gui/itempopup.cpp:112 -msgid " grams" -msgstr "" - -#: src/gui/login.cpp:49 +#: src/gui/login.cpp:42 msgid "Login" msgstr "登录" -#: src/gui/login.cpp:52 src/gui/register.cpp:77 +#: src/gui/login.cpp:45 +#: src/gui/register.cpp:80 msgid "Password:" msgstr "密ç ：" -#: src/gui/login.cpp:54 src/gui/register.cpp:80 -msgid "Port:" -msgstr "端å£ï¼š" - -#: src/gui/login.cpp:55 -msgid "Recent:" -msgstr "" - -#: src/gui/login.cpp:78 -msgid "Keep" -msgstr "ä¿æŒ" +#: src/gui/login.cpp:50 +msgid "Remember Username" +msgstr "ä¿å˜ç”¨æˆ·å" -#: src/gui/login.cpp:81 src/gui/register.cpp:72 src/gui/register.cpp:88 +#: src/gui/login.cpp:53 +#: src/gui/register.cpp:75 +#: src/gui/register.cpp:89 msgid "Register" msgstr "注册" -#: src/gui/menuwindow.cpp:63 src/gui/menuwindow.cpp:101 src/gui/status.cpp:41 +#: src/gui/menuwindow.cpp:61 msgid "Status" msgstr "状æ€" -#: src/gui/menuwindow.cpp:66 src/gui/menuwindow.cpp:113 src/gui/skill.cpp:123 -#: src/gui/skill.cpp:134 +#: src/gui/menuwindow.cpp:64 +#: src/gui/skill.cpp:119 msgid "Skills" msgstr "技能" -#: src/gui/menuwindow.cpp:67 src/gui/menuwindow.cpp:117 +#: src/gui/menuwindow.cpp:65 msgid "Shortcut" msgstr "å¿«æ·é”®" -#: src/gui/menuwindow.cpp:69 src/gui/menuwindow.cpp:125 src/gui/setup.cpp:49 -#: src/main.cpp:788 +#: src/gui/menuwindow.cpp:66 +#: src/gui/setup.cpp:51 +#: src/main.cpp:716 msgid "Setup" msgstr "设置" -#: src/gui/minimap.cpp:39 src/gui/minimap.cpp:43 +#: src/gui/minimap.cpp:34 msgid "MiniMap" msgstr "å°åœ°å›¾" -#: src/gui/npcintegerdialog.cpp:33 -msgid "NPC Number Request" -msgstr "" - -#: src/gui/npcintegerdialog.cpp:41 -#, fuzzy -msgid "Reset" -msgstr "注册" - -#: src/gui/npclistdialog.cpp:36 src/gui/npc_text.cpp:34 +#: src/gui/npclistdialog.cpp:35 +#: src/gui/npc_text.cpp:35 msgid "NPC" msgstr "NPC" -#: src/gui/npcstringdialog.cpp:33 -msgid "NPC Text Request" -msgstr "" - -#: src/gui/popupmenu.cpp:78 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:81 +#, c-format msgid "@@trade|Trade With %s@@" msgstr "@@交易|与%s交易@@" -#: src/gui/popupmenu.cpp:79 -#, fuzzy, c-format +#: src/gui/popupmenu.cpp:83 +#, c-format msgid "@@attack|Attack %s@@" msgstr "@@攻击|攻击%s@@" -#: src/gui/popupmenu.cpp:85 -#, c-format -msgid "@@friend|Befriend %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:88 -#, fuzzy, c-format -msgid "@@disregard|Disregard %s@@" -msgstr "æ— è§†" - -#: src/gui/popupmenu.cpp:89 -#, c-format -msgid "@@ignore|Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:93 src/gui/popupmenu.cpp:98 -#, c-format -msgid "@@unignore|Un-Ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:94 -#, c-format -msgid "@@ignore|Completely ignore %s@@" -msgstr "" - -#: src/gui/popupmenu.cpp:106 -#, fuzzy, c-format -msgid "@@party-invite|Invite %s to party@@" -msgstr "物å“æ " - -#: src/gui/popupmenu.cpp:113 +#: src/gui/popupmenu.cpp:114 msgid "@@talk|Talk To NPC@@" msgstr "@@è°ˆè¯|å’ŒNPCè°ˆè¯@@" -#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:139 -#: src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:124 +#: src/gui/popupmenu.cpp:140 +#: src/gui/popupmenu.cpp:293 msgid "@@cancel|Cancel@@" msgstr "@@å–消|å–消@@" -#: src/gui/popupmenu.cpp:135 +#: src/gui/popupmenu.cpp:136 #, c-format msgid "@@pickup|Pick Up %s@@" msgstr "@@æ¡èµ·|æ¡èµ·%s@@" -#: src/gui/popupmenu.cpp:287 +#: src/gui/popupmenu.cpp:283 msgid "@@use|Unequip@@" msgstr "@@使用|å¸è½½@@" -#: src/gui/popupmenu.cpp:289 +#: src/gui/popupmenu.cpp:285 msgid "@@use|Equip@@" msgstr "@@使用|装备@@" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "@@use|Use@@" msgstr "@@使用|使用@@" -#: src/gui/popupmenu.cpp:294 +#: src/gui/popupmenu.cpp:290 msgid "@@drop|Drop@@" msgstr "@@丢弃|丢弃@@" -#: src/gui/popupmenu.cpp:295 -msgid "@@chat|Add to Chat@@" -msgstr "" - -#: src/gui/recorder.cpp:37 -#, fuzzy -msgid "Recorder" -msgstr "连接ä¸..." - -#: src/gui/recorder.cpp:79 -msgid "Finishing recording." -msgstr "" - -#: src/gui/recorder.cpp:83 -msgid "Not currently recording." -msgstr "" - -#: src/gui/recorder.cpp:88 -#, fuzzy -msgid "Already recording." -msgstr "连接ä¸..." - -#: src/gui/recorder.cpp:96 -msgid "Starting to record..." -msgstr "" +#: src/gui/popupmenu.cpp:291 +msgid "@@description|Description@@" +msgstr "@@æè¿°|æè¿°@@" -#: src/gui/recorder.cpp:104 -msgid "Failed to start recording." -msgstr "" - -#: src/gui/recorder.h:39 -#, fuzzy -msgid "Recording..." -msgstr "连接ä¸..." - -#: src/gui/recorder.h:40 -msgid "Stop recording" -msgstr "" - -#: src/gui/register.cpp:78 +#: src/gui/register.cpp:81 msgid "Confirm:" msgstr "确认：" -#: src/gui/register.cpp:86 +#: src/gui/register.cpp:87 msgid "Male" msgstr "帅哥" -#: src/gui/register.cpp:87 +#: src/gui/register.cpp:88 msgid "Female" msgstr "美女" -#: src/gui/register.cpp:155 -#, c-format -msgid "RegisterDialog::register Username is %s" -msgstr "" - -#: src/gui/register.cpp:164 +#: src/gui/register.cpp:159 #, c-format msgid "The username needs to be at least %d characters long." msgstr "用户å至少需è¦%d个å—符。" -#: src/gui/register.cpp:172 +#: src/gui/register.cpp:167 #, c-format msgid "The username needs to be less than %d characters long." msgstr "用户åä¸èƒ½å°‘于%d个å—符" -#: src/gui/register.cpp:180 +#: src/gui/register.cpp:175 #, c-format msgid "The password needs to be at least %d characters long." msgstr "密ç 需è¦è‡³å°‘%d个å—符" -#: src/gui/register.cpp:188 +#: src/gui/register.cpp:183 #, c-format msgid "The password needs to be less than %d characters long." msgstr "密ç ä¸èƒ½å°‘于%d个å—符。" -#: src/gui/register.cpp:195 +#: src/gui/register.cpp:190 msgid "Passwords do not match." msgstr "密ç ä¸ä¸€è‡´." -#: src/gui/register.cpp:215 src/main.cpp:1056 +#: src/gui/register.cpp:210 +#: src/main.cpp:945 msgid "Error" msgstr "错误" -#: src/gui/setup_audio.cpp:41 +#: src/gui/setup_audio.cpp:42 msgid "Sound" msgstr "声音" -#: src/gui/setup_audio.cpp:47 +#: src/gui/setup_audio.cpp:48 msgid "Sfx volume" msgstr "音效声é‡" -#: src/gui/setup_audio.cpp:48 +#: src/gui/setup_audio.cpp:49 msgid "Music volume" msgstr "音ä¹å£°é‡" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:59 msgid "Apply" msgstr "应用" -#: src/gui/setup.cpp:57 +#: src/gui/setup.cpp:59 msgid "Reset Windows" msgstr "é‡ç½®çª—å£" -#: src/gui/setup.cpp:78 +#: src/gui/setup.cpp:79 msgid "Video" msgstr "视频" -#: src/gui/setup.cpp:82 +#: src/gui/setup.cpp:83 msgid "Audio" msgstr "音频" -#: src/gui/setup.cpp:86 +#: src/gui/setup.cpp:87 msgid "Joystick" msgstr "游æˆæ†" -#: src/gui/setup.cpp:90 +#: src/gui/setup.cpp:91 msgid "Keyboard" msgstr "键盘" -#: src/gui/setup.cpp:94 -#, fuzzy -msgid "Colors" -msgstr "å…³é—" - -#: src/gui/setup.cpp:98 +#: src/gui/setup.cpp:95 msgid "Players" msgstr "玩家" -#: src/gui/setup_colours.cpp:68 -msgid "Red: " -msgstr "" - -#: src/gui/setup_colours.cpp:82 -msgid "Green: " -msgstr "" - -#: src/gui/setup_colours.cpp:96 -msgid "Blue: " -msgstr "" - -#: src/gui/setup_colours.cpp:159 src/gui/setup_colours.cpp:162 -msgid "This is what the color looks like" -msgstr "" - -#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:39 +#: src/gui/setup_joystick.cpp:78 msgid "Press the button to start calibration" msgstr "æŒ‰ä¸‹å¼€å§‹æ ¡å‡†æŒ‰é’®" -#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:76 msgid "Calibrate" msgstr "æ ¡å‡†" -#: src/gui/setup_joystick.cpp:40 +#: src/gui/setup_joystick.cpp:41 msgid "Enable joystick" msgstr "å¯ç”¨æ¸¸æˆæ†" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:81 msgid "Stop" msgstr "åœæ¢" -#: src/gui/setup_joystick.cpp:85 +#: src/gui/setup_joystick.cpp:82 msgid "Rotate the stick" msgstr "旋转手柄" -#: src/gui/setup_keyboard.cpp:86 +#: src/gui/setup_keyboard.cpp:88 msgid "Assign" msgstr "分é…" -#: src/gui/setup_keyboard.cpp:90 +#: src/gui/setup_keyboard.cpp:92 msgid "Default" msgstr "预设" -#: src/gui/setup_keyboard.cpp:119 +#: src/gui/setup_keyboard.cpp:121 msgid "Key Conflict(s) Detected." msgstr "检测到按键冲çªã€‚" -#: src/gui/setup_keyboard.cpp:120 +#: src/gui/setup_keyboard.cpp:122 msgid "Resolve them, or gameplay may result in strange behaviour." msgstr "解决按键冲çªï¼Œå¦è€…游æˆè¿‡ç¨‹ä¸å¯èƒ½å‘生奇怪行为。" -#: src/gui/setup_players.cpp:56 +#: src/gui/setup_players.cpp:55 msgid "Name" msgstr "姓å" -#: src/gui/setup_players.cpp:57 +#: src/gui/setup_players.cpp:56 msgid "Relation" msgstr "关系" -#: src/gui/setup_players.cpp:61 +#: src/gui/setup_players.cpp:60 msgid "Neutral" msgstr "ä¸ç«‹" -#: src/gui/setup_players.cpp:62 +#: src/gui/setup_players.cpp:61 msgid "Friend" msgstr "好å‹" -#: src/gui/setup_players.cpp:63 +#: src/gui/setup_players.cpp:62 #, fuzzy msgid "Disregarded" msgstr "æ— è§†" -#: src/gui/setup_players.cpp:64 +#: src/gui/setup_players.cpp:63 msgid "Ignored" msgstr "忽略" -#: src/gui/setup_players.cpp:206 src/gui/skill.cpp:83 -msgid "???" -msgstr "" - -#: src/gui/setup_players.cpp:222 +#: src/gui/setup_players.cpp:217 msgid "Save player list" msgstr "ä¿å˜çŽ©å®¶åˆ—表" -#: src/gui/setup_players.cpp:224 +#: src/gui/setup_players.cpp:219 msgid "Allow trading" msgstr "å…许交易" -#: src/gui/setup_players.cpp:226 +#: src/gui/setup_players.cpp:221 msgid "Allow whispers" msgstr "å…许ç§è¯" -#: src/gui/setup_players.cpp:257 +#: src/gui/setup_players.cpp:248 msgid "When ignoring:" msgstr "当忽略时：" -#: src/gui/setup_video.cpp:92 -msgid "No modes available" -msgstr "" - -#: src/gui/setup_video.cpp:94 -msgid "All resolutions available" -msgstr "" - -#: src/gui/setup_video.cpp:117 +#: src/gui/setup_video.cpp:114 msgid "Full screen" msgstr "å…¨å±" -#: src/gui/setup_video.cpp:118 +#: src/gui/setup_video.cpp:115 msgid "OpenGL" msgstr "OpenGL" -#: src/gui/setup_video.cpp:119 +#: src/gui/setup_video.cpp:116 msgid "Custom cursor" msgstr "è‡ªå®šä¹‰é¼ æ ‡" -#: src/gui/setup_video.cpp:120 -#, fuzzy -msgid "Particle effects" -msgstr "纹ç†ç»†èŠ‚" - -#: src/gui/setup_video.cpp:121 -msgid "Speech bubbles" -msgstr "" - -#: src/gui/setup_video.cpp:122 -msgid "Show name" -msgstr "" - -#: src/gui/setup_video.cpp:124 +#: src/gui/setup_video.cpp:118 msgid "FPS Limit:" msgstr "FPSé™åˆ¶ï¼š" -#: src/gui/setup_video.cpp:145 +#: src/gui/setup_video.cpp:139 msgid "Gui opacity" msgstr "Gui é€æ˜Žåº¦" -#: src/gui/setup_video.cpp:146 +#: src/gui/setup_video.cpp:141 msgid "Scroll radius" msgstr "滑动åŠå¾„" -#: src/gui/setup_video.cpp:147 +#: src/gui/setup_video.cpp:142 msgid "Scroll laziness" msgstr "滑动延迟" -#: src/gui/setup_video.cpp:148 +#: src/gui/setup_video.cpp:143 #, fuzzy msgid "Ambient FX" msgstr "雾化效果" -#: src/gui/setup_video.cpp:149 +#: src/gui/setup_video.cpp:144 msgid "Particle Detail" msgstr "纹ç†ç»†èŠ‚" -#: src/gui/setup_video.cpp:211 src/gui/setup_video.cpp:457 +#: src/gui/setup_video.cpp:198 +#: src/gui/setup_video.cpp:398 msgid "off" msgstr "å…³é—" -#: src/gui/setup_video.cpp:214 src/gui/setup_video.cpp:225 -#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:474 +#: src/gui/setup_video.cpp:201 +#: src/gui/setup_video.cpp:212 +#: src/gui/setup_video.cpp:401 +#: src/gui/setup_video.cpp:415 msgid "low" msgstr "低" -#: src/gui/setup_video.cpp:217 src/gui/setup_video.cpp:231 -#: src/gui/setup_video.cpp:463 src/gui/setup_video.cpp:480 +#: src/gui/setup_video.cpp:204 +#: src/gui/setup_video.cpp:218 +#: src/gui/setup_video.cpp:404 +#: src/gui/setup_video.cpp:421 msgid "high" msgstr "高" -#: src/gui/setup_video.cpp:228 src/gui/setup_video.cpp:477 +#: src/gui/setup_video.cpp:215 +#: src/gui/setup_video.cpp:418 msgid "medium" msgstr "ä¸" -#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:483 +#: src/gui/setup_video.cpp:221 +#: src/gui/setup_video.cpp:424 msgid "max" msgstr "最大" -#: src/gui/setup_video.cpp:303 -msgid "Failed to switch to " -msgstr "" - -#: src/gui/setup_video.cpp:304 -msgid "windowed" -msgstr "" - -#: src/gui/setup_video.cpp:304 -#, fuzzy -msgid "fullscreen" -msgstr "å…¨å±" - -#: src/gui/setup_video.cpp:305 -msgid "mode and restoration of old mode also failed!" -msgstr "" - -#: src/gui/setup_video.cpp:312 +#: src/gui/setup_video.cpp:296 msgid "Switching to full screen" msgstr "切æ¢åˆ°å…¨å±" -#: src/gui/setup_video.cpp:313 +#: src/gui/setup_video.cpp:297 msgid "Restart needed for changes to take effect." msgstr "é‡å¯ç”Ÿæ•ˆ" -#: src/gui/setup_video.cpp:325 +#: src/gui/setup_video.cpp:309 msgid "Changing OpenGL" msgstr "改å˜æˆOpenGL" -#: src/gui/setup_video.cpp:326 +#: src/gui/setup_video.cpp:310 msgid "Applying change to OpenGL requires restart." msgstr "è¿ç”¨æ”¹å˜ä¸ºOpenGL需è¦é‡æ–°å¼€å§‹" -#: src/gui/setup_video.cpp:398 -msgid "Screen resolution changed" -msgstr "" - -#: src/gui/setup_video.cpp:399 -#, fuzzy -msgid "Restart your client for the change to take effect." -msgstr "é‡å¯ç”Ÿæ•ˆ" - -#: src/gui/setup_video.cpp:417 -msgid "Particle effect settings changed" -msgstr "" - -#: src/gui/setup_video.cpp:418 -#, fuzzy -msgid "Restart your client or change maps for the change to take effect." -msgstr "é‡å¯ç”Ÿæ•ˆ" +#: src/gui/skill.cpp:79 +msgid "Mystery Skill" +msgstr "神秘技能" -#: src/gui/skill.cpp:41 -#, fuzzy -msgid "skills.xml" -msgstr "技能" - -#: src/gui/skill.cpp:142 src/gui/skill.cpp:186 +#: src/gui/skill.cpp:132 +#: src/gui/skill.cpp:188 #, c-format msgid "Skill points: %d" msgstr "技能点数：%d" -#: src/gui/skill.cpp:143 +#: src/gui/skill.cpp:133 msgid "Up" msgstr "å‡çº§" -#: src/gui/skill.cpp:143 -msgid "inc" -msgstr "" - -#: src/gui/skill.cpp:144 -#, fuzzy -msgid "use" -msgstr "使用" - -#: src/gui/skill.cpp:262 -#, c-format -msgid "Error loading skills file: %s" -msgstr "" - -#: src/gui/speechbubble.cpp:35 -msgid "Speech" -msgstr "" - -#: src/gui/status.cpp:51 src/gui/status.cpp:168 +#: src/gui/status.cpp:52 +#: src/gui/status.cpp:235 #, c-format msgid "Job: %d" msgstr "èŒä¸šï¼š%d" -#: src/gui/status.cpp:52 src/gui/status.cpp:171 +#: src/gui/status.cpp:53 +#: src/gui/status.cpp:238 #, c-format msgid "Money: %d GP" msgstr "金钱：%d 金å¸" -#: src/gui/status.cpp:54 -msgid "HP:" -msgstr "" - -#: src/gui/status.cpp:57 -msgid "Exp:" -msgstr "" - -#: src/gui/status.cpp:60 -msgid "MP:" -msgstr "" - -#: src/gui/status.cpp:63 -#, fuzzy -msgid "Job:" -msgstr "èŒä¸šï¼š%d" - -#: src/gui/status.cpp:71 +#: src/gui/status.cpp:127 msgid "Stats" msgstr "状æ€" -#: src/gui/status.cpp:72 +#: src/gui/status.cpp:128 msgid "Total" msgstr "总计" -#: src/gui/status.cpp:73 +#: src/gui/status.cpp:129 msgid "Cost" msgstr "花费" -#: src/gui/status.cpp:77 +#: src/gui/status.cpp:132 msgid "Attack:" msgstr "攻击:" -#: src/gui/status.cpp:78 +#: src/gui/status.cpp:133 msgid "Defense:" msgstr "防御：" -#: src/gui/status.cpp:79 +#: src/gui/status.cpp:134 msgid "M.Attack:" msgstr "é”攻：" -#: src/gui/status.cpp:80 +#: src/gui/status.cpp:135 msgid "M.Defense:" msgstr "é”防：" -#: src/gui/status.cpp:81 +#: src/gui/status.cpp:136 #, c-format msgid "% Accuracy:" msgstr "% Ac精确度：" -#: src/gui/status.cpp:82 +#: src/gui/status.cpp:137 #, c-format msgid "% Evade:" msgstr "% E回é¿çŽ‡ï¼š" -#: src/gui/status.cpp:83 +#: src/gui/status.cpp:138 msgid "% Reflex:" msgstr "% 伤害å射：" -#: src/gui/status.cpp:211 +#: src/gui/status.cpp:282 msgid "Strength" msgstr "力é‡" -#: src/gui/status.cpp:212 +#: src/gui/status.cpp:283 msgid "Agility" msgstr "æ•æ·" -#: src/gui/status.cpp:213 +#: src/gui/status.cpp:284 msgid "Vitality" msgstr "生命" -#: src/gui/status.cpp:214 +#: src/gui/status.cpp:285 msgid "Intelligence" msgstr "智慧" -#: src/gui/status.cpp:215 +#: src/gui/status.cpp:286 msgid "Dexterity" msgstr "æ•æ·" -#: src/gui/status.cpp:216 +#: src/gui/status.cpp:287 msgid "Luck" msgstr "幸è¿" -#: src/gui/status.cpp:234 +#: src/gui/status.cpp:305 #, c-format msgid "Remaining Status Points: %d" msgstr "剩余状æ€ç‚¹æ•°ï¼š%d" -#: src/gui/trade.cpp:49 -#, fuzzy -msgid "Trade: You" -msgstr "交易" - -#: src/gui/trade.cpp:54 src/gui/trade.cpp:64 -msgid "Trade" -msgstr "交易" - #: src/gui/trade.cpp:61 msgid "Add" msgstr "æ·»åŠ " -#: src/gui/trade.cpp:80 src/gui/trade.cpp:122 src/gui/trade.cpp:172 +#: src/gui/trade.cpp:64 +msgid "Trade" +msgstr "交易" + +#: src/gui/trade.cpp:80 +#: src/gui/trade.cpp:156 +#: src/gui/trade.cpp:204 #, c-format msgid "You get %d GP." msgstr "ä½ å¾—åˆ°%d GP." @@ -1292,1027 +937,88 @@ msgstr "ä½ å¾—åˆ°%d GP." msgid "You give:" msgstr "ä½ ä»˜å‡º:" -#: src/gui/trade.cpp:250 +#: src/gui/trade.cpp:283 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "æ·»åŠ ç‰©å“å¤±è´¥ã€‚ä½ ä¸èƒ½è¦†ç›–窗å£ä¸çš„该类物å“。" -#: src/gui/updatewindow.cpp:78 -#, c-format -msgid "Couldn't load text file: %s" -msgstr "" - #: src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "æ›´æ–°..." -#: src/gui/updatewindow.cpp:115 +#: src/gui/updatewindow.cpp:119 msgid "Play" msgstr "开始" -#: src/gui/updatewindow.cpp:196 -msgid "Couldn't load news" -msgstr "" - -#: src/gui/updatewindow.cpp:327 -msgid "curl error " -msgstr "" - -#: src/gui/updatewindow.cpp:328 -msgid " host: " -msgstr "" - -#: src/gui/updatewindow.cpp:363 -#, c-format -msgid "Checksum for file %s failed: (%lx/%lx)" -msgstr "" - -#: src/gui/updatewindow.cpp:413 -msgid "Unable to create mThread" -msgstr "" - -#: src/gui/updatewindow.cpp:451 -msgid "##1 The update process is incomplete." -msgstr "" - -#: src/gui/updatewindow.cpp:452 -msgid "##1 It is strongly recommended that" -msgstr "" - -#: src/gui/updatewindow.cpp:453 -msgid "##1 you try again later" -msgstr "" - -#: src/gui/updatewindow.cpp:507 -#, c-format -msgid "%s already here" -msgstr "" - -#: src/gui/updatewindow.cpp:520 +#: src/gui/updatewindow.cpp:526 msgid "Completed" msgstr "已完æˆ" -#: src/net/playerhandler.cpp:193 src/net/playerhandler.cpp:248 -msgid "Message" -msgstr "" - -#: src/net/playerhandler.cpp:194 -msgid "" -"You are carrying more then half your weight. You are unable to regain health." -msgstr "" - -#: src/net/playerhandler.cpp:218 -msgid "You are dead." -msgstr "" - -#: src/net/playerhandler.cpp:219 -msgid "We regret to inform you that your character was killed in battle." -msgstr "" - -#: src/net/playerhandler.cpp:220 -#, fuzzy -msgid "You are not that alive anymore." -msgstr "ä½ çŽ°åœ¨æ— æ³•åŠžåˆ°ï¼" - -#: src/net/playerhandler.cpp:221 -msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" - -#: src/net/playerhandler.cpp:222 -msgid "Game Over!" -msgstr "" - -#: src/net/playerhandler.cpp:223 -msgid "Insert coin to continue" -msgstr "" - -#: src/net/playerhandler.cpp:224 -msgid "" -"No, kids. Your character did not really die. It... err... went to a better " -"place." -msgstr "" - -#: src/net/playerhandler.cpp:225 -msgid "" -"Your plan of breaking your enemies weapon by bashing it with your throat " -"failed." -msgstr "" - -#: src/net/playerhandler.cpp:226 -msgid "I guess this did not run too well." -msgstr "" - -#: src/net/playerhandler.cpp:227 -msgid "Do you want your possessions identified?" -msgstr "" - -#: src/net/playerhandler.cpp:228 -msgid "Sadly, no trace of you was ever found..." -msgstr "" - -#: src/net/playerhandler.cpp:229 -msgid "Annihilated." -msgstr "" - -#: src/net/playerhandler.cpp:230 -msgid "Looks like you got your head handed to you." -msgstr "" - -#: src/net/playerhandler.cpp:231 -msgid "" -"You screwed up again, dump your body down the tubes and get you another one." -msgstr "" - -#: src/net/playerhandler.cpp:232 -msgid "You're not dead yet. You're just resting." -msgstr "" - -#: src/net/playerhandler.cpp:233 -#, fuzzy -msgid "You are no more." -msgstr "没有备忘录" - -#: src/net/playerhandler.cpp:234 -#, fuzzy -msgid "You have ceased to be." -msgstr "没有备忘录" - -#: src/net/playerhandler.cpp:235 -msgid "You've expired and gone to meet your maker." -msgstr "" - -#: src/net/playerhandler.cpp:236 -msgid "You're a stiff." -msgstr "" - -#: src/net/playerhandler.cpp:237 -msgid "Bereft of life, you rest in peace." -msgstr "" - -#: src/net/playerhandler.cpp:238 -msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" - -#: src/net/playerhandler.cpp:239 -msgid "Your metabolic processes are now history." -msgstr "" - -#: src/net/playerhandler.cpp:240 -msgid "You're off the twig." -msgstr "" - -#: src/net/playerhandler.cpp:241 -msgid "You've kicked the bucket." -msgstr "" - -#: src/net/playerhandler.cpp:242 -msgid "" -"You've shuffled off your mortal coil, run down the curtain and joined the " -"bleedin' choir invisibile." -msgstr "" - -#: src/net/playerhandler.cpp:243 -msgid "You are an ex-player." -msgstr "" - -#: src/net/playerhandler.cpp:244 -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 "" - -#: src/net/playerhandler.cpp:394 -#, c-format -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 "" - -#: src/net/tradehandler.cpp:107 -msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" - -#: src/net/tradehandler.cpp:111 -msgid "Trading isn't possible. Character doesn't exist." -msgstr "" - -#: 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 "交易" - -#: src/net/tradehandler.cpp:128 -#, fuzzy -msgid " cancelled" -msgstr "å–消" - -#: src/net/tradehandler.cpp:135 -msgid "Unhandled trade cancel packet" -msgstr "" - -#: src/net/tradehandler.cpp:185 -msgid "Failed adding item. Trade partner is over weighted." -msgstr "" - -#: 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 -#, fuzzy -msgid "Trade canceled." -msgstr "交易失败ï¼" - -#: src/net/tradehandler.cpp:214 -#, fuzzy -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/emotedb.cpp:52 -msgid "Initializing emote database..." -msgstr "" - -#: src/resources/emotedb.cpp:59 -msgid "Emote Database: Error while loading emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:72 -msgid "Emote Database: Emote with missing ID in emotes.xml!" -msgstr "" - -#: src/resources/emotedb.cpp:131 -#, c-format -msgid "EmoteDB: Warning, unknown emote ID %d requested" -msgstr "" - -#: src/resources/itemdb.cpp:54 -msgid "Initializing item database..." -msgstr "" - -#: src/resources/itemdb.cpp:62 -msgid "items.xml" -msgstr "" - -#: src/resources/itemdb.cpp:67 -msgid "ItemDB: Error while loading items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:79 -msgid "ItemDB: Invalid or missing item ID in items.xml!" -msgstr "" - -#: src/resources/itemdb.cpp:84 -#, c-format -msgid "ItemDB: Redefinition of item ID %d" -msgstr "" - -#: src/resources/itemdb.cpp:102 +#: src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "未知物å“" -#: src/resources/itemdb.cpp:140 -#, c-format -msgid "ItemDB: Duplicate name of item found item %d" -msgstr "" - -#: src/resources/itemdb.cpp:166 -msgid "Unloading item database..." -msgstr "" - -#: src/resources/itemdb.cpp:184 -#, c-format -msgid "ItemDB: Error, unknown item ID# %d" -msgstr "" - -#: src/resources/itemdb.cpp:240 -#, c-format -msgid "ItemDB: Ignoring unknown sound event '%s'" -msgstr "" - -#: src/resources/monsterdb.cpp:44 -#, fuzzy -msgid "unnamed" -msgstr "未知物å“" - -#: src/resources/monsterdb.cpp:46 -msgid "Initializing monster database..." -msgstr "" - -#: src/resources/monsterdb.cpp:48 -msgid "monsters.xml" -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:390 -msgid "Screenshot saved to ~/" -msgstr "" - -#: src/game.cpp:395 -#, fuzzy -msgid "Saving screenshot failed!" -msgstr "原地休æ¯å¤±è´¥ï¼" - -#: src/game.cpp:396 -msgid "Error: could not save screenshot." -msgstr "" - -#: src/game.cpp:471 -msgid "Network Error" -msgstr "" - -#: src/game.cpp:472 -msgid "The connection to the server was lost, the program will now quit" -msgstr "" - -#: src/game.cpp:603 -#, fuzzy -msgid "Are you sure you want to quit?" -msgstr "ä½ ç¡®å®šæƒ³åˆ é™¤è¿™ä¸ªè§’è‰²ï¼Ÿ" - -#: src/game.cpp:610 -msgid "no" -msgstr "" - -#: src/game.cpp:738 -msgid "Ignoring incoming trade requests" -msgstr "" - -#: src/game.cpp:745 -msgid "Accepting incoming trade requests" -msgstr "" - -#: src/game.cpp:781 -#, c-format -msgid "Warning: guichan input exception: %s" -msgstr "" - -#: src/keyboardconfig.cpp:42 -msgid "Move Up" -msgstr "" - -#: src/keyboardconfig.cpp:43 -msgid "Move Down" -msgstr "" - -#: src/keyboardconfig.cpp:44 -msgid "Move Left" -msgstr "" - -#: src/keyboardconfig.cpp:45 -msgid "Move Right" -msgstr "" - -#: src/keyboardconfig.cpp:46 -#, fuzzy -msgid "Attack" -msgstr "攻击:" - -#: src/keyboardconfig.cpp:47 -msgid "Smilie" -msgstr "" - -#: src/keyboardconfig.cpp:48 -#, fuzzy -msgid "Talk" -msgstr "总计" - -#: src/keyboardconfig.cpp:49 -#, fuzzy -msgid "Stop Attack" -msgstr "攻击:" - -#: src/keyboardconfig.cpp:50 -msgid "Target Closest" -msgstr "" - -#: src/keyboardconfig.cpp:51 -msgid "Target NPC" -msgstr "" - -#: src/keyboardconfig.cpp:52 -#, fuzzy -msgid "Target Player" -msgstr "玩家" - -#: src/keyboardconfig.cpp:53 -msgid "Pickup" -msgstr "" - -#: src/keyboardconfig.cpp:54 -#, fuzzy -msgid "Hide Windows" -msgstr "é‡ç½®çª—å£" - -#: src/keyboardconfig.cpp:55 -#, fuzzy -msgid "Sit" -msgstr "分离" - -#: src/keyboardconfig.cpp:56 -msgid "Screenshot" -msgstr "" - -#: src/keyboardconfig.cpp:57 -msgid "Enable/Disable Trading" -msgstr "" - -#: src/keyboardconfig.cpp:58 -msgid "Find Path to Mouse" -msgstr "" - -#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60 -#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62 -#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64 -#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66 -#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68 -#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70 -#, fuzzy, c-format -msgid "Item Shortcut %d" -msgstr "å¿«æ·é”®" - -#: src/keyboardconfig.cpp:71 -#, fuzzy -msgid "Help Window" -msgstr "é‡ç½®çª—å£" - -#: src/keyboardconfig.cpp:72 -#, fuzzy -msgid "Status Window" -msgstr "状æ€" - -#: src/keyboardconfig.cpp:73 -#, fuzzy -msgid "Inventory Window" -msgstr "物å“æ " - -#: src/keyboardconfig.cpp:74 -#, fuzzy -msgid "Equipment WIndow" -msgstr "装备" - -#: src/keyboardconfig.cpp:75 -#, fuzzy -msgid "Skill Window" -msgstr "技能点数：%d" - -#: src/keyboardconfig.cpp:76 -msgid "Minimap Window" -msgstr "" - -#: src/keyboardconfig.cpp:77 -#, fuzzy -msgid "Chat Window" -msgstr "é‡ç½®çª—å£" - -#: src/keyboardconfig.cpp:78 -msgid "Item Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:79 -#, fuzzy -msgid "Setup Window" -msgstr "é‡ç½®çª—å£" - -#: src/keyboardconfig.cpp:80 -#, fuzzy -msgid "Debug Window" -msgstr "é‡ç½®çª—å£" - -#: src/keyboardconfig.cpp:81 -#, fuzzy -msgid "Emote Window" -msgstr "å‘é€è¡¨æƒ…失败ï¼" - -#: src/keyboardconfig.cpp:82 -msgid "Emote Shortcut Window" -msgstr "" - -#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86 -#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90 -#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94 -#, fuzzy, c-format -msgid "Emote Shortcut %d" -msgstr "å¿«æ·é”®" - -#: src/keyboardconfig.cpp:95 -msgid "Toggle Chat" -msgstr "" - -#: src/keyboardconfig.cpp:96 -msgid "Scroll Chat Up" -msgstr "" - -#: src/keyboardconfig.cpp:97 -msgid "Scroll Chat Down" -msgstr "" - -#: src/keyboardconfig.cpp:98 -#, fuzzy -msgid "Select OK" -msgstr "选择æœåŠ¡å™¨" - -#: src/main.cpp:214 -#, c-format -msgid "Error: Invalid update host: %s" -msgstr "" - -#: src/main.cpp:215 -msgid "Invalid update host: " -msgstr "" - -#: src/main.cpp:221 -msgid "Warning: no protocol was specified for the update host" -msgstr "" - -#: src/main.cpp:246 -#, c-format -msgid "Error: %s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:248 src/main.cpp:254 -msgid "Error creating updates directory!" -msgstr "" - -#: src/main.cpp:252 -#, c-format -msgid "Error: %s/%s can't be made, but doesn't exist!" -msgstr "" - -#: src/main.cpp:283 -msgid " can't be created, but it doesn't exist! Exiting." -msgstr "" - -#: src/main.cpp:292 -#, c-format -msgid "Starting Aethyra Version %s" -msgstr "" - -#: src/main.cpp:294 -msgid "Starting Aethyra - Version not defined" -msgstr "" - -#: src/main.cpp:298 -msgid "Initializing SDL..." -msgstr "" - -#: src/main.cpp:300 -msgid "Could not initialize SDL: " -msgstr "" - -#: src/main.cpp:313 -msgid " couldn't be set as home directory! Exiting." -msgstr "" - -#: src/main.cpp:333 -#, c-format -msgid "Can't find Resources directory\n" -msgstr "" - -#: src/main.cpp:343 -msgid "Initializing configuration..." -msgstr "" - -#: src/main.cpp:426 -msgid "Couldn't set " -msgstr "" - -#: src/main.cpp:427 -msgid " video mode: " -msgstr "" - -#: src/main.cpp:457 -#, c-format -msgid "Warning: %s" -msgstr "" - -#: src/main.cpp:499 -msgid "aethyra" -msgstr "" - -#: src/main.cpp:500 -msgid "Options: " -msgstr "" - -#: src/main.cpp:501 -msgid " -C --configfile : Configuration file to use" -msgstr "" - -#: src/main.cpp:502 -msgid " -d --data : Directory to load game data from" -msgstr "" - -#: src/main.cpp:503 -msgid " -D --default : Bypass the login process with default settings" -msgstr "" - -#: src/main.cpp:504 -#, fuzzy -msgid " -h --help : Display this help" -msgstr "/help: 显示帮助信æ¯" - -#: src/main.cpp:505 -msgid " -H --updatehost : Use this update host" -msgstr "" - -#: src/main.cpp:506 -msgid " -p --playername : Login with this player" -msgstr "" - -#: src/main.cpp:507 -msgid " -P --password : Login with this password" -msgstr "" - -#: src/main.cpp:508 -msgid " -u --skipupdate : Skip the update downloads" -msgstr "" - -#: src/main.cpp:509 -msgid " -U --username : Login with this username" -msgstr "" - -#: src/main.cpp:510 -msgid " -v --version : Display the version" -msgstr "" - -#: src/main.cpp:516 src/main.cpp:519 -msgid "Aethyra version " -msgstr "" - -#: src/main.cpp:520 -msgid "(local build?, PACKAGE_VERSION is not defined)" -msgstr "" - -#: src/main.cpp:616 -#, fuzzy -msgid "Trying to connect to account server..." -msgstr "æ£åœ¨è¿žæŽ¥ å¸å· æœåŠ¡å™¨..." - -#: src/main.cpp:617 -#, c-format -msgid "Username is %s" -msgstr "" - -#: src/main.cpp:671 -#, fuzzy -msgid "Trying to connect to char server..." -msgstr "æ£åœ¨è¿žæŽ¥ 角色 æœåŠ¡å™¨..." - -#: src/main.cpp:693 -#, c-format -msgid "Memorizing selected character %s" -msgstr "" - -#: src/main.cpp:699 -#, fuzzy -msgid "Trying to connect to map server..." -msgstr "æ£åœ¨è¿žæŽ¥ 地图 æœåŠ¡å™¨..." - -#: src/main.cpp:700 -#, fuzzy, c-format -msgid "Map: %s" -msgstr "姓å：%s" - -#: src/main.cpp:830 -#, c-format -msgid "Couldn't load %s as wallpaper" -msgstr "" - -#: src/main.cpp:863 +#: src/main.cpp:769 msgid "Got disconnected from server!" msgstr "å’ŒæœåŠ¡å™¨å¤±åŽ»è¿žæŽ¥" -#: src/main.cpp:1068 +#: src/main.cpp:956 msgid "Connecting to map server..." msgstr "æ£åœ¨è¿žæŽ¥ 地图 æœåŠ¡å™¨..." -#: src/main.cpp:1076 +#: src/main.cpp:964 msgid "Connecting to character server..." msgstr "æ£åœ¨è¿žæŽ¥ 角色 æœåŠ¡å™¨..." -#: src/main.cpp:1084 +#: src/main.cpp:972 msgid "Connecting to account server..." msgstr "æ£åœ¨è¿žæŽ¥ å¸å· æœåŠ¡å™¨..." -#: src/party.cpp:55 -msgid "Not yet implemented!" -msgstr "" - -#: src/party.cpp:64 -msgid "Party command not known." -msgstr "" - -#: src/party.cpp:71 -msgid "Party name is missing." -msgstr "" - -#: src/party.cpp:84 -msgid "Left party." -msgstr "" - -#: src/party.cpp:92 -msgid "Party successfully created." -msgstr "" - -#: src/party.cpp:97 -#, fuzzy -msgid "Could not create party." -msgstr "ä¸èƒ½åŠ 入工会ï¼" - -#: src/party.cpp:106 -#, c-format -msgid "%s is already a member of a party." -msgstr "" - -#: src/party.cpp:110 -#, c-format -msgid "%s refused your invitation." -msgstr "" - -#: src/party.cpp:114 -#, c-format -msgid "%s is now a member of your party." -msgstr "" - -#: src/party.cpp:126 -msgid "You can't have a blank party name!" -msgstr "" - -#: src/party.cpp:130 -#, fuzzy -msgid "Invite to party" -msgstr "物å“æ " - -#: src/party.cpp:131 -#, c-format -msgid "%s invites you to join the %s party, do you accept?" -msgstr "" - -#: src/party.cpp:149 -#, c-format -msgid "%s has left your party." -msgstr "" - -#: src/party.cpp:161 -msgid "Party chat received, but being is not a player" -msgstr "" - -#: src/party.cpp:173 -#, fuzzy -msgid "Command: /party <command> <args>" -msgstr "指令： /help <指令>" - -#: src/party.cpp:174 -msgid "where <command> can be one of:" -msgstr "" - -#: src/party.cpp:175 -msgid " /new" -msgstr "" - -#: src/party.cpp:176 -#, fuzzy -msgid " /create" -msgstr "建立" - -#: src/party.cpp:177 -msgid " /prefix" -msgstr "" - -#: src/party.cpp:178 -msgid " /leave" -msgstr "" - -#: src/party.cpp:179 -#, fuzzy -msgid "This command implements the partying function." -msgstr "该指令显现<指令>的帮助信æ¯" - -#: src/party.cpp:181 -msgid "Type /help party <command> for further help." -msgstr "" - -#: src/party.cpp:187 -#, fuzzy -msgid "Command: /party new <party-name>" -msgstr "指令： /announce <ä¿¡æ¯>" - -#: src/party.cpp:188 -msgid "Command: /party create <party-name>" -msgstr "" - -#: src/party.cpp:189 -msgid "These commands create a new party <party-name." -msgstr "" - -#: src/party.cpp:195 -msgid "Command: /party prefix <prefix-char>" -msgstr "" - -#: src/party.cpp:196 -#, fuzzy -msgid "This command sets the party prefix character." -msgstr "该指令å¯æ¸…除历å²èŠå¤©è®°å½•ã€‚" - -#: src/party.cpp:198 -msgid "" -"Any message preceded by <prefix-char> is sent to the party instead of " -"everyone." -msgstr "" - -#: src/party.cpp:200 -#, fuzzy -msgid "Command: /party prefix" -msgstr "指令： /clear" - -#: src/party.cpp:201 -#, fuzzy -msgid "This command reports the current party prefix character." -msgstr "该指令å¯æ¸…除历å²èŠå¤©è®°å½•ã€‚" - -#: src/party.cpp:209 -#, fuzzy -msgid "Command: /party leave" -msgstr "指令： /clear" - -#: src/party.cpp:210 -#, fuzzy -msgid "This command causes the player to leave the party." -msgstr "该指令å¯æ¸…除历å²èŠå¤©è®°å½•ã€‚" - -#: src/party.cpp:214 -#, fuzzy -msgid "Unknown /party command." -msgstr "未知命令" - -#: src/party.cpp:215 -#, fuzzy -msgid "Type /help party for a list of options." -msgstr "输入 /help 获å–指令列表。" - -#, fuzzy -#~ msgid "Weight: %d g / %d g" -#~ msgstr "è´Ÿé‡ï¼š%d / %d" - -#~ msgid "Slots used: %d / %d" -#~ msgstr "已使用槽： %d / %d" - -#, fuzzy -#~ msgid "Map" -#~ msgstr "å°åœ°å›¾" - -#~ msgid "@@description|Description@@" -#~ msgstr "@@æè¿°|æè¿°@@" - -#~ msgid "Remember Username" -#~ msgstr "ä¿å˜ç”¨æˆ·å" - -#~ msgid "Mystery Skill" -#~ msgstr "神秘技能" - #~ msgid "Change" #~ msgstr "改å˜" - #~ msgid "Unregister" #~ msgstr "注销" - #~ msgid "Willpower:" #~ msgstr "æ„志力:" - #~ msgid "Please distribute %d points" #~ msgstr "请分å‘%d点数" - #~ msgid "Your name needs to be at least 4 characters." #~ msgstr "ä½ çš„åå—需è¦è‡³å°‘4个å—符" - #~ msgid "Character stats OK" #~ msgstr "角色状æ€å¯ä»¥" - #~ msgid "Please remove %d points" #~ msgstr "è¯·åˆ é™¤%d点数" - +#~ msgid "Split" +#~ msgstr "分离" #~ msgid "Select amount of items to split." #~ msgstr "è¯·é€‰æ‹©ä½ åˆ†ç¦»çš„ç‰©å“çš„æ•°é‡" - #~ msgid "@@split|Split@@" #~ msgstr "@@分离|分离@@" - #~ msgid "Switch server" #~ msgstr "交æ¢æœåŠ¡å™¨" - #~ msgid "Switch character" #~ msgstr "交æ¢è§’色" - #~ msgid "Email:" #~ msgstr "电å邮件" - #~ msgid "Choose your Mana World Server" #~ msgstr "è¯·é€‰æ‹©ä½ çš„é”法世界æœåŠ¡å™¨" - +#~ msgid "Port:" +#~ msgstr "端å£ï¼š" #~ msgid "Please type both the address and the port of a server." #~ msgstr "请输入æœåŠ¡å™¨çš„IP地å€å’Œç«¯å£" - #~ msgid "Propose trade" #~ msgstr "打算交易" - #~ msgid "Confirm trade" #~ msgstr "决定交易" - #~ msgid "HP %+d" #~ msgstr "HP %+d" - #~ msgid "MP %+d" #~ msgstr "MP %+d" - #~ msgid "Confirm" #~ msgstr "确定" - #~ msgid "Charisma:" #~ msgstr "é…力:" - #~ msgid "Total Weight: %d - Maximum Weight: %d" #~ msgstr "总的力é‡ï¼š%d - 最大力é‡ï¼š%d" +#~ msgid "Keep" +#~ msgstr "ä¿æŒ" + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86deec0c..513456aa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ FIND_PACKAGE(PhysFS REQUIRED) FIND_PACKAGE(PNG REQUIRED) SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") -SET(FLAGS "${FLAGS} -DAETHYRA_DATADIR=\\\"${PKG_DATADIR}/\\\"") +SET(FLAGS "${FLAGS} -DTMW_DATADIR=\\\"${PKG_DATADIR}/\\\"") SET(GUICHAN_COMPONENTS "SDL") IF (WITH_OPENGL) @@ -395,9 +395,9 @@ SET(SRCS vector.h ) -ADD_EXECUTABLE(aethyra ${SRCS}) +ADD_EXECUTABLE(tmw ${SRCS}) -TARGET_LINK_LIBRARIES(aethyra +TARGET_LINK_LIBRARIES(tmw ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} @@ -410,6 +410,6 @@ TARGET_LINK_LIBRARIES(aethyra ${OPENGL_LIBRARIES} ) -INSTALL(TARGETS aethyra RUNTIME DESTINATION ${PKG_BINDIR}) +INSTALL(TARGETS tmw RUNTIME DESTINATION ${PKG_BINDIR}) -SET_TARGET_PROPERTIES(aethyra PROPERTIES COMPILE_FLAGS "${FLAGS}") +SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS}") diff --git a/src/Makefile.am b/src/Makefile.am index c6a9a9c4..ecf45945 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ -bin_PROGRAMS = aethyra -aethyra_SOURCES = gui/widgets/dropdown.cpp \ - gui/widgets/dropdown.h \ +AUTOMAKE_OPTIONS = subdir-objects + +bin_PROGRAMS = tmw +tmw_SOURCES = gui/widgets/dropdown.cpp \ + gui/widgets/dropdown.h \ gui/widgets/layout.cpp \ gui/widgets/layout.h \ gui/widgets/layouthelper.cpp \ @@ -98,8 +100,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/progressbar.h \ gui/radiobutton.cpp \ gui/radiobutton.h \ - gui/recorder.cpp \ - gui/recorder.h \ + gui/recorder.cpp \ + gui/recorder.h \ gui/register.cpp \ gui/register.h \ gui/scrollarea.cpp \ @@ -187,8 +189,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ net/network.h \ net/npchandler.cpp \ net/npchandler.h \ - net/partyhandler.cpp \ - net/partyhandler.h \ + net/partyhandler.cpp \ + net/partyhandler.h \ net/playerhandler.cpp \ net/playerhandler.h \ net/protocol.cpp \ @@ -316,8 +318,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ particleemitter.cpp \ particleemitter.h \ particleemitterprop.h \ - party.cpp \ - party.h \ + party.cpp \ + party.h \ player.cpp \ player.h \ player_relations.cpp \ @@ -333,6 +335,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ sound.cpp \ sound.h \ sprite.h \ + statuseffect.cpp \ + statuseffect.h \ text.cpp \ text.h \ textmanager.cpp \ @@ -345,12 +349,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ # set the include path found by configure INCLUDES = \ - $(all_includes) \ - -DAETHYRA_DATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)/"\" - -# the library search path. -aethyra_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0` -aethyra_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) -aethyra_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS) -aethyra_TARGET = aethyra + $(all_includes) \ + -DTMW_DATADIR=\""$(pkgdatadir)/"\" \ + -DLOCALEDIR=\""$(localedir)"\" diff --git a/src/SDLMain.h b/src/SDLMain.h index 4683df57..4683df57 100755..100644 --- a/src/SDLMain.h +++ b/src/SDLMain.h diff --git a/src/SDLMain.m b/src/SDLMain.m index 3d02719c..3d02719c 100755..100644 --- a/src/SDLMain.m +++ b/src/SDLMain.m diff --git a/src/animatedsprite.h b/src/animatedsprite.h index b196b990..43248731 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -50,7 +50,8 @@ class AnimatedSprite * @param filename the file of the sprite to animate * @param variant the sprite variant */ - static AnimatedSprite *load(std::string const &filename, int variant = 0); + static AnimatedSprite *load(const std::string &filename, + int variant = 0); /** * Destructor. diff --git a/src/being.cpp b/src/being.cpp index 9b8ede27..e1ff5591 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -19,11 +19,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <cassert> -#include <cmath> +#include "being.h" #include "animatedsprite.h" -#include "being.h" #include "configuration.h" #include "effectmanager.h" #include "game.h" @@ -34,6 +32,7 @@ #include "particle.h" #include "sound.h" #include "text.h" +#include "statuseffect.h" #include "gui/speechbubble.h" @@ -55,6 +54,12 @@ #include "utils/trim.h" #include "utils/xml.h" +#include <cassert> +#include <cmath> + +#define BEING_EFFECTS_FILE "effects.xml" +#define HAIR_FILE "hair.xml" + int Being::instances = 0; int Being::mNumberOfHairstyles = 1; std::vector<AnimatedSprite*> Being::emotionSet; @@ -84,11 +89,13 @@ Being::Being(int id, int job, Map *map): mGender(GENDER_UNSPECIFIED), mSpeechTime(0), mPx(0), mPy(0), + mStunMode(0), mSprites(VECTOREND_SPRITE, NULL), mSpriteIDs(VECTOREND_SPRITE, 0), mSpriteColors(VECTOREND_SPRITE, ""), mStatusParticleEffects(&mStunParticleEffects, false), - mChildParticleEffects(&mStatusParticleEffects, false) + mChildParticleEffects(&mStatusParticleEffects, false), + mMustResetParticles(false) { setMap(map); @@ -190,7 +197,7 @@ void Being::setSpeech(const std::string &text, Uint32 time) while (start != std::string::npos && end != std::string::npos) { // Catch multiple embeds and ignore them so it doesn't crash the client. - while ((mSpeech.find('[', start + 1) != std::string::npos) && + while ((mSpeech.find('[', start + 1) != std::string::npos) && (mSpeech.find('[', start + 1) < end)) { start = mSpeech.find('[', start + 1); @@ -290,6 +297,7 @@ void Being::setMap(Map *map) // Clear particle effect list because child particles became invalid mChildParticleEffects.clear(); + mMustResetParticles = true; // Reset status particles on next redraw } void Being::controlParticle(Particle *particle) @@ -314,7 +322,7 @@ void Being::setAction(Action action) { currentAction = mEquippedWeapon->getAttackType(); } - else + else { currentAction = ACTION_ATTACK; } @@ -383,11 +391,11 @@ SpriteDirection Being::getSpriteDirection() const { dir = DIRECTION_RIGHT; } - else + else { dir = DIRECTION_LEFT; } - + return dir; } @@ -468,6 +476,17 @@ void Being::logic() } } + // Restart status/particle effects, if needed + if (mMustResetParticles) { + mMustResetParticles = false; + for (std::set<int>::iterator it = mStatusEffects.begin(); + it != mStatusEffects.end(); it++) { + const StatusEffect *effect = StatusEffect::getStatusEffect(*it, true); + if (effect && effect->particleEffectIsPersistent()) + updateStatusEffect(*it, true); + } + } + // Update particle effects mChildParticleEffects.moveTo((float) mPx + 16.0f, (float) mPy + 32.0f); @@ -517,10 +536,10 @@ void Being::drawSpeech(int offsetX, int offsetY) mSpeechBubble->setCaption(mName, mNameColor); - // Not quite centered, but close enough. However, it's not too important to get - // it right right now, as it doesn't take bubble collision into account yet. + // Not quite centered, but close enough. However, it's not too important to get + // it right right now, as it doesn't take bubble collision into account yet. mSpeechBubble->setText(mSpeech); - mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - + mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - (mSpeechBubble->getNumRows()*14)); mSpeechBubble->setVisible(true); } @@ -545,10 +564,66 @@ Being::Type Being::getType() const return UNKNOWN; } +void Being::setStatusEffectBlock(int offset, Uint16 newEffects) +{ + for (int i = 0; i < STATUS_EFFECTS; i++) { + int index = StatusEffect::blockEffectIndexToEffectIndex(offset + i); + + if (index != -1) + setStatusEffect(index, (newEffects & (1 << i)) > 0); + } +} + +void Being::handleStatusEffect(StatusEffect *effect, int effectId) +{ + if (!effect) + return; + + // TODO: Find out how this is meant to be used + // (SpriteAction != Being::Action) + //SpriteAction action = effect->getAction(); + //if (action != ACTION_INVALID) + // setAction(action); + + Particle *particle = effect->getParticle(); + + if (effectId >= 0) + mStatusParticleEffects.setLocally(effectId, particle); + else { + mStunParticleEffects.clearLocally(); + if (particle) + mStunParticleEffects.addLocally(particle); + } +} + +void Being::updateStunMode(int oldMode, int newMode) +{ + handleStatusEffect(StatusEffect::getStatusEffect(oldMode, false), -1); + handleStatusEffect(StatusEffect::getStatusEffect(newMode, true), -1); +} + +void Being::updateStatusEffect(int index, bool newStatus) +{ + handleStatusEffect(StatusEffect::getStatusEffect(index, newStatus), index); +} + +void Being::setStatusEffect(int index, bool active) +{ + const bool wasActive = mStatusEffects.find(index) != mStatusEffects.end(); + + if (active != wasActive) { + updateStatusEffect(index, active); + if (active) + mStatusEffects.insert(index); + else + mStatusEffects.erase(index); + } +} + int Being::getOffset(char pos, char neg) const { // Check whether we're walking in the requested direction - if (mAction != WALK || !(mDirection & (pos | neg))) + if (mAction != WALK || !(mDirection & (pos | neg))) { return 0; } @@ -557,13 +632,13 @@ int Being::getOffset(char pos, char neg) const // We calculate the offset _from_ the _target_ location offset -= 32; - if (offset > 0) + if (offset > 0) { offset = 0; } // Going into negative direction? Invert the offset. - if (mDirection & pos) + if (mDirection & pos) { offset = -offset; } @@ -576,11 +651,11 @@ int Being::getWidth() const if (mSprites[BASE_SPRITE]) { const int width = mSprites[BASE_SPRITE]->getWidth() > DEFAULT_WIDTH ? - mSprites[BASE_SPRITE]->getWidth() : + mSprites[BASE_SPRITE]->getWidth() : DEFAULT_WIDTH; return width; } - else + else { return DEFAULT_WIDTH; } @@ -592,13 +667,185 @@ int Being::getHeight() const if (mSprites[BASE_SPRITE]) { const int height = mSprites[BASE_SPRITE]->getHeight() > DEFAULT_HEIGHT ? - mSprites[BASE_SPRITE]->getHeight() : + mSprites[BASE_SPRITE]->getHeight() : DEFAULT_HEIGHT; return height; } - else + else { return DEFAULT_HEIGHT; } } + +struct EffectDescription { + std::string mGFXEffect; + std::string mSFXEffect; +}; + +static EffectDescription *default_effect = NULL; +static std::map<int, EffectDescription *> effects; +static bool effects_initialized = false; + +static EffectDescription *getEffectDescription(xmlNodePtr node, int *id) +{ + EffectDescription *ed = new EffectDescription; + + *id = atoi(XML::getProperty(node, "id", "-1").c_str()); + ed->mSFXEffect = XML::getProperty(node, "audio", ""); + ed->mGFXEffect = XML::getProperty(node, "particle", ""); + + return ed; +} + +static EffectDescription *getEffectDescription(int effectId) +{ + if (!effects_initialized) + { + XML::Document doc(BEING_EFFECTS_FILE); + xmlNodePtr root = doc.rootNode(); + + if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) + { + logger->log("Error loading being effects file: " + BEING_EFFECTS_FILE); + return NULL; + } + + for_each_xml_child_node(node, root) + { + int id; + + if (xmlStrEqual(node->name, BAD_CAST "effect")) + { + EffectDescription *EffectDescription = + getEffectDescription(node, &id); + effects[id] = EffectDescription; + } else if (xmlStrEqual(node->name, BAD_CAST "default")) + { + EffectDescription *EffectDescription = + getEffectDescription(node, &id); + + if (default_effect) + delete default_effect; + + default_effect = EffectDescription; + } + } + + effects_initialized = true; + } // done initializing + + EffectDescription *ed = effects[effectId]; + + if (!ed) + return default_effect; + else + return ed; +} + +void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx) +{ + logger->log("Special effect #%d on %s", effectId, + getId() == player_node->getId() ? "self" : "other"); + + EffectDescription *ed = getEffectDescription(effectId); + + if (!ed) { + logger->log("Unknown special effect and no default recorded"); + return; + } + + if (gfx && ed->mGFXEffect != "") { + Particle *selfFX; + + selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0); + controlParticle(selfFX); + } + + if (sfx && ed->mSFXEffect != "") { + sound.playSfx(ed->mSFXEffect); + } +} + + + + +static int hairStylesNr; +static int hairColorsNr; +static std::vector<std::string> hairColors; + +static void initializeHair(); + +int Being::getHairStylesNr() +{ + initializeHair(); + return hairStylesNr; +} + +int Being::getHairColorsNr() +{ + initializeHair(); + return hairColorsNr; +} + +std::string Being::getHairColor(int index) +{ + initializeHair(); + if (index < 0 || index >= hairColorsNr) + return "#000000"; + + return hairColors[index]; +} + +static bool hairInitialized = false; + +static void initializeHair() +{ + if (hairInitialized) + return; + + // Hairstyles are encoded as negative numbers. Count how far negative we + // can go. + int hairstylesCtr = -1; + while (ItemDB::get(hairstylesCtr).getSprite(GENDER_MALE) != "error.xml") + --hairstylesCtr; + + hairStylesNr = -hairstylesCtr; // done. + if (hairStylesNr == 0) + hairStylesNr = 1; // No hair style -> no hair + + hairColorsNr = 0; + + XML::Document doc(HAIR_FILE); + xmlNodePtr root = doc.rootNode(); + + if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + { + logger->log("Error loading being hair configuration file"); + } else { + for_each_xml_child_node(node, root) + { + if (xmlStrEqual(node->name, BAD_CAST "color")) + { + int index = atoi(XML::getProperty(node, "id", "-1").c_str()); + std::string value = XML::getProperty(node, "value", ""); + + if (index >= 0 && value != "") { + if (index >= hairColorsNr) { + hairColorsNr = index + 1; + hairColors.resize(hairColorsNr, "#000000"); + } + hairColors[index] = value; + } + } + } + } // done initializing + + if (hairColorsNr == 0) { // No colours -> black only + hairColorsNr = 1; + hairColors.resize(hairColorsNr, "#000000"); + } + + hairInitialized = 1; +} diff --git a/src/being.h b/src/being.h index d722092e..3c3a9b73 100644 --- a/src/being.h +++ b/src/being.h @@ -26,9 +26,9 @@ #include <SDL_types.h> +#include <set> #include <string> #include <vector> -#include <bitset> #include "particlecontainer.h" #include "position.h" @@ -53,6 +53,8 @@ class Position; class SpeechBubble; class Text; +class StatusEffect; + typedef std::list<Sprite*> Sprites; typedef Sprites::iterator SpriteIterator; @@ -112,7 +114,6 @@ class Being : public Sprite NUM_TC }; - /** * Directions, to be used as bitmask values */ @@ -121,7 +122,7 @@ class Being : public Sprite Uint16 mJob; /**< Job (player job, npc, monster, ) */ Uint16 mX, mY; /**< Tile coordinates */ Action mAction; /**< Action the being is performing */ - Uint16 mFrame; + Uint16 mFrame; Uint16 mWalkTime; Uint8 mEmotion; /**< Currently showing emotion */ Uint8 mEmotionTime; /**< Time until emotion disappears */ @@ -180,14 +181,16 @@ class Being : public Sprite /** * Returns the name of the being. */ - const std::string& getName() const { return mName; } + const std::string &getName() const + { return mName; } /** * Sets the name for the being. * * @param name The name that should appear. */ - virtual void setName(const std::string &name) { mName = name; } + virtual void setName(const std::string &name) + { mName = name; } /** * Gets the hair color for this being. @@ -331,12 +334,14 @@ class Being : public Sprite /** * Get the current X pixel offset. */ - int getXOffset() const { return getOffset(LEFT, RIGHT); } + int getXOffset() const + { return getOffset(LEFT, RIGHT); } /** * Get the current Y pixel offset. */ - int getYOffset() const { return getOffset(UP, DOWN); } + int getYOffset() const + { return getOffset(UP, DOWN); } /** * Returns the horizontal size of the current base sprite of the being @@ -367,12 +372,45 @@ class Being : public Sprite mEmotionTime = emote_time; } + /** + * Sets the being's stun mode. If zero, the being is `normal', + * otherwise it is `stunned' in some fashion. + */ + void setStunMode(int stunMode) + { + if (mStunMode != stunMode) + updateStunMode(mStunMode, stunMode); + mStunMode = stunMode; + }; + + void setStatusEffect(int index, bool active); + + /** + * A status effect block is a 16 bit mask of status effects. + * We assign each such flag a block ID of offset + bitnr. + * + * These are NOT the same as the status effect indices. + */ + void setStatusEffectBlock(int offset, Uint16 flags); + + /** + * Triggers a visual effect, such as `level up' + * + * Only draws the visual effect, does not play sound effects + * + * \param effectId ID of the effect to trigger + */ + virtual void triggerEffect(int effectId) + { + internalTriggerEffect(effectId, false, true); + } + // Target cursor being used by the being Image *mTargetCursor; - static int getHairColorsNr(void); + static int getHairColorsNr(); - static int getHairStylesNr(void); + static int getHairStylesNr(); static std::string getHairColor(int index); @@ -399,6 +437,26 @@ class Being : public Sprite */ void internalTriggerEffect(int effectId, bool sfx, bool gfx); + /** + * Notify self that the stun mode has been updated. Invoked by + * setStunMode if something changed. + */ + virtual void updateStunMode(int oldMode, int newMode); + + /** + * Notify self that a status effect has flipped. + * The new flag is passed. + */ + virtual void updateStatusEffect(int index, bool newStatus); + + /** + * Handle an update to a status or stun effect + * + * \param The StatusEffect to effect + * \param effectId -1 for stun, otherwise the effect index + */ + virtual void handleStatusEffect(StatusEffect *effect, int effectId); + Uint32 mId; /**< Unique sprite id */ Uint16 mWalkSpeed; /**< Walking speed */ Uint8 mDirection; /**< Facing direction */ @@ -408,8 +466,6 @@ class Being : public Sprite bool mIsGM; bool mParticleEffects; /**< Whether to display particles or not */ - typedef std::bitset<STATUS_EFFECTS> StatusEffects; - /** Engine-related infos about weapon. */ const ItemInfo* mEquippedWeapon; @@ -422,8 +478,8 @@ class Being : public Sprite Gender mGender; Uint32 mSpeechTime; Sint32 mPx, mPy; /**< Pixel coordinates */ - Uint16 mStunMode; /**< Stun mode; zero if not stunned */ - StatusEffects mStatusEffects; /**< Bitset of active status effects */ + Uint16 mStunMode; /**< Stun mode; zero if not stunned */ + std::set<int> mStatusEffects; /**< set of active status effects */ gcn::Color mNameColor; @@ -441,6 +497,9 @@ class Being : public Sprite */ int getOffset(char pos, char neg) const; + /** Reset particle status effects on next redraw? */ + bool mMustResetParticles; + // Speech Bubble components SpeechBubble *mSpeechBubble; diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index a417ee50..3c8edf86 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -20,6 +20,7 @@ */ #include "beingmanager.h" + #include "localplayer.h" #include "monster.h" #include "npc.h" @@ -30,6 +31,8 @@ #include "utils/dtor.h" +#include <cassert> + class FindBeingFunctor { public: @@ -70,15 +73,15 @@ Being* BeingManager::createBeing(Uint32 id, Uint16 job) if (job < 10) being = new Player(id, job, mMap); - else if (job >= 100 && job < 200) + else if (job >= 50 && job < 1002) being = new NPC(id, job, mMap, mNetwork); - else if (job >= 1000 && job < 1200) + else if (job >= 1002 && job < 1500) being = new Monster(id, job, mMap); else being = new Being(id, job, mMap); // Player or NPC - if (job < 200) + if (job < 1002) { MessageOut outMsg(mNetwork); outMsg.writeInt16(0x0094); diff --git a/src/configuration.cpp b/src/configuration.cpp index f6c74428..6815ea03 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -56,7 +56,8 @@ void Configuration::setValue(const std::string &key, std::string value) } } -std::string ConfigurationObject::getValue(const std::string &key, std::string deflt) +std::string ConfigurationObject::getValue(const std::string &key, + std::string deflt) { OptionIterator iter = mOptions.find(key); return ((iter != mOptions.end()) ? iter->second : deflt); @@ -77,7 +78,7 @@ void ConfigurationObject::deleteList(const std::string &name) mContainerOptions[name].clear(); } -void ConfigurationObject::clear(void) +void ConfigurationObject::clear() { for (std::map<std::string, ConfigurationList>::const_iterator it = mContainerOptions.begin(); it != mContainerOptions.end(); it++) @@ -85,7 +86,7 @@ void ConfigurationObject::clear(void) mOptions.clear(); } -ConfigurationObject::~ConfigurationObject(void) +ConfigurationObject::~ConfigurationObject() { clear(); } diff --git a/src/configuration.h b/src/configuration.h index da12e1e4..4d28008d 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -72,7 +72,7 @@ class ConfigurationObject friend class Configuration; public: - virtual ~ConfigurationObject(void); + virtual ~ConfigurationObject(); /** * Sets an option using a string value. @@ -109,7 +109,7 @@ class ConfigurationObject /** * Re-sets all data in the configuration */ - virtual void clear(void); + virtual void clear(); /** * Serialises a container into a list of configuration options @@ -159,7 +159,7 @@ class ConfigurationObject { ConfigurationList *list = &(mContainerOptions[name]); CONT container = empty; - + for (ConfigurationList::const_iterator it = list->begin(); it != list->end(); it++) container = manager->readConfigItem(*it, container); @@ -188,7 +188,7 @@ class ConfigurationObject class Configuration : public ConfigurationObject { public: - virtual ~Configuration(void) {} + virtual ~Configuration() {} /** * Reads config file and parse all options into memory. @@ -215,6 +215,7 @@ class Configuration : public ConfigurationObject virtual void setValue(const std::string &key, std::string value); virtual void setValue(const std::string &key, float value); + private: typedef std::list<ConfigListener*> Listeners; typedef Listeners::iterator ListenerIterator; diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 0a04c33d..f004a450 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -1,8 +1,9 @@ /* - * The Mana World - * Copyright 2008 The Mana World Development Team + * An effects manager + * Copyright (C) 2008 Fate <fate.tmw@googlemail.com> + * Copyright (C) 2008 Chuck Miller <shadowmil@gmail.com> * - * This file is part of Aethyra. + * This file is part of The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,7 +41,7 @@ EffectManager::EffectManager() else { logger->log("Effects are now loading"); - } + } for_each_xml_child_node(node, root) { @@ -70,15 +71,15 @@ bool EffectManager::trigger(int id, Being* being) if ((*i).id == id) { rValue = true; - if((*i).GFX != "") + if (!(*i).GFX.empty()) { Particle *selfFX; selfFX = particleEngine->addEffect((*i).GFX, 0, 0); being->controlParticle(selfFX); } - if((*i).SFX != "") + if (!(*i).SFX.empty()) sound.playSfx((*i).SFX); - break; + break; } } return rValue; @@ -92,13 +93,12 @@ bool EffectManager::trigger(int id, int x, int y) if ((*i).id == id) { rValue = true; - if((*i).GFX != "") + if (!(*i).GFX.empty()) particleEngine->addEffect((*i).GFX, x, y); - if((*i).SFX != "") + if (!(*i).SFX.empty()) sound.playSfx((*i).SFX); - break; + break; } } return rValue; } - diff --git a/src/effectmanager.h b/src/effectmanager.h index 619b8e0d..12fe3133 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -1,8 +1,9 @@ /* - * The Mana World - * Copyright 2008 The Mana World Development Team + * An effects manager + * Copyright (C) 2008 Fate <fate.tmw@googlemail.com> + * Copyright (C) 2008 Chuck Miller <shadowmil@gmail.com> * - * This file is part of Aethyra. + * This file is part of The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,8 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _EFFECT_MANAGER_H -#define _EFFECT_MANAGER_H +#ifndef EFFECT_MANAGER_H +#define EFFECT_MANAGER_H #include <list> #include <string> @@ -38,28 +39,25 @@ class EffectManager std::string SFX; }; - EffectManager(); - ~EffectManager(); /** * Triggers a effect with the id, at * the specified being. */ - bool trigger(int id, Being* being); + bool trigger(int id, Being* being); /** * Triggers a effect with the id, at * the specified x and y coordinate. */ - bool trigger(int id, int x, int y); + bool trigger(int id, int x, int y); private: std::list<EffectDescription> mEffects; - }; extern EffectManager *effectManager; -#endif // _EFFECT_MANAGER_H +#endif // EFFECT_MANAGER_H diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp index 66989d44..807fa3a2 100644 --- a/src/emoteshortcut.cpp +++ b/src/emoteshortcut.cpp @@ -1,22 +1,22 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "emoteshortcut.h" diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h index 3f907e1b..ceb51a9b 100644 --- a/src/emoteshortcut.h +++ b/src/emoteshortcut.h @@ -1,26 +1,26 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EMOTESHORTCUT_H__ -#define EMOTESHORTCUT_H__ +#ifndef EMOTESHORTCUT_H +#define EMOTESHORTCUT_H #define SHORTCUT_EMOTES 12 diff --git a/src/engine.cpp b/src/engine.cpp index c91e42f9..39b9b3ec 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -98,7 +98,7 @@ void Engine::changeMap(const std::string &mapPath) map_path.c_str()); } - // How many pixels equal one tile. .5 (which is the TMW default) is + // How many pixels equal one tile. .5 (which is the TMW default) is // 2 tiles to a pixel, while 1 is 1 tile to 1 pixel if (newMap->hasProperty("minimapproportion")) minimap->setProportion(atof( diff --git a/src/equipment.cpp b/src/equipment.cpp index b21115a3..cb7acd44 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -35,6 +35,5 @@ void Equipment::setEquipment(int index, int inventoryIndex) mEquipment[index] = inventoryIndex; Item* item = player_node->getInventory()->getItem(inventoryIndex); if (item) - item->setEquipped(true); + item->setEquipped(true); } - diff --git a/src/game.cpp b/src/game.cpp index e2064f58..48ca1c73 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -176,11 +176,11 @@ Uint32 nextSecond(Uint32 interval, void *param) int get_elapsed_time(int start_time) { - if (start_time <= tick_time) + if (start_time <= tick_time) { return (tick_time - start_time) * 10; } - else + else { return (tick_time + (MAX_TIME - start_time)) * 10; } @@ -222,6 +222,8 @@ void createGuiWindows(Network *network) miniStatusWindow->getWindowName() + "Visible", true)); buyDialog->setVisible(false); sellDialog->setVisible(false); + minimap->setVisible((bool) config.getValue( + minimap->getWindowName() + "Visible", true)); tradeWindow->setVisible(false); menuWindow->setVisible((bool) config.getValue( menuWindow->getWindowName() + "Visible", true)); @@ -366,11 +368,11 @@ static bool saveScreenshot() filenameSuffix.str(""); filename << PHYSFS_getUserDir(); #if (defined __USE_UNIX98 || defined __FreeBSD__) - filenameSuffix << ".aethyra/"; + filenameSuffix << ".tmw/"; #elif defined __APPLE__ filenameSuffix << "Desktop/"; #endif - filenameSuffix << "Ae_Screenshot_" << screenshotCount << ".png"; + filenameSuffix << "TMW_Screenshot_" << screenshotCount << ".png"; filename << filenameSuffix.str(); testExists.open(filename.str().c_str(), std::ios::in); found = !testExists.is_open(); @@ -464,7 +466,8 @@ void Game::logic() if (!disconnectedDialog) { disconnectedDialog = new OkDialog(_("Network Error"), - _("The connection to the server was lost, the program will now quit")); + _("The connection to the server was lost, " + "the program will now quit")); disconnectedDialog->addActionListener(&exitListener); disconnectedDialog->requestMoveToTop(); } @@ -488,7 +491,7 @@ void Game::handleInput() { gcn::Window *requestedWindow = NULL; - if (setupWindow->isVisible() && + if (setupWindow->isVisible() && keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE) { keyboard.setNewKey((int) event.key.keysym.sym); @@ -594,7 +597,7 @@ void Game::handleInput() case KeyboardConfig::KEY_QUIT: if (!exitConfirm) { - exitConfirm = new ConfirmDialog( _("Quit"), + exitConfirm = new ConfirmDialog( _("Quit"), _("Are you sure you " "want to quit?")); exitConfirm->addActionListener(&exitListener); @@ -621,7 +624,7 @@ void Game::handleInput() i <= KeyboardConfig::KEY_SHORTCUT_12; i++) { - if (tKey == i && !used) + if (tKey == i && !used) { itemShortcut->useItem( i - KeyboardConfig::KEY_SHORTCUT_1); @@ -634,9 +637,9 @@ void Game::handleInput() { case KeyboardConfig::KEY_PICKUP: { - FloorItem *item = floorItemManager->findByCoordinates( - player_node->mX, - player_node->mY); + FloorItem *item = + floorItemManager->findByCoordinates( + player_node->mX, player_node->mY); // If none below the player, try the tile in front // of the player @@ -652,7 +655,9 @@ void Game::handleInput() x--; if (player_node->getDirection() & Being::RIGHT) x++; - item = floorItemManager->findByCoordinates(x, y); + + item = floorItemManager->findByCoordinates( + x, y); } if (item) @@ -822,7 +827,7 @@ void Game::handleInput() if (keyboard.isKeyActive(keyboard.KEY_ATTACK) || (joystick && joystick->buttonPressed(0))) { - Being *target = beingManager->findNearestLivingBeing(x, y, 20, + Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER); bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET); @@ -850,7 +855,7 @@ void Game::handleInput() } // Target the nearest player if 'q' is pressed - if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && + if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && !keyboard.isKeyActive(keyboard.KEY_TARGET) ) { Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER); @@ -859,8 +864,8 @@ void Game::handleInput() } // Target the nearest monster if 'a' pressed - if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || - (joystick && joystick->buttonPressed(3))) && + if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || + (joystick && joystick->buttonPressed(3))) && !keyboard.isKeyActive(keyboard.KEY_TARGET)) { Being *target = beingManager->findNearestLivingBeing( @@ -870,7 +875,7 @@ void Game::handleInput() } // Target the nearest npc if 'n' pressed - if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && + if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && !keyboard.isKeyActive(keyboard.KEY_TARGET) ) { Being *target = beingManager->findNearestLivingBeing( @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef GAME_ -#define GAME_ +#ifndef GAME_H +#define GAME_H #include <memory> @@ -36,35 +36,35 @@ extern volatile int tick_time; class Game : public ConfigListener { public: - Game(Network *network); - ~Game(); + Game(Network *network); + ~Game(); - void logic(); + void logic(); - void handleInput(); + void handleInput(); - void optionChanged(const std::string &name); + void optionChanged(const std::string &name); private: - Network *mNetwork; + Network *mNetwork; - /** Used to determine whether to draw the next frame. */ - int mDrawTime; + /** Used to determine whether to draw the next frame. */ + int mDrawTime; - /** The minimum frame time (used for frame limiting). */ - int mMinFrameTime; + /** The minimum frame time (used for frame limiting). */ + int mMinFrameTime; - typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr; - MessageHandlerPtr mBeingHandler; - MessageHandlerPtr mBuySellHandler; - MessageHandlerPtr mChatHandler; - MessageHandlerPtr mEquipmentHandler; - MessageHandlerPtr mInventoryHandler; - MessageHandlerPtr mItemHandler; - MessageHandlerPtr mNpcHandler; - MessageHandlerPtr mPlayerHandler; - MessageHandlerPtr mSkillHandler; - MessageHandlerPtr mTradeHandler; + typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr; + MessageHandlerPtr mBeingHandler; + MessageHandlerPtr mBuySellHandler; + MessageHandlerPtr mChatHandler; + MessageHandlerPtr mEquipmentHandler; + MessageHandlerPtr mInventoryHandler; + MessageHandlerPtr mItemHandler; + MessageHandlerPtr mNpcHandler; + MessageHandlerPtr mPlayerHandler; + MessageHandlerPtr mSkillHandler; + MessageHandlerPtr mTradeHandler; }; /** diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 5895d557..65659df6 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -103,7 +103,7 @@ void BrowserBox::addRow(const std::string &row) newRow += "##<" + bLink.caption; tmp.erase(0, idx3 + 2); - if(tmp != "") + if (tmp != "") { newRow += "##>"; } diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 6626b848..8de4f5a7 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -94,8 +94,8 @@ CharSelectDialog::CharSelectDialog(Network *network, mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0)); mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0)); - const std::string tempString = getFont()->getWidth(_("New")) < - getFont()->getWidth(_("Delete")) ? + const std::string tempString = getFont()->getWidth(_("New")) < + getFont()->getWidth(_("Delete")) ? _("Delete") : _("New"); mPreviousButton = new Button(_("Previous"), "previous", this); @@ -231,7 +231,7 @@ bool CharSelectDialog::selectByName(const std::string &name) unsigned int oldPos = mCharInfo->getPos(); mCharInfo->select(0); - do + do { LocalPlayer *player = mCharInfo->getEntry(); @@ -309,15 +309,15 @@ CharCreateDialog::~CharCreateDialog() void CharCreateDialog::action(const gcn::ActionEvent &event) { int numberOfColors = ColorDB::size(); - if (event.getId() == "create") + if (event.getId() == "create") { - if (getName().length() >= 4) + if (getName().length() >= 4) { // Attempt to create the character mCreateButton->setEnabled(false); attemptCharCreate(); } - else + else { new OkDialog("Error", "Your name needs to be at least 4 characters.", this); @@ -326,18 +326,18 @@ void CharCreateDialog::action(const gcn::ActionEvent &event) else if (event.getId() == "cancel") scheduleDelete(); else if (event.getId() == "nextcolor") - mPlayer->setHairStyle(mPlayer->getHairStyle(), + mPlayer->setHairStyle(mPlayer->getHairStyle(), (mPlayer->getHairColor() + 1) % numberOfColors); else if (event.getId() == "prevcolor") - mPlayer->setHairStyle(mPlayer->getHairStyle(), - (mPlayer->getHairColor() + numberOfColors - 1) % + mPlayer->setHairStyle(mPlayer->getHairStyle(), + (mPlayer->getHairColor() + numberOfColors - 1) % numberOfColors); else if (event.getId() == "nextstyle") - mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, + mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, mPlayer->getHairColor()); else if (event.getId() == "prevstyle") - mPlayer->setHairStyle(mPlayer->getHairStyle() + - mPlayer->getNumOfHairstyles() - 1, + mPlayer->setHairStyle(mPlayer->getHairStyle() + + mPlayer->getNumOfHairstyles() - 1, mPlayer->getHairColor()); } diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 2363fc50..1c0cea13 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -138,18 +138,20 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord) } std::string lineColor = "##C"; - switch (own) + switch (own) { case BY_GM: if (tmp.nick.empty()) { - tmp.nick = std::string(_("Global announcement: ")); + tmp.nick = std::string(_("Global announcement:")); + tmp.nick += " "; lineColor = "##G"; } else { - tmp.nick = strprintf(_("Global announcement from %s: "), + tmp.nick = strprintf(_("Global announcement from %s:"), tmp.nick.c_str()); + tmp.nick += " "; lineColor = "##1"; // Equiv. to BrowserBox::RED } break; @@ -172,7 +174,8 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord) lineColor = "##P"; break; case ACT_WHISPER: - tmp.nick += CAT_WHISPER; + tmp.nick = strprintf(_("%s whispers:"), tmp.nick.c_str()); + tmp.nick += " "; lineColor = "##W"; break; case ACT_IS: @@ -215,7 +218,7 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord) // adding a row, otherwise the max will always be a row higher // at comparison. if (mScrollArea->getVerticalScrollAmount() == - mScrollArea->getVerticalMaxScroll()) + mScrollArea->getVerticalMaxScroll()) { mTextOutput->addRow(line); mScrollArea->setVerticalScrollAmount(mScrollArea-> @@ -234,7 +237,7 @@ void ChatWindow::chatLog(CHATSKILL act) chatLog(const_msg(act), BY_SERVER); } -void ChatWindow::action(const gcn::ActionEvent & event) +void ChatWindow::action(const gcn::ActionEvent &event) { if (event.getId() == "chatinput") { @@ -341,7 +344,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) return; // Send party message - if (msg.at(0) == mPartyPrefix) + if (msg.at(0) == mPartyPrefix) { msg.erase(0, 1); std::size_t length = msg.length() + 1; @@ -367,7 +370,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) if (end != std::string::npos) { // Catch multiple embeds and ignore them so it doesn't crash the client. - while ((msg.find('[', start + 1) != std::string::npos) && + while ((msg.find('[', start + 1) != std::string::npos) && (msg.find('[', start + 1) < end)) { start = msg.find('[', start + 1); @@ -395,7 +398,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) } // Prepare ordinary message - if (msg.substr(0, 1) != "/") + if (msg.substr(0, 1) != "/") { msg = nick + " : " + msg; @@ -423,14 +426,14 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) trim(msg); } - if (command == "announce") + if (command == "announce") { MessageOut outMsg(mNetwork); outMsg.writeInt16(0x0099); outMsg.writeInt16(msg.length() + 4); outMsg.writeString(msg, msg.length()); } - else if (command == "help") + else if (command == "help") { trim(msg); std::size_t space = msg.find(" "); @@ -483,16 +486,16 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) msg = msg.substr(0, 1); - if (msg == "1" || - msg == "y" || msg == "Y" || + if (msg == "1" || + msg == "y" || msg == "Y" || msg == "t" || msg == "T") { chatLog(_("Return now toggles chat."), BY_SERVER); mReturnToggles = true; return; } - else if (msg == "0" || - msg == "n" || msg == "N" || + else if (msg == "0" || + msg == "n" || msg == "N" || msg == "f" || msg == "F") { chatLog(_("Message now closes chat."), BY_SERVER); @@ -697,9 +700,8 @@ void ChatWindow::scroll(int amount) mTextOutput->showPart(scr); } -void ChatWindow::keyPressed(gcn::KeyEvent & event) +void ChatWindow::keyPressed(gcn::KeyEvent &event) { - if (event.getKey().getValue() == Key::DOWN && mCurHist != mHistory.end()) { @@ -787,7 +789,7 @@ void ChatWindow::party(const std::string & command, const std::string & rest) void ChatWindow::help(const std::string & msg1, const std::string & msg2) { chatLog(_("-- Help --"), BY_SERVER); - if (msg1 == "") + if (msg1 == "") { chatLog(_("/announce: Global announcement (GM only)"), BY_SERVER); chatLog(_("/clear: Clears this window"), BY_SERVER); @@ -827,18 +829,18 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2) chatLog(_("Command: /help <command>"), BY_SERVER); chatLog(_("This command displays help on <command>."), BY_SERVER); } - else if (msg1 == "party") + else if (msg1 == "party") { mParty->help(msg2); } - else if (msg1 == "present") + else if (msg1 == "present") { chatLog(_("Command: /present"), BY_SERVER); chatLog(_("This command gets a list of players within hearing and " "sends it to either the record log if recording, or the chat " "log otherwise."), BY_SERVER); } - else if (msg1 == "record") + else if (msg1 == "record") { chatLog(_("Command: /record <filename>"), BY_SERVER); chatLog(_("This command starts recording the chat log to the file " @@ -846,10 +848,10 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2) chatLog(_("Command: /record"), BY_SERVER); chatLog(_("This command finishes a recording session."), BY_SERVER); } - else if (msg1 == "toggle") + else if (msg1 == "toggle") { chatLog(_("Command: /toggle <state>"), BY_SERVER); - chatLog(_("This command sets whether the return key should toggle the" + chatLog(_("This command sets whether the return key should toggle the" "chat log, or whether the chat log turns off automatically."), BY_SERVER); chatLog(_("<state> can be one of \"1\", \"yes\", \"true\" to " diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp index c4505c2f..cdb5a3fd 100644 --- a/src/gui/colour.cpp +++ b/src/gui/colour.cpp @@ -1,23 +1,23 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program is distributed with The Mana Experiment * - * 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include "colour.h" diff --git a/src/gui/colour.h b/src/gui/colour.h index d0349b7d..6ea02840 100644 --- a/src/gui/colour.h +++ b/src/gui/colour.h @@ -1,26 +1,26 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program is distributed with The Mana Experiment * - * 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - -#ifndef _COLOUR_H -#define _COLOUR_H +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef COLOUR_H +#define COLOUR_H #include <string> #include <vector> diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp index 8bb9c578..38697f3a 100644 --- a/src/gui/confirm_dialog.cpp +++ b/src/gui/confirm_dialog.cpp @@ -55,7 +55,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg, // 15 == height of each line of text (based on font heights) // 14 == row top + bottom graphic pixel heights setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + noButton->getHeight()); - mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, + mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, 3 + (numRows * 14))); } else diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp index fa63d4bb..94ce9736 100644 --- a/src/gui/emotecontainer.cpp +++ b/src/gui/emotecontainer.cpp @@ -1,22 +1,22 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <guichan/mouseinput.hpp> @@ -90,7 +90,7 @@ void EmoteContainer::draw(gcn::Graphics *graphics) { int emoteX = ((i) % columns) * gridWidth; int emoteY = ((i) / columns) * gridHeight; - + // Draw emote icon mEmoteImg[i]->draw(static_cast<Graphics*>(graphics), emoteX, emoteY); @@ -121,7 +121,7 @@ void EmoteContainer::recalculateHeight() setHeight(height); } -int EmoteContainer::getSelectedEmote() +int EmoteContainer::getSelectedEmote() { if (mSelectedEmoteIndex == NO_EMOTE) return 0; diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h index 5a2b8c2e..fefce793 100644 --- a/src/gui/emotecontainer.h +++ b/src/gui/emotecontainer.h @@ -1,26 +1,26 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EMOTECONTAINER_H__ -#define EMOTECONTAINER_H__ +#ifndef EMOTECONTAINER_H +#define EMOTECONTAINER_H #include <list> #include <vector> @@ -41,7 +41,7 @@ namespace gcn { * * \ingroup GUI */ -class EmoteContainer : public gcn::Widget, +class EmoteContainer : public gcn::Widget, public gcn::MouseListener, public gcn::WidgetListener { @@ -101,8 +101,8 @@ class EmoteContainer : public gcn::Widget, private: /** - - * Sets the currently selected emote. Invalid (e.g., negative) indices set `no emotr'. + * Sets the currently selected emote. Invalid (e.g., negative) indices + * set `no emotr'. */ void setSelectedEmoteIndex(int index); diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp index e35d037f..b66592c1 100644 --- a/src/gui/emoteshortcutcontainer.cpp +++ b/src/gui/emoteshortcutcontainer.cpp @@ -1,22 +1,22 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "emoteshortcutcontainer.h" @@ -121,14 +121,14 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics) void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event) { - if (event.getButton() == gcn::MouseEvent::LEFT) + if (event.getButton() == gcn::MouseEvent::LEFT) { - if (!mEmoteMoved && mEmoteClicked) + if (!mEmoteMoved && mEmoteClicked) { const int index = getIndexFromGrid(event.getX(), event.getY()); const int emoteId = emoteShortcut->getEmote(index); - if (index == -1) + if (index == -1) { return; } @@ -139,7 +139,7 @@ void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event) emoteShortcut->removeEmote(index); } } - if (mEmoteMoved) + if (mEmoteMoved) { mCursorPosX = event.getX(); mCursorPosY = event.getY(); @@ -151,18 +151,18 @@ void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event) { const int index = getIndexFromGrid(event.getX(), event.getY()); - if (index == -1) + if (index == -1) { return; } // Stores the selected emote if there is one. - if (emoteShortcut->isEmoteSelected()) + if (emoteShortcut->isEmoteSelected()) { emoteShortcut->setEmote(index); emoteShortcut->setEmoteSelected(0); } - else if (emoteShortcut->getEmote(index)) + else if (emoteShortcut->getEmote(index)) { mEmoteClicked = true; } @@ -179,13 +179,13 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event) emoteShortcut->setEmoteSelected(0); } - if (index == -1) + if (index == -1) { mEmoteMoved = 0; return; } - if (mEmoteMoved) + if (mEmoteMoved) { emoteShortcut->setEmotes(index, mEmoteMoved); mEmoteMoved = 0; @@ -195,7 +195,7 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event) emoteShortcut->useEmote(index + 1); } - if (mEmoteClicked) + if (mEmoteClicked) { mEmoteClicked = false; } diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h index e8d87b60..d32a9f79 100644 --- a/src/gui/emoteshortcutcontainer.h +++ b/src/gui/emoteshortcutcontainer.h @@ -1,26 +1,26 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EMOTESHORTCUTCONTAINER_H__ -#define EMOTESHORTCUTCONTAINER_H__ +#ifndef EMOTESHORTCUTCONTAINER_H +#define EMOTESHORTCUTCONTAINER_H #include <vector> diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp index 3fa96a6d..f4a8999a 100644 --- a/src/gui/emotewindow.cpp +++ b/src/gui/emotewindow.cpp @@ -1,22 +1,22 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "button.h" @@ -29,7 +29,7 @@ #include "../localplayer.h" -#include "../utils/gettext.h" +#include "../utils/gettext.h" #include "../utils/tostring.h" EmoteWindow::EmoteWindow(): diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h index c642ff6f..8af24a7b 100644 --- a/src/gui/emotewindow.h +++ b/src/gui/emotewindow.h @@ -1,22 +1,22 @@ /* - * Aethyra - * Copyright 2009 Aethyra Development Team + * Extended support for activating emotes + * Copyright (C) 2009 Aethyra Development Team * - * This file is part of Aethyra. + * This file is part of The Mana World. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef EMOTEWINDOW_H diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index e553fbe7..a2be6b00 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -125,7 +125,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) graphics->drawText(toString(item->getQuantity()), mEquipBox[i].posX + (BOX_WIDTH / 2), mEquipBox[i].posY - getFont()->getHeight(), - gcn::Graphics::CENTER); + gcn::Graphics::CENTER); } } diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 4ae3300f..c491062a 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -1,26 +1,26 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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 Mana World is distributed in the hope that it will be useful, + * This program 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 Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef EQUIPMENT_WINDOW_H -#define EQUIPMENT_WINDOW_H +#ifndef EQUIPMENTWINDOW_H +#define EQUIPMENTWINDOW_H #include <guichan/actionlistener.hpp> diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 70b3efb5..b9fe1c90 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -57,11 +57,11 @@ InventoryWindow::InventoryWindow(int invSize): // If you adjust these defaults, don't forget to adjust the trade window's. setDefaultSize(115, 25, 375, 300); - std::string longestUseString = getFont()->getWidth(_("Equip")) > + std::string longestUseString = getFont()->getWidth(_("Equip")) > getFont()->getWidth(_("Use")) ? _("Equip") : _("Use"); - if (getFont()->getWidth(longestUseString) < + if (getFont()->getWidth(longestUseString) < getFont()->getWidth(_("Unequip"))) { longestUseString = _("Unequip"); @@ -150,7 +150,7 @@ void InventoryWindow::logic() // Adjust progress bars mSlotsBar->setProgress((float) player_node->getInventory()->getNumberOfSlotsUsed() / mMaxSlots); - mWeightBar->setProgress((float) player_node->mTotalWeight / + mWeightBar->setProgress((float) player_node->mTotalWeight / player_node->mMaxWeight); mSlotsBar->setText(strprintf("%s/%d", mUsedSlots.c_str(), mMaxSlots)); diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 5693d001..0beb5cfb 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -19,13 +19,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <SDL_mouse.h> +#include "itemcontainer.h" + +#include "itempopup.h" #include <guichan/mouseinput.hpp> #include <guichan/selectionlistener.hpp> -#include "itemcontainer.h" -#include "itempopup.h" +#include <SDL_mouse.h> #include "../graphics.h" #include "../inventory.h" @@ -124,7 +125,7 @@ void ItemContainer::draw(gcn::Graphics *graphics) // Draw item caption graphics->setFont(getFont()); - graphics->setColor(0x000000); + graphics->setColor(gcn::Color(0, 0, 0)); graphics->drawText( (item->isEquipped() ? "Eq." : toString(item->getQuantity())), itemX + gridWidth / 2, @@ -171,7 +172,6 @@ void ItemContainer::refindSelectedItem() { if (mSelectedItemIndex != NO_ITEM) { - if (mInventory->getItem(mSelectedItemIndex) && mInventory->getItem(mSelectedItemIndex)->getId() == mLastSelectedItemId) return; // we're already fine @@ -204,6 +204,7 @@ void ItemContainer::setSelectedItemIndex(int index) newSelectedItemIndex = NO_ITEM; else newSelectedItemIndex = index; + if (mSelectedItemIndex != newSelectedItemIndex) { mSelectedItemIndex = newSelectedItemIndex; diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h index f027de19..71fcc5d0 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -42,7 +42,7 @@ namespace gcn { * * \ingroup GUI */ -class ItemContainer : public gcn::Widget, +class ItemContainer : public gcn::Widget, public gcn::MouseListener, public gcn::WidgetListener { @@ -118,17 +118,17 @@ class ItemContainer : public gcn::Widget, /** * Find the current item index by the most recently used item ID */ - void refindSelectedItem(void); + void refindSelectedItem(); /** * Determine and set the height of the container. */ - void recalculateHeight(void); + void recalculateHeight(); /** * Sends out selection events to the list of selection listeners. */ - void distributeValueChangedEvent(void); + void distributeValueChangedEvent(); /** * Gets the slot index based on the cursor position. diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index b7e015a4..df7afa48 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -136,12 +136,12 @@ void ItemPopup::setItem(const ItemInfo &item) mItemWeightScroll->setDimension(gcn::Rectangle(2, 0, minWidth, numRowsWeight * getFont()->getHeight())); - if(item.getEffect() == "") + if (item.getEffect() == "") { setContentSize(minWidth, (numRowsDesc * getFont()->getHeight() + (3 * getFont()->getHeight()))); - mItemWeightScroll->setPosition(2, + mItemWeightScroll->setPosition(2, (numRowsDesc * getFont()->getHeight()) + (2 * getFont()->getHeight())); } @@ -151,7 +151,7 @@ void ItemPopup::setItem(const ItemInfo &item) (numRowsEffect * getFont()->getHeight()) + (3 * getFont()->getHeight())); - mItemWeightScroll->setPosition(2, + mItemWeightScroll->setPosition(2, (numRowsDesc * getFont()->getHeight()) + (numRowsEffect * getFont()->getHeight()) + (2 * getFont()->getHeight())); @@ -205,9 +205,9 @@ unsigned int ItemPopup::getNumRows() void ItemPopup::view(int x, int y) { if (windowContainer->getWidth() < (x + getWidth() + 5)) - x = windowContainer->getWidth() - getWidth(); + x = windowContainer->getWidth() - getWidth(); if ((y - getHeight() - 10) < 0) - y = 0; + y = 0; else y = y - getHeight() - 10; setPosition(x, y); diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 95ab6ffa..c820e3a0 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -5,23 +5,23 @@ * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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 Mana World is distributed in the hope that it will be useful, + * This program 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 Mana World; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef ITEMPOPUP_H__ -#define ITEMPOPUP_H__ +#ifndef ITEMPOPUP_H +#define ITEMPOPUP_H #include "window.h" @@ -51,4 +51,4 @@ class ItemPopup : public Window gcn::Color getColor(const std::string& type); }; -#endif // ITEMPOPUP_H__ +#endif // ITEMPOPUP_H diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp index d3cc2c22..42e3b853 100644 --- a/src/gui/itemshortcutcontainer.cpp +++ b/src/gui/itemshortcutcontainer.cpp @@ -81,6 +81,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics) { Graphics *g = static_cast<Graphics*>(graphics); + graphics->setColor(gcn::Color(0, 0, 0)); graphics->setFont(getFont()); for (int i = 0; i < mMaxItems; i++) diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 3c8e7cb3..e22ee2ad 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -54,9 +54,8 @@ LoginDialog::LoginDialog(LoginData *loginData): gcn::Label *portLabel = new gcn::Label(_("Port:")); gcn::Label *dropdownLabel = new gcn::Label(_("Recent:")); std::vector<std::string> dfltServer; - dfltServer.push_back("www.aethyra.org"); - dfltServer.push_back("www.aethyra.org"); - dfltServer.push_back("209.168.213.109"); + dfltServer.push_back("server.themanaworld.org"); + dfltServer.push_back("server.themanaworld.org"); std::vector<std::string> dfltPort; dfltPort.push_back("21001"); dfltPort.push_back("22001"); @@ -75,7 +74,7 @@ LoginDialog::LoginDialog(LoginData *loginData): mServerListBox); mServerDropDown->setOpaque(false); - mKeepCheck = new CheckBox(_("Keep"), mLoginData->remember); + mKeepCheck = new CheckBox(_("Remember Username"), mLoginData->remember); mOkButton = new Button(_("OK"), "ok", this); mCancelButton = new Button(_("Cancel"), "cancel", this); mRegisterButton = new Button(_("Register"), "register", this); diff --git a/src/gui/login.h b/src/gui/login.h index 023d60aa..c0d6e755 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -73,29 +73,29 @@ class LoginDialog : public Window, public gcn::ActionListener, */ bool canSubmit(); - /** - * Function to decide whether string is an unsigned short or not - * - * @param str the string to parse - * - * @return true is str is an unsigned short, false otherwise - */ - static bool isUShort(const std::string &str); - - /** - * Converts string to an unsigned short (undefined if invalid) - * - * @param str the string to parse - * - * @return the value str represents - */ - static unsigned short getUShort(const std::string &str); + /** + * Function to decide whether string is an unsigned short or not + * + * @param str the string to parse + * + * @return true is str is an unsigned short, false otherwise + */ + static bool isUShort(const std::string &str); + + /** + * Converts string to an unsigned short (undefined if invalid) + * + * @param str the string to parse + * + * @return the value str represents + */ + static unsigned short getUShort(const std::string &str); DropDown *mServerDropDown; gcn::TextField *mUserField; gcn::TextField *mPassField; gcn::TextField *mServerField; - gcn::TextField *mPortField; + gcn::TextField *mPortField; gcn::CheckBox *mKeepCheck; gcn::Button *mOkButton; gcn::Button *mCancelButton; @@ -111,26 +111,25 @@ class LoginDialog : public Window, public gcn::ActionListener, { private: std::vector<std::string> mServers; - std::vector<std::string> mPorts; + std::vector<std::string> mPorts; std::string mConfigPrefix; int mMaxEntries; void saveEntry(const std::string &server, - const std::string &port, int &saved); + const std::string &port, int &saved); public: DropDownList(std::string prefix, std::vector<std::string> dfltServer, - std::vector<std::string> dfltPort, + std::vector<std::string> dfltPort, int maxEntries); void save(const std::string &server, const std::string &port); int getNumberOfElements(); std::string getElementAt(int i); - std::string getServerAt(int i); - std::string getPortAt(int i); + std::string getServerAt(int i); + std::string getPortAt(int i); }; DropDownList *mServerList; gcn::ListBox *mServerListBox; gcn::ScrollArea *mServerScrollArea; - }; #endif diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 37505305..55cd8b5d 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -68,9 +68,9 @@ void Minimap::setMapImage(Image *img) const int offsetX = 2 * getPadding(); const int offsetY = getTitleBarHeight() + getPadding(); const int titleWidth = getFont()->getWidth(getCaption()) + 15; - const int mapWidth = mMapImage->getWidth() < 100 ? + const int mapWidth = mMapImage->getWidth() < 100 ? mMapImage->getWidth() + offsetX : 100; - const int mapHeight = mMapImage->getHeight() < 100 ? + const int mapHeight = mMapImage->getHeight() < 100 ? mMapImage->getHeight() + offsetY : 100; setMinWidth(mapWidth > titleWidth ? mapWidth : titleWidth); diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 4c22e63d..7058d572 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -23,6 +23,7 @@ #include "ministatus.h" #include "progressbar.h" +#include "../animatedsprite.h" #include "../configuration.h" #include "../graphics.h" #include "../localplayer.h" @@ -55,6 +56,24 @@ MiniStatusWindow::MiniStatusWindow(): loadWindowState(); } +void MiniStatusWindow::setIcon(int index, AnimatedSprite *sprite) +{ + if (index >= (int) mIcons.size()) + mIcons.resize(index + 1, NULL); + + if (mIcons[index]) + delete mIcons[index]; + + mIcons[index] = sprite; +} + +void MiniStatusWindow::eraseIcon(int index) +{ + mIcons.erase(mIcons.begin() + index); +} + +extern volatile int tick_time; + void MiniStatusWindow::update() { // HP Bar coloration @@ -91,7 +110,7 @@ void MiniStatusWindow::update() // Displays the number of monsters to next lvl // (disabled for now but interesting idea) /* - if(config.getValue("xpBarMonsterCounterExp", 0)!=0) + if (config.getValue("xpBarMonsterCounterExp", 0)!=0) { updatedText << " | " << (int)(((float)player_node->mXpForNextLevel - (float)player_node->mXp) @@ -102,6 +121,11 @@ void MiniStatusWindow::update() */ mXpBar->setText(updatedText.str()); + + for (unsigned int i = 0; i < mIcons.size(); i++) + if (mIcons[i]) + mIcons[i]->update(tick_time * 10); + } void MiniStatusWindow::draw(gcn::Graphics *graphics) @@ -109,3 +133,15 @@ void MiniStatusWindow::draw(gcn::Graphics *graphics) update(); drawChildren(graphics); } + +void MiniStatusWindow::drawIcons(Graphics *graphics) +{ + // Draw icons + int icon_x = mXpBar->getX() + mXpBar->getWidth() + 4; + for (unsigned int i = 0; i < mIcons.size(); i++) { + if (mIcons[i]) { + mIcons[i]->draw(graphics, icon_x, 3); + icon_x += 2 + mIcons[i]->getWidth(); + } + } +} diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h index 832475f1..f262a2a0 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatus.h @@ -24,6 +24,9 @@ #include "window.h" +#include <vector> + +class AnimatedSprite; class ProgressBar; /** @@ -44,6 +47,15 @@ class MiniStatusWindow : public Window */ void draw(gcn::Graphics *graphics); + /** + * Sets one of the icons. + */ + void setIcon(int index, AnimatedSprite *sprite); + + void eraseIcon(int index); + + void drawIcons(Graphics *graphics); + private: /** * Updates this dialog with values from player_node. @@ -56,6 +68,8 @@ class MiniStatusWindow : public Window ProgressBar *mHpBar; ProgressBar *mMpBar; ProgressBar *mXpBar; + + std::vector<AnimatedSprite *> mIcons; }; #endif diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp index 0d1f658f..2c67e71f 100644 --- a/src/gui/ok_dialog.cpp +++ b/src/gui/ok_dialog.cpp @@ -52,7 +52,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg, // 15 == height of each line of text (based on font heights) // 14 == row top + bottom graphic pixel heights setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + okButton->getHeight()); - mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, + mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, 3 + (numRows * 14))); } else diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index 89293b05..42f8d187 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -31,7 +31,7 @@ * * \ingroup GUI */ -class PasswordField : public TextField +class PasswordField : public TextField { public: /** diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 6c0e6ad6..be5252f7 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -29,6 +29,7 @@ #include "windowcontainer.h" #include "../being.h" +#include "../beingmanager.h" #include "../floor_item.h" #include "../item.h" #include "../localplayer.h" @@ -47,7 +48,7 @@ extern std::string tradePartnerName; PopupMenu::PopupMenu(): Window(), - mBeing(NULL), + mBeingId(0), mFloorItem(NULL), mItem(NULL) { @@ -65,57 +66,57 @@ PopupMenu::PopupMenu(): void PopupMenu::showPopup(int x, int y, Being *being) { - mBeing = being; + mBeingId = being->getId(); mBrowserBox->clearRows(); - switch (mBeing->getType()) + switch (being->getType()) { - case Being::PLAYER: - { - // Players can be traded with. Later also attack, follow and - // add as buddy will be options in this menu. - const std::string &name = mBeing->getName(); - mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str())); - mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str())); - - mBrowserBox->addRow("##3---"); - - switch (player_relations.getRelation(name)) { - case PlayerRelation::NEUTRAL: - mBrowserBox->addRow(strprintf(_("@@friend|Befriend %s@@"), name.c_str())); - - case PlayerRelation::FRIEND: - mBrowserBox->addRow(strprintf(_("@@disregard|Disregard %s@@"), name.c_str())); - mBrowserBox->addRow(strprintf(_("@@ignore|Ignore %s@@"), name.c_str())); - break; - - case PlayerRelation::DISREGARDED: - mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str())); - mBrowserBox->addRow(strprintf(_("@@ignore|Completely ignore %s@@"), name.c_str())); - break; - - case PlayerRelation::IGNORED: - mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str())); - break; - } - - //mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@"); - //mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@"); - - mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf(_("@@party-invite|Invite %s to party@@"), name.c_str())); - } - break; - - case Being::NPC: - // NPCs can be talked to (single option, candidate for removal - // unless more options would be added) - mBrowserBox->addRow(_("@@talk|Talk To NPC@@")); - break; - - default: - /* Other beings aren't interesting... */ - break; + case Being::PLAYER: + { + // Players can be traded with. Later also attack, follow and + // add as buddy will be options in this menu. + const std::string &name = being->getName(); + mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str())); + mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str())); + + mBrowserBox->addRow("##3---"); + + switch (player_relations.getRelation(name)) { + case PlayerRelation::NEUTRAL: + mBrowserBox->addRow(strprintf(_("@@friend|Befriend %s@@"), name.c_str())); + + case PlayerRelation::FRIEND: + mBrowserBox->addRow(strprintf(_("@@disregard|Disregard %s@@"), name.c_str())); + mBrowserBox->addRow(strprintf(_("@@ignore|Ignore %s@@"), name.c_str())); + break; + + case PlayerRelation::DISREGARDED: + mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str())); + mBrowserBox->addRow(strprintf(_("@@ignore|Completely ignore %s@@"), name.c_str())); + break; + + case PlayerRelation::IGNORED: + mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str())); + break; + } + + //mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@"); + //mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@"); + + mBrowserBox->addRow("##3---"); + mBrowserBox->addRow(strprintf(_("@@party-invite|Invite %s to party@@"), name.c_str())); + } + break; + + case Being::NPC: + // NPCs can be talked to (single option, candidate for removal + // unless more options would be added) + mBrowserBox->addRow(_("@@talk|Talk To NPC@@")); + break; + + default: + /* Other beings aren't interesting... */ + break; } //browserBox->addRow("@@look|Look To@@"); @@ -143,58 +144,60 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem) void PopupMenu::handleLink(const std::string& link) { + Being *being = beingManager->findBeing(mBeingId); + // Talk To action if (link == "talk" && - mBeing != NULL && - mBeing->getType() == Being::NPC && - current_npc == 0) + being != NULL && + being->getType() == Being::NPC && + current_npc == 0) { - dynamic_cast<NPC*>(mBeing)->talk(); + dynamic_cast<NPC*>(being)->talk(); } // Trade action else if (link == "trade" && - mBeing != NULL && - mBeing->getType() == Being::PLAYER) + being != NULL && + being->getType() == Being::PLAYER) { - player_node->trade(mBeing); - tradePartnerName = mBeing->getName(); + player_node->trade(being); + tradePartnerName = being->getName(); } // Attack action else if (link == "attack" && - mBeing != NULL && - mBeing->getType() == Being::PLAYER) + being != NULL && + being->getType() == Being::PLAYER) { - player_node->attack(mBeing, true); + player_node->attack(being, true); } else if (link == "unignore" && - mBeing != NULL && - mBeing->getType() == Being::PLAYER) + being != NULL && + being->getType() == Being::PLAYER) { - player_relations.setRelation(mBeing->getName(), PlayerRelation::NEUTRAL); + player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL); } else if (link == "ignore" && - mBeing != NULL && - mBeing->getType() == Being::PLAYER) + being != NULL && + being->getType() == Being::PLAYER) { - player_relations.setRelation(mBeing->getName(), PlayerRelation::IGNORED); + player_relations.setRelation(being->getName(), PlayerRelation::IGNORED); } else if (link == "disregard" && - mBeing != NULL && - mBeing->getType() == Being::PLAYER) + being != NULL && + being->getType() == Being::PLAYER) { - player_relations.setRelation(mBeing->getName(), PlayerRelation::DISREGARDED); + player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED); } else if (link == "friend" && - mBeing != NULL && - mBeing->getType() == Being::PLAYER) + being != NULL && + being->getType() == Being::PLAYER) { - player_relations.setRelation(mBeing->getName(), PlayerRelation::FRIEND); + player_relations.setRelation(being->getName(), PlayerRelation::FRIEND); } /* @@ -205,18 +208,18 @@ void PopupMenu::handleLink(const std::string& link) /* // Add Buddy action - else if ((link == "buddy") && mBeing != NULL && mBeing->isPlayer()) + else if ((link == "buddy") && being != NULL && being->isPlayer()) { - if (!buddyWindow->isVisible()) - buddyWindow->setVisible(true); + if (!buddyWindow->isVisible()) + buddyWindow->setVisible(true); - buddyWindow->addBuddy(mBeing->getName()); + buddyWindow->addBuddy(being->getName()); }*/ // Pick Up Floor Item action else if ((link == "pickup") && mFloorItem != NULL) { - player_node->pickUp(mFloorItem); + player_node->pickUp(mFloorItem); } // Look To action @@ -226,51 +229,51 @@ void PopupMenu::handleLink(const std::string& link) else if (link == "use") { - assert(mItem); - if (mItem->isEquipment()) - { - if (mItem->isEquipped()) - { - player_node->unequipItem(mItem); - } - else - { - player_node->equipItem(mItem); - } - } - else - { - player_node->useItem(mItem); - } + assert(mItem); + if (mItem->isEquipment()) + { + if (mItem->isEquipped()) + { + player_node->unequipItem(mItem); + } + else + { + player_node->equipItem(mItem); + } + } + else + { + player_node->useItem(mItem); + } } else if (link == "chat") { - chatWindow->addItemText(mItem->getInfo().getName()); + chatWindow->addItemText(mItem->getInfo().getName()); } else if (link == "drop") { - new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem); + new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem); } else if (link == "party-invite" && - mBeing != NULL && - mBeing->getType() == Being::PLAYER) + being != NULL && + being->getType() == Being::PLAYER) { - MessageOut outMsg(player_node->getNetwork()); - outMsg.writeInt16(CMSG_PARTY_INVITE); - outMsg.writeInt32(mBeing->getId()); + MessageOut outMsg(player_node->getNetwork()); + outMsg.writeInt16(CMSG_PARTY_INVITE); + outMsg.writeInt32(being->getId()); } // Unknown actions else { - std::cout << link << std::endl; + std::cout << link << std::endl; } setVisible(false); - mBeing = NULL; + mBeingId = 0; mFloorItem = NULL; mItem = NULL; } @@ -303,9 +306,9 @@ void PopupMenu::showPopup(int x, int y) { setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8); if (windowContainer->getWidth() < (x + getWidth() + 5)) - x = windowContainer->getWidth() - getWidth(); + x = windowContainer->getWidth() - getWidth(); if (windowContainer->getHeight() < (y + getHeight() + 5)) - y = windowContainer->getHeight() - getHeight(); + y = windowContainer->getHeight() - getHeight(); setPosition(x, y); setVisible(true); requestMoveToTop(); diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 715a9bb5..2694abd8 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -22,6 +22,8 @@ #ifndef POPUP_MENU_H #define POPUP_MENU_H +#include <SDL.h> // for Uint32 + #include "linkhandler.h" #include "window.h" @@ -66,7 +68,7 @@ class PopupMenu : public Window, public LinkHandler private: BrowserBox* mBrowserBox; - Being* mBeing; + Uint32 mBeingId; FloorItem* mFloorItem; Item *mItem; diff --git a/src/gui/recorder.h b/src/gui/recorder.h index 707f08ab..0bbab012 100644 --- a/src/gui/recorder.h +++ b/src/gui/recorder.h @@ -1,8 +1,8 @@ /* - * Aethyra - * Copyright (C) 2008 Aethyra Development Team + * A chat recorder + * Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net> * - * This file is part of Aethyra. + * This file is part of The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -72,4 +72,5 @@ class Recorder : public Window, public gcn::ActionListener std::ofstream mStream; }; + #endif diff --git a/src/gui/register.cpp b/src/gui/register.cpp index cbf87e5b..cf12375c 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -251,21 +251,21 @@ bool RegisterDialog::isUShort(const std::string &str) { if (str == "") { - return false; + return false; } unsigned long l = 0; for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); - strPtr != strEnd; ++strPtr) + strPtr != strEnd; ++strPtr) { - if (*strPtr < '0' || *strPtr > '9') + if (*strPtr < '0' || *strPtr > '9') { - return false; - } - l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative - if (l > 65535) - { - return false; - } + return false; + } + l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative + if (l > 65535) + { + return false; + } } return true; } @@ -274,9 +274,9 @@ unsigned short RegisterDialog::getUShort(const std::string &str) { unsigned long l = 0; for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); - strPtr != strEnd; ++strPtr) + strPtr != strEnd; ++strPtr) { - l = l * 10 + (*strPtr - '0'); + l = l * 10 + (*strPtr - '0'); } return static_cast<unsigned short>(l); } diff --git a/src/gui/register.h b/src/gui/register.h index e58ac9db..9588e07e 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -72,29 +72,29 @@ class RegisterDialog : public Window, public gcn::ActionListener, */ bool canSubmit() const; - /** - * Function to decide whether string is an unsigned short or not - * - * @param str the string to parse - * - * @return true if str is an unsigned short, false otherwise - */ - static bool isUShort(const std::string &str); - - /** - * Converts string to an unsigned short (undefined if invalid) - * - * @param str the string to parse - * - * @return the value str represents - */ - static unsigned short getUShort(const std::string &str); + /** + * Function to decide whether string is an unsigned short or not + * + * @param str the string to parse + * + * @return true if str is an unsigned short, false otherwise + */ + static bool isUShort(const std::string &str); + + /** + * Converts string to an unsigned short (undefined if invalid) + * + * @param str the string to parse + * + * @return the value str represents + */ + static unsigned short getUShort(const std::string &str); gcn::TextField *mUserField; gcn::TextField *mPasswordField; gcn::TextField *mConfirmField; gcn::TextField *mServerField; - gcn::TextField *mPortField; + gcn::TextField *mPortField; gcn::Button *mRegisterButton; gcn::Button *mCancelButton; diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index 09f7c5e7..eacc4714 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -110,9 +110,9 @@ void ScrollArea::init() int vsgridy[4] = {0, 4, 15, 19}; a = 0; - for (y = 0; y < 3; y++) + for (y = 0; y < 3; y++) { - for (x = 0; x < 3; x++) + for (x = 0; x < 3; x++) { vMarker.grid[a] = vscroll->getSubImage( vsgridx[x], vsgridy[y], @@ -214,7 +214,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics) int w = getWidth() + bs * 2; int h = getHeight() + bs * 2; - if (mOpaque) + if (mOpaque) { static_cast<Graphics*>(graphics)-> drawImageRect(0, 0, w, h, background); @@ -225,11 +225,11 @@ void ScrollArea::setOpaque(bool opaque) { mOpaque = opaque; - if (mOpaque) + if (mOpaque) { setFrameSize(2); } - else + else { setFrameSize(0); } @@ -240,7 +240,7 @@ void ScrollArea::drawButton(gcn::Graphics *graphics, BUTTON_DIR dir) int state = 0; gcn::Rectangle dim; - switch(dir) + switch (dir) { case UP: state = mUpButtonPressed ? 1 : 0; diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index f68dc9c8..51442798 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -228,7 +228,7 @@ int SDLInput::convertMouseButton(int button) int SDLInput::convertKeyCharacter(SDL_Event event) { SDL_keysym keysym = event.key.keysym; - + int value = keysym.unicode; switch (keysym.sym) diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp index acc28b1f..49e08aeb 100644 --- a/src/gui/setup_colours.cpp +++ b/src/gui/setup_colours.cpp @@ -1,23 +1,23 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program is distributed with The Mana Experiment * - * 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include <string> diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h index f56daa60..57d9e304 100644 --- a/src/gui/setup_colours.h +++ b/src/gui/setup_colours.h @@ -1,26 +1,26 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program is distributed with The Mana Experiment * - * 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ -#ifndef _SETUP_COLOURS_H -#define _SETUP_COLOURS_H +#ifndef SETUP_COLOURS_H +#define SETUP_COLOURS_H #include <string> diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 06a5a520..5d7519ef 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -1,6 +1,7 @@ /* - * The Mana World - * Copyright (C) 2007 The Mana World Development Team + * Custom keyboard shortcuts configuration + * Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au> + * Copyright (C) 2009 The Mana World Development Team * * This file is part of The Mana World. * diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h index 082fa84d..dee12135 100644 --- a/src/gui/setup_keyboard.h +++ b/src/gui/setup_keyboard.h @@ -1,6 +1,6 @@ /* - * The Mana World - * Copyright (C) 2007 The Mana World Development Team + * Custom keyboard shortcuts configuration + * Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au> * * This file is part of The Mana World. * diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index 7e76055a..5c19bd2b 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -67,9 +67,9 @@ static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] = { class PlayerRelationListModel : public gcn::ListModel { public: - virtual ~PlayerRelationListModel(void) { } + virtual ~PlayerRelationListModel() { } - virtual int getNumberOfElements(void) + virtual int getNumberOfElements() { return PlayerRelation::RELATIONS_NR; } @@ -85,30 +85,30 @@ public: class PlayerTableModel : public TableModel { public: - PlayerTableModel(void) : + PlayerTableModel() : mPlayers(NULL) { playerRelationsUpdated(); } - virtual ~PlayerTableModel(void) + virtual ~PlayerTableModel() { freeWidgets(); if (mPlayers) delete mPlayers; } - virtual int getRows(void) + virtual int getRows() { return mPlayers->size(); } - virtual int getColumns(void) + virtual int getColumns() { return COLUMNS_NR; } - virtual int getRowHeight(void) + virtual int getRowHeight() { return ROW_HEIGHT; } @@ -121,7 +121,7 @@ public: return RELATION_CHOICE_COLUMN_WIDTH; } - virtual void playerRelationsUpdated(void) + virtual void playerRelationsUpdated() { signalBeforeUpdate(); @@ -164,7 +164,7 @@ public: return mWidgets[WIDGET_AT(row, column)]; } - virtual void freeWidgets(void) + virtual void freeWidgets() { if (mPlayers) delete mPlayers; @@ -193,9 +193,9 @@ protected: class IgnoreChoicesListModel : public gcn::ListModel { public: - virtual ~IgnoreChoicesListModel(void) { } + virtual ~IgnoreChoicesListModel() { } - virtual int getNumberOfElements(void) + virtual int getNumberOfElements() { return player_relations.getPlayerIgnoreStrategies()->size(); } @@ -292,7 +292,7 @@ Setup_Players::Setup_Players(): setDimension(gcn::Rectangle(0, 0, 290, 250)); } -Setup_Players::~Setup_Players(void) +Setup_Players::~Setup_Players() { player_relations.removeListener(this); } diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 1775665f..b1d33b09 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -289,7 +289,7 @@ void Setup_Video::apply() * See http://libsdl.org/cgi/docwiki.cgi/SDL_SetVideoMode */ -#ifdef WIN32 +#if defined(WIN32) || defined(__APPLE__) // checks for opengl usage if (!(config.getValue("opengl", false) == 1)) { @@ -307,7 +307,7 @@ void Setup_Video::apply() logger->error(error.str()); } } -#ifdef WIN32 +#if defined(WIN32) || defined(__APPLE__) } else { new OkDialog(_("Switching to full screen"), _("Restart needed for changes to take effect.")); diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp index eae24785..4472818e 100644 --- a/src/gui/shortcutcontainer.cpp +++ b/src/gui/shortcutcontainer.cpp @@ -38,7 +38,7 @@ ShortcutContainer::ShortcutContainer(): void ShortcutContainer::widgetResized(const gcn::Event &event) { mGridWidth = getWidth() / mBoxWidth; - if (mGridWidth < 1) + if (mGridWidth < 1) { mGridWidth = 1; } @@ -47,7 +47,7 @@ void ShortcutContainer::widgetResized(const gcn::Event &event) (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight); mGridHeight = getHeight() / mBoxHeight; - if (mGridHeight < 1) + if (mGridHeight < 1) { mGridHeight = 1; } @@ -57,7 +57,7 @@ int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const { const gcn::Rectangle tRect = gcn::Rectangle( 0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight); - if (!tRect.isPointInRect(pointX, pointY)) + if (!tRect.isPointInRect(pointX, pointY)) { return -1; } diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp index dd7c3a4e..c4f8737b 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -47,7 +47,7 @@ struct SkillInfo { std::vector<SkillInfo> skill_db; -static void initSkillinfo(void); +static void initSkillinfo(); class SkillGuiTableModel : public StaticTableModel { @@ -73,14 +73,17 @@ public: return 35; } - virtual int getRowHeight(void) + virtual int getRowHeight() { return 12; } - virtual void update(void) + virtual void update() { - static const SkillInfo fakeSkillInfo = { _("???"), false }; + static const SkillInfo fakeSkillInfo = { + _("Mystery Skill"), + false + }; mEntriesNr = mDialog->getSkills().size(); resize(); @@ -112,7 +115,6 @@ public: } } - private: SkillDialog *mDialog; int mEntriesNr; @@ -246,11 +248,11 @@ void SkillDialog::setSkill(int id, int lvl, int mp) void SkillDialog::cleanList() { - for_each(mSkillList.begin(), mSkillList.end(), make_dtor(mSkillList)); + delete_all(mSkillList); mSkillList.clear(); } -static void initSkillinfo(void) +static void initSkillinfo() { SkillInfo emptySkillInfo = { "", false }; diff --git a/src/gui/skill.h b/src/gui/skill.h index 91c2b640..0600d106 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -65,7 +65,7 @@ class SkillDialog : public Window, public gcn::ActionListener void setSkill(int id, int lv, int sp); void cleanList(); - const std::vector<SKILL*>& getSkills(void) const { return mSkillList; } + const std::vector<SKILL*>& getSkills() const { return mSkillList; } private: GuiTable *mTable; diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index f8c69e87..c76558e4 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -1,22 +1,21 @@ /* - * The Legend of Mazzeroth - * Copyright (C) 2008, The Legend of Mazzeroth Development Team + * Speech bubbles + * 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. + * This file is part of The Mana World. * - * The Legend of Mazzeroth is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 7f5818af..d2d81332 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -1,27 +1,26 @@ /* - * The Legend of Mazzeroth - * Copyright (C) 2008, The Legend of Mazzeroth Development Team + * Speech bubbles + * 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. + * This file is part of The Mana World. * - * The Legend of Mazzeroth is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef SPEECHBUBBLE_H__ -#define SPEECHBUBBLE_H__ +#ifndef SPEECHBUBBLE_H +#define SPEECHBUBBLE_H #include "window.h" @@ -31,20 +30,19 @@ class TextBox; class SpeechBubble : public Window { public: - - SpeechBubble(); - ~SpeechBubble(); + SpeechBubble(); + ~SpeechBubble(); void setCaption(const std::string &name, const gcn::Color &color = 0x000000); - void setText(std::string mText); - void setLocation(int x, int y); - unsigned int getNumRows(); + void setText(std::string mText); + void setLocation(int x, int y); + unsigned int getNumRows(); private: gcn::Label *mCaption; - TextBox *mSpeechBox; - ScrollArea *mSpeechArea; + TextBox *mSpeechBox; + ScrollArea *mSpeechArea; }; #endif diff --git a/src/gui/status.cpp b/src/gui/status.cpp index e0e43b36..21087fad 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -78,8 +78,11 @@ StatusWindow::StatusWindow(LocalPlayer *player): mStatsDefenseLabel= new gcn::Label(_("Defense:")); mStatsMagicAttackLabel = new gcn::Label(_("M.Attack:")); mStatsMagicDefenseLabel = new gcn::Label(_("M.Defense:")); + // Gettext flag for next line: xgettext:no-c-format mStatsAccuracyLabel = new gcn::Label(_("% Accuracy:")); + // Gettext flag for next line: xgettext:no-c-format mStatsEvadeLabel = new gcn::Label(_("% Evade:")); + // Gettext flag for next line: xgettext:no-c-format mStatsReflexLabel = new gcn::Label(_("% Reflex:")); mStatsAttackPoints = new gcn::Label; @@ -307,3 +310,4 @@ void StatusWindow::action(const gcn::ActionEvent &event) } } } + diff --git a/src/gui/table.cpp b/src/gui/table.cpp index 674f3891..19039b2d 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -37,7 +37,7 @@ class GuiTableActionListener : public gcn::ActionListener public: GuiTableActionListener(GuiTable *_table, gcn::Widget *_widget, int _row, int _column); - virtual ~GuiTableActionListener(void); + virtual ~GuiTableActionListener(); virtual void action(const gcn::ActionEvent& actionEvent); @@ -62,7 +62,7 @@ GuiTableActionListener::GuiTableActionListener(GuiTable *table, gcn::Widget *wid } } -GuiTableActionListener::~GuiTableActionListener(void) +GuiTableActionListener::~GuiTableActionListener() { if (mWidget) { @@ -96,12 +96,12 @@ GuiTable::GuiTable(TableModel *initial_model, gcn::Color background, addKeyListener(this); } -GuiTable::~GuiTable(void) +GuiTable::~GuiTable() { delete mModel; } -TableModel* GuiTable::getModel(void) const +TableModel *GuiTable::getModel() const { return mModel; } @@ -124,7 +124,7 @@ void GuiTable::setModel(TableModel *new_model) } } -void GuiTable::recomputeDimensions(void) +void GuiTable::recomputeDimensions() { int rows_nr = mModel->getRows(); int columns_nr = mModel->getColumns(); @@ -152,12 +152,12 @@ void GuiTable::setSelected(int row, int column) mSelectedRow = row; } -int GuiTable::getSelectedRow(void) +int GuiTable::getSelectedRow() { return mSelectedRow; } -int GuiTable::getSelectedColumn(void) +int GuiTable::getSelectedColumn() { return mSelectedColumn; } @@ -167,7 +167,7 @@ void GuiTable::setLinewiseSelection(bool linewise) mLinewiseMode = linewise; } -int GuiTable::getRowHeight(void) +int GuiTable::getRowHeight() { if (mModel) return mModel->getRowHeight() + 1; // border @@ -242,7 +242,7 @@ void GuiTable::uninstallActionListeners(void) action_listeners.clear(); } -void GuiTable::installActionListeners(void) +void GuiTable::installActionListeners() { if (!mModel) return; @@ -291,7 +291,7 @@ void GuiTable::draw(gcn::Graphics* graphics) int max_rows_nr = mModel->getRows() - first_row; // clip if neccessary: if (max_rows_nr < rows_nr) rows_nr = max_rows_nr; - + // Now determine the first and last column // Take the easy way out; these are usually bounded and all visible. int first_column = 0; @@ -383,7 +383,7 @@ void GuiTable::moveToBottom(gcn::Widget *widget) mTopWidget = NULL; } -gcn::Rectangle GuiTable::getChildrenArea(void) +gcn::Rectangle GuiTable::getChildrenArea() { return gcn::Rectangle(0, 0, getWidth(), getHeight()); } @@ -477,7 +477,7 @@ void GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) mouseEvent.consume(); } } - + void GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent) { } @@ -497,7 +497,7 @@ void 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); @@ -549,12 +549,13 @@ void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) { gcn::Widget::_setFocusHandler(focusHandler); - if (mModel) - for (int r = 0; r < mModel->getRows(); ++r) - for (int c = 0; c < mModel->getColumns(); ++c) - { + if (mModel) { + for (int r = 0; r < mModel->getRows(); ++r) { + for (int c = 0; c < mModel->getColumns(); ++c) { gcn::Widget *w = mModel->getElementAt(r, c); if (w) w->_setFocusHandler(focusHandler); } + } + } } diff --git a/src/gui/table.h b/src/gui/table.h index 912eb284..841f6ef2 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -46,17 +46,19 @@ class GuiTable : public gcn::Widget, public gcn::KeyListener, public TableModelListener { - friend class GuiTableActionListener; // so that the action listener can call distributeActionEvent + // so that the action listener can call distributeActionEvent + friend class GuiTableActionListener; + public: GuiTable(TableModel * initial_model = NULL, gcn::Color background = 0xffffff, bool opacity = true); - virtual ~GuiTable(void); + virtual ~GuiTable(); /** * Retrieves the active table model */ - TableModel *getModel(void) const; + TableModel *getModel() const; /** * Sets the table model @@ -72,9 +74,9 @@ public: void setSelected(int row, int column); - int getSelectedRow(void); + int getSelectedRow(); - int getSelectedColumn(void); + int getSelectedColumn(); void setSelectedRow(int selected); @@ -136,25 +138,25 @@ public: virtual void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent); virtual void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent); - + virtual void mouseDragged(gcn::MouseEvent& mouseEvent); // Constraints inherited from TableModelListener virtual void modelUpdated(bool); protected: + /** Frees all action listeners on inner widgets. */ + virtual void uninstallActionListeners(); + /** Installs all action listeners on inner widgets. */ + virtual void installActionListeners(); - virtual void uninstallActionListeners(void); // frees all action listeners on inner widgets - virtual void installActionListeners(void); // installs all action listeners on inner widgets - - virtual int getRowHeight(void); + virtual int getRowHeight(); virtual int getColumnWidth(int i); - -private: +private: int getRowForY(int y); // -1 on error int getColumnForX(int x); // -1 on error - void recomputeDimensions(void); + void recomputeDimensions(); bool mLinewiseMode; bool mWrappingEnabled; bool mOpaque; @@ -171,11 +173,14 @@ private: int mSelectedRow; int mSelectedColumn; - int mPopFramesNr; // Number of frames to skip upwards when drawing the selected widget + /** Number of frames to skip upwards when drawing the selected widget. */ + int mPopFramesNr; - gcn::Widget *mTopWidget; // If someone moves a fresh widget to the top, we must display it + /** If someone moves a fresh widget to the top, we must display it. */ + gcn::Widget *mTopWidget; - std::vector<GuiTableActionListener *> action_listeners; // Vector for compactness; used as a list in practice. + /** Vector for compactness; used as a list in practice. */ + std::vector<GuiTableActionListener *> action_listeners; }; diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp index 19e780f3..4fa13bae 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -35,13 +35,13 @@ void TableModel::removeListener(TableModelListener *listener) listeners.erase(listener); } -void TableModel::signalBeforeUpdate(void) +void TableModel::signalBeforeUpdate() { for (std::set<TableModelListener *>::const_iterator it = listeners.begin(); it != listeners.end(); it++) (*it)->modelUpdated(false); } -void TableModel::signalAfterUpdate(void) +void TableModel::signalAfterUpdate() { for (std::set<TableModelListener *>::const_iterator it = listeners.begin(); it != listeners.end(); it++) (*it)->modelUpdated(true); @@ -60,12 +60,12 @@ StaticTableModel::StaticTableModel(int row, int column) : mWidths.resize(column, 1); } -StaticTableModel::~StaticTableModel(void) +StaticTableModel::~StaticTableModel() { delete_all(mTableModel); } -void StaticTableModel::resize(void) +void StaticTableModel::resize() { mRows = getRows(); mColumns = getColumns(); @@ -97,7 +97,7 @@ void 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)]; } @@ -119,7 +119,7 @@ void StaticTableModel::fixRowHeight(int height) mHeight = -height; } -int StaticTableModel::getRowHeight(void) +int StaticTableModel::getRowHeight() { return abs(mHeight); } @@ -132,12 +132,12 @@ int StaticTableModel::getColumnWidth(int column) return abs(mWidths[column]); } -int StaticTableModel::getRows(void) +int StaticTableModel::getRows() { return mRows; } -int StaticTableModel::getColumns(void) +int StaticTableModel::getColumns() { return mColumns; } diff --git a/src/gui/table_model.h b/src/gui/table_model.h index 1d966e8b..9ca36120 100644 --- a/src/gui/table_model.h +++ b/src/gui/table_model.h @@ -29,8 +29,9 @@ class TableModelListener { public: /** - * Must be invoked by the TableModel whenever a global change is about to occur or - * has occurred (e.g., when a row or column is being removed or added). + * Must be invoked by the TableModel whenever a global change is about to + * occur or has occurred (e.g., when a row or column is being removed or + * added). * * This method is triggered twice, once before and once after the update. * @@ -45,22 +46,22 @@ public: class TableModel { public: - virtual ~TableModel(void) { } + virtual ~TableModel() { } /** * Determines the number of rows (lines) in the table */ - virtual int getRows(void) = 0; + virtual int getRows() = 0; /** * Determines the number of columns in each row */ - virtual int getColumns(void) = 0; + virtual int getColumns() = 0; /** * Determines the height for each row */ - virtual int getRowHeight(void) = 0; + virtual int getRowHeight() = 0; /** * Determines the width of each individual column @@ -80,12 +81,12 @@ protected: /** * Tells all listeners that the table is about to see an update */ - virtual void signalBeforeUpdate(void); + virtual void signalBeforeUpdate(); /** * Tells all listeners that the table has seen an update */ - virtual void signalAfterUpdate(void); + virtual void signalAfterUpdate(); private: std::set<TableModelListener *> listeners; @@ -96,7 +97,7 @@ class StaticTableModel : public TableModel { public: StaticTableModel(int width, int height); - virtual ~StaticTableModel(void); + virtual ~StaticTableModel(); /** * Inserts a widget into the table model. @@ -106,7 +107,8 @@ public: virtual void set(int row, int column, gcn::Widget *widget); /** - * Fixes the column width for a given column; this overrides dynamic width inference. + * Fixes the column width for a given column; this overrides dynamic width + * inference. * * Semantics are undefined for width 0. */ @@ -122,17 +124,16 @@ public: /** * Resizes the table model */ - virtual void resize(void); + virtual void resize(); - virtual int getRows(void); - virtual int getColumns(void); - virtual int getRowHeight(void); - virtual int getWidth(void); - virtual int getHeight(void); + virtual int getRows(); + virtual int getColumns(); + virtual int getRowHeight(); + virtual int getWidth(); + virtual int getHeight(); virtual int getColumnWidth(int index); virtual gcn::Widget *getElementAt(int row, int column); - protected: int mRows, mColumns; int mHeight; diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index f901be5e..af30d1fe 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -125,7 +125,7 @@ void TradeWindow::addMoney(int amount) void TradeWindow::addItem(int id, bool own, int quantity, bool equipment) { - if (own) + if (own) { mMyItemContainer->setWidth(mMyScroll->getWidth()); mMyInventory->addItem(id, quantity, equipment); @@ -139,7 +139,7 @@ void TradeWindow::addItem(int id, bool own, int quantity, bool equipment) void TradeWindow::removeItem(int id, bool own) { - if (own) + if (own) mMyInventory->removeItem(id); else mPartnerInventory->removeItem(id); diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index 6e8efeff..66855b77 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -45,8 +45,7 @@ class TextChunk bool operator==(const TextChunk &chunk) const { - return ( - chunk.text == text && chunk.color == color); + return (chunk.text == text && chunk.color == color); } void generate(TTF_Font *font) @@ -81,7 +80,7 @@ typedef std::list<TextChunk>::iterator CacheIterator; static int fontCounter; -TrueTypeFont::TrueTypeFont(const std::string& filename, int size) +TrueTypeFont::TrueTypeFont(const std::string &filename, int size) { if (fontCounter == 0 && TTF_Init() == -1) { @@ -162,7 +161,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics, g->drawImage(cache.front().img, x, y); } -int TrueTypeFont::getWidth(const std::string& text) const +int TrueTypeFont::getWidth(const std::string &text) const { int w, h; TTF_SizeUTF8(mFont, text.c_str(), &w, &h); diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index bd338d84..cd68a94e 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -45,7 +45,7 @@ class TrueTypeFont : public gcn::Font * @param filename Font filename. * @param size Font size. */ - TrueTypeFont(const std::string& filename, int size); + TrueTypeFont(const std::string &filename, int size); /** * Destructor. @@ -59,7 +59,9 @@ class TrueTypeFont : public gcn::Font /** * @see Font::drawString */ - void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y); + void drawString(gcn::Graphics *graphics, + const std::string &text, + int x, int y); private: TTF_Font *mFont; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 19e9a4fb..f5a6edb4 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "ministatus.h" #include "popupmenu.h" #include "viewport.h" @@ -74,6 +75,8 @@ void Viewport::setMap(Map *map) mMap = map; } +extern MiniStatusWindow *miniStatusWindow; + void Viewport::draw(gcn::Graphics *gcnGraphics) { static int lastTick = tick_time; @@ -167,7 +170,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics) // Find a path from the player to the mouse, and draw it. This is for debug // purposes. - if (mShowDebugPath) + if (mShowDebugPath) { // Get the current mouse position int mouseX, mouseY; @@ -211,6 +214,9 @@ void Viewport::draw(gcn::Graphics *gcnGraphics) (*i)->drawEmotion(graphics, -(int) mPixelViewX, -(int) mPixelViewY); } + if (miniStatusWindow) + miniStatusWindow->drawIcons(graphics); + // Draw contained widgets WindowContainer::draw(gcnGraphics); } @@ -263,7 +269,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event) mPopupMenu->showPopup(event.getX(), event.getY(), being); return; } - else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley))) + else if ((floorItem = floorItemManager->findByCoordinates(tilex, + tiley))) { mPopupMenu->showPopup(event.getX(), event.getY(), floorItem); return; @@ -282,7 +289,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) { Being *being; FloorItem *item; - + // Interact with some being // if ((being = beingManager->findBeing(tilex, tiley))) if ((being = beingManager->findBeingByPixel(x, y))) @@ -330,7 +337,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) { // Find the being nearest to the clicked position Being *target = beingManager->findBeingByPixel(x, y); - + if (target) { player_node->setTarget(target); diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 934bd9b3..797b4be9 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -75,7 +75,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std { logger->log("Window::Window(\"%s\")", caption.c_str()); - if (!windowContainer) + if (!windowContainer) { throw GCN_EXCEPTION("Window::Window(): no windowContainer set"); } @@ -126,7 +126,7 @@ Window::~Window() config.setValue(name + "WinY", getY()); config.setValue(name + "Visible", isVisible()); - if (mGrip) + if (mGrip) { config.setValue(name + "WinWidth", getWidth()); config.setValue(name + "WinHeight", getHeight()); @@ -145,7 +145,7 @@ Window::~Window() instances--; // Clean up static resources - for( int i = 0; i < 9; i++ ) + for (int i = 0; i < 9; i++) { delete border.grid[i]; border.grid[i] = NULL; @@ -525,7 +525,7 @@ int Window::getResizeHandles(gcn::MouseEvent &event) void Window::setGuiAlpha() { //logger->log("Window::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8)); - for(int i = 0; i < 9; i++) + for (int i = 0; i < 9; i++) { //logger->log("Window::setGuiAlpha: Border Image (%i)", i); border.grid[i]->setAlpha(config.getValue("guialpha", 0.8)); @@ -534,7 +534,7 @@ void Window::setGuiAlpha() mAlphaChanged = false; } -void Window::loadSkin(const std::string filename) +void Window::loadSkin(const std::string &filename) { const std::string windowId = Window::getId(); @@ -544,7 +544,7 @@ void Window::loadSkin(const std::string filename) logger->log("Loading Window ID '%s'.", windowId.c_str()); - if(filename == "") + if (filename.empty()) logger->error("Window::loadSkin(): Invalid File Name."); // TODO: @@ -562,7 +562,7 @@ void Window::loadSkin(const std::string filename) std::string skinSetImage; skinSetImage = XML::getProperty(rootNode, "image", ""); Image *dBorders = NULL; - if(skinSetImage != "") + if (!skinSetImage.empty()) { logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str()); dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png"); @@ -596,7 +596,7 @@ void Window::loadSkin(const std::string filename) std::string partType; partType = XML::getProperty(partNode, "type", "unknown"); // TOP ROW - if(partType == "top-left-corner") + if (partType == "top-left-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -605,7 +605,7 @@ void Window::loadSkin(const std::string filename) border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "top-edge") + else if (partType == "top-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -614,7 +614,7 @@ void Window::loadSkin(const std::string filename) border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "top-right-corner") + else if (partType == "top-right-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -625,7 +625,7 @@ void Window::loadSkin(const std::string filename) } // MIDDLE ROW - else if(partType == "left-edge") + else if (partType == "left-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -634,7 +634,7 @@ void Window::loadSkin(const std::string filename) border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "bg-quad") + else if (partType == "bg-quad") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -643,7 +643,7 @@ void Window::loadSkin(const std::string filename) border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "right-edge") + else if (partType == "right-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -654,7 +654,7 @@ void Window::loadSkin(const std::string filename) } // BOTTOM ROW - else if(partType == "bottom-left-corner") + else if (partType == "bottom-left-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -663,7 +663,7 @@ void Window::loadSkin(const std::string filename) border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "bottom-edge") + else if (partType == "bottom-edge") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -672,7 +672,7 @@ void Window::loadSkin(const std::string filename) border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height); } - else if(partType == "bottom-right-corner") + else if (partType == "bottom-right-corner") { const int xPos = XML::getProperty(partNode, "xpos", 0); const int yPos = XML::getProperty(partNode, "ypos", 0); @@ -728,4 +728,3 @@ void Window::reflowLayout(int w, int h) mLayout = NULL; setContentSize(w, h); } - diff --git a/src/gui/window.h b/src/gui/window.h index 501ad160..518de6e9 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -30,7 +30,6 @@ #include "../guichanfwd.h" class ConfigListener; -class GCContainer; class ContainerPlacer; class Image; class ImageRect; @@ -177,7 +176,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 @@ -222,7 +221,7 @@ class Window : public gcn::Window, gcn::WidgetListener /** * 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 @@ -264,7 +263,7 @@ class Window : public gcn::Window, gcn::WidgetListener /** * Loads a window skin */ - void loadSkin(const std::string filename); + void loadSkin(const std::string &filename); /** * Adds a widget to the window and sets it at given cell. @@ -300,7 +299,6 @@ class Window : public gcn::Window, gcn::WidgetListener void setGuiAlpha(); - GCContainer *mChrome; /**< Contained container */ ResizeGrip *mGrip; /**< Resize grip */ Window *mParent; /**< The parent window */ Layout *mLayout; /**< Layout handler */ diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index ecf47573..413a8036 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -1,6 +1,6 @@ /* - * The Mana World - * Copyright (C) 2007 The Mana World Development Team + * Custom keyboard shortcuts configuration + * Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au> * * This file is part of The Mana World. * @@ -141,10 +141,10 @@ void KeyboardConfig::makeDefault() bool KeyboardConfig::hasConflicts() { int i, j; -/** - * No need to parse the square matrix: only check one triangle - * that's enough to detect conflicts - */ + /** + * No need to parse the square matrix: only check one triangle + * that's enough to detect conflicts + */ for (i = 0; i < KEY_TOTAL; i++) { for (j = i, j++; j < KEY_TOTAL; j++) @@ -172,7 +172,7 @@ int KeyboardConfig::getKeyIndex(int keyValue) const { for (int i = 0; i < KEY_TOTAL; i++) { - if(keyValue == mKey[i].value) + if (keyValue == mKey[i].value) { return i; } @@ -185,7 +185,7 @@ int KeyboardConfig::getKeyEmoteOffset(int keyValue) const { for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_12; i++) { - if(keyValue == mKey[i].value) + if (keyValue == mKey[i].value) { return 1 + i - KEY_EMOTE_1; } diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index bfcde31c..8949a48e 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -1,6 +1,6 @@ /* - * The Mana World - * Copyright (C) 2007 The Mana World Development Team + * Custom keyboard shortcuts configuration + * Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au> * * This file is part of The Mana World. * diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 01de3b41..b450c0ba 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -33,9 +33,11 @@ #include "particle.h" #include "simpleanimation.h" #include "sound.h" +#include "statuseffect.h" #include "text.h" #include "gui/gui.h" +#include "gui/ministatus.h" #include "net/messageout.h" #include "net/protocol.h" @@ -72,7 +74,7 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): mTarget(NULL), mPickUpTarget(NULL), mTrading(false), mGoingToTarget(false), mTargetTime(-1), mLastAction(-1), - mLastTarget(-1), mWalkingDir(0), + mLastTarget(-1), mWalkingDir(0), mDestX(0), mDestY(0), mInventory(new Inventory(INVENTORY_SIZE)), mStorage(new Inventory(STORAGE_SIZE)) @@ -176,7 +178,7 @@ void LocalPlayer::logic() } void LocalPlayer::setGM() -{ +{ mIsGM = !mIsGM; mNameColor = mIsGM ? 0x009000: 0x202020; setName(getName()); @@ -383,10 +385,7 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y) void LocalPlayer::setWalkingDir(int dir) { - if (mWalkingDir != dir) - { - mWalkingDir = dir; - } + mWalkingDir = dir; // If we're not already walking, start walking. if (mAction != WALK && dir) @@ -509,7 +508,7 @@ void LocalPlayer::attack(Being *target, bool keep) int dist_y = target->mY - mY; // Must be standing and be within attack range to continue - if ((mAction != STAND) || (mAttackRange < abs(dist_x)) || + if ((mAction != STAND) || (mAttackRange < abs(dist_x)) || (mAttackRange < abs(dist_y))) return; @@ -613,6 +612,48 @@ void LocalPlayer::setGotoTarget(Being *target) setDestination(target->mX, target->mY); } + +extern MiniStatusWindow *miniStatusWindow; + +void LocalPlayer::handleStatusEffect(StatusEffect *effect, int effectId) +{ + Being::handleStatusEffect(effect, effectId); + + + + if (effect) { + effect->deliverMessage(); + effect->playSFX(); + + AnimatedSprite *sprite = effect->getIcon(); + + if (!sprite) { + // delete sprite, if necessary + for (unsigned int i = 0; i < mStatusEffectIcons.size();) + if (mStatusEffectIcons[i] == effectId) { + mStatusEffectIcons.erase(mStatusEffectIcons.begin() + i); + miniStatusWindow->eraseIcon(i); + } else i++; + } else { + // replace sprite or append + bool found = false; + + for (unsigned int i = 0; i < mStatusEffectIcons.size(); i++) + if (mStatusEffectIcons[i] == effectId) { + miniStatusWindow->setIcon(i, sprite); + found = true; + break; + } + + if (!found) { // add new + int offset = mStatusEffectIcons.size(); + miniStatusWindow->setIcon(offset, sprite); + mStatusEffectIcons.push_back(effectId); + } + } + } +} + void LocalPlayer::initTargetCursor() { // Load target cursors @@ -654,7 +695,7 @@ void LocalPlayer::loadTargetCursor(std::string filename, int width, int height, mOutRangeImages[size] = currentImageSet; mTargetCursorOutRange[size] = currentCursor; } - else + else { mInRangeImages[size] = currentImageSet; mTargetCursorInRange[size] = currentCursor; @@ -681,7 +722,7 @@ void LocalPlayer::drawTargetCursor(Graphics *graphics, int scrollX, int scrollY) { mTarget->mTargetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage(); } - else + else { mTarget->mTargetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage(); } diff --git a/src/localplayer.h b/src/localplayer.h index d6d5ad2e..c128f4a4 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -23,6 +23,7 @@ #define LOCALPLAYER_H #include <memory> +#include <vector> #include "player.h" @@ -242,6 +243,9 @@ class LocalPlayer : public Player const std::auto_ptr<Equipment> mEquipment; protected: + virtual void + handleStatusEffect(StatusEffect *effect, int effectId); + void walk(unsigned char dir); int mXp; /**< Experience points. */ @@ -261,6 +265,8 @@ class LocalPlayer : public Player int mDestX; /**< X coordinate of destination. */ int mDestY; /**< Y coordinate of destination. */ + std::vector<int> mStatusEffectIcons; + Inventory *mInventory; Inventory *mStorage; diff --git a/src/main.cpp b/src/main.cpp index 73e0b0fe..a9206505 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -187,7 +187,7 @@ void setUpdatesDir() if (updateHost.empty()) { updateHost = - config.getValue("updatehost", "http://www.aethyra.org/updates"); + config.getValue("updatehost", "http://updates.themanaworld.org/"); } // Remove any trailing slash at the end of the update host @@ -201,7 +201,7 @@ void setUpdatesDir() { if (pos + 3 < updateHost.length()) { - updates << "updates/" << updateHost.substr(pos + 3) + updates << "updates/" << updateHost.substr(pos + 3) << "/" << loginData.port; updatesDir = updates.str(); } @@ -259,18 +259,18 @@ void setUpdatesDir() */ void init_engine(const Options &options) { - homeDir = std::string(PHYSFS_getUserDir()) + "/.aethyra"; + homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw"; #if defined WIN32 if (!CreateDirectory(homeDir.c_str(), 0) && GetLastError() != ERROR_ALREADY_EXISTS) #elif defined __APPLE__ - // Use Application Directory instead of .aethyra + // Use Application Directory instead of .tmw homeDir = std::string(PHYSFS_getUserDir()) + - "/Library/Application Support/Aethyra"; + "/Library/Application Support/The Mana World"; if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && (errno != EEXIST)) #else - // Checking if /home/user/.Aethyra folder exists. + // Checking if /home/user/.tmw folder exists. if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && (errno != EEXIST)) #endif @@ -282,12 +282,12 @@ void init_engine(const Options &options) } // Set log file - logger->setLogFile(homeDir + std::string("/aethyra.log")); + logger->setLogFile(homeDir + std::string("/tmw.log")); #ifdef PACKAGE_VERSION - logger->log(_("Starting Aethyra Version %s"), PACKAGE_VERSION); + logger->log(_("Starting The Mana World Version %s"), PACKAGE_VERSION); #else - logger->log(_("Starting Aethyra - Version not defined")); + logger->log(_("Starting The Mana World - Version not defined")); #endif // Initialize SDL @@ -332,12 +332,12 @@ void init_engine(const Options &options) strncat(path, "/data", PATH_MAX - 1); resman->addToSearchPath(path, true); #else - resman->addToSearchPath(AETHYRA_DATADIR "data", true); + resman->addToSearchPath(TMW_DATADIR "data", true); #endif // Fill configuration with defaults logger->log(_("Initializing configuration...")); - config.setValue("host", "www.aethyra.org"); + config.setValue("host", "www.themanaworld.org"); config.setValue("port", 21001); config.setValue("hwaccel", 0); #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL @@ -352,34 +352,34 @@ void init_engine(const Options &options) config.setValue("sfxVolume", 100); config.setValue("musicVolume", 60); config.setValue("fpslimit", 0); - config.setValue("updatehost", "http://www.aethyra.org/updates"); + config.setValue("updatehost", "http://updates.themanaworld.org"); config.setValue("customcursor", 1); config.setValue("ChatLogLength", 128); // Checking if the configuration file exists... otherwise creates it with // default options ! - FILE *aethyraFile = 0; + FILE *configFile = 0; std::string configPath = options.configPath; if (configPath.empty()) configPath = homeDir + "/config.xml"; - aethyraFile = fopen(configPath.c_str(), "r"); + configFile = fopen(configPath.c_str(), "r"); // If we can't read it, it doesn't exist ! - if (aethyraFile == NULL) { + if (configFile == NULL) { // We reopen the file in write mode and we create it - aethyraFile = fopen(configPath.c_str(), "wt"); + configFile = fopen(configPath.c_str(), "wt"); } - if (aethyraFile == NULL) { + if (configFile == NULL) { std::cout << "Can't create " << configPath << ". " "Using Defaults." << std::endl; } else { - fclose(aethyraFile); + fclose(configFile); config.init(configPath); } - SDL_WM_SetCaption("Aethyra", NULL); + SDL_WM_SetCaption("The Mana World", NULL); #ifdef WIN32 static SDL_SysWMinfo pInfo; SDL_GetWMInfo(&pInfo); @@ -389,7 +389,7 @@ void init_engine(const Options &options) SetClassLong(pInfo.window, GCL_HICON, (LONG) icon); } #else - SDL_Surface *icon = IMG_Load(AETHYRA_DATADIR "data/icons/aethyra.png"); + SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png"); if (icon) { SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE); @@ -492,7 +492,7 @@ void exit_engine() void printHelp() { std::cout - << _("aethyra") << std::endl << std::endl + << _("tmw") << std::endl << std::endl << _("Options: ") << std::endl << _(" -C --configfile : Configuration file to use") << std::endl << _(" -d --data : Directory to load game data from") << std::endl @@ -509,11 +509,10 @@ void printHelp() void printVersion() { #ifdef PACKAGE_VERSION - std::cout << _("Aethyra version ") << PACKAGE_VERSION << - std::endl; + std::cout << _("The Mana World version ") << PACKAGE_VERSION << std::endl; #else - std::cout << _("Aethyra version ") << - _("(local build?, PACKAGE_VERSION is not defined)") << std::endl; + std::cout << _("The Mana World version ") << + _"(local build?, PACKAGE_VERSION is not defined)") << std::endl; #endif } @@ -737,11 +736,14 @@ int main(int argc, char *argv[]) #if ENABLE_NLS #ifdef WIN32 putenv(("LANG=" + std::string(_nl_locale_name_default())).c_str()); + // mingw doesn't like LOCALEDIR to be defined for some reason + bindtextdomain("tmw", "translations/"); +#else + bindtextdomain("tmw", LOCALEDIR); #endif setlocale(LC_MESSAGES, ""); - bindtextdomain("aethyra", LOCALEDIR); - bind_textdomain_codeset("aethyra", "UTF-8"); - textdomain("aethyra"); + bind_textdomain_codeset("tmw", "UTF-8"); + textdomain("tmw"); #endif // Initialize libxml2 and check for potential ABI mismatches between @@ -796,8 +798,8 @@ int main(int argc, char *argv[]) if (!options.password.empty()) { loginData.password = options.password; } - loginData.hostname = config.getValue("host", "www.aethyra.org"); - loginData.port = (short)config.getValue("port", 21001); + loginData.hostname = config.getValue("host", "server.themanaworld.org"); + loginData.port = (short)config.getValue("port", 6901); loginData.remember = config.getValue("remember", 0); loginData.registerLogin = false; @@ -870,7 +872,7 @@ int main(int argc, char *argv[]) if (graphics->getWidth() > login_wallpaper->getWidth() || graphics->getHeight() > login_wallpaper->getHeight()) { - graphics->setColor(gcn::Color(255, 255, 255)); + graphics->setColor(gcn::Color(64, 64, 64)); graphics->fillRectangle(gcn::Rectangle( 0, 0, graphics->getWidth(), graphics->getHeight())); } @@ -958,15 +960,15 @@ int main(int argc, char *argv[]) case CHAR_SERVER_STATE: logger->log("State: CHAR_SERVER"); - if (n_server == 1) + if (n_server == 1) { SERVER_INFO *si = *server_info; loginData.hostname = iptostring(si->address); loginData.port = si->port; loginData.updateHost = si->updateHost; state = UPDATE_STATE; - } - else + } + else { int nextState = (options.skipUpdate) ? LOADDATA_STATE : UPDATE_STATE; @@ -974,7 +976,7 @@ int main(int argc, char *argv[]) nextState); positionDialog(currentDialog, screenWidth, screenHeight); - if (options.chooseDefault || options.playername != "") + if (options.chooseDefault || options.playername != "") { ((ServerSelectDialog*) currentDialog)->action( gcn::ActionEvent(NULL, "ok")); @@ -984,8 +986,8 @@ int main(int argc, char *argv[]) case CHAR_SELECT_STATE: logger->log("State: CHAR_SELECT"); currentDialog = new CharSelectDialog(network, &charInfo, - (loginData.sex == 0) ? - GENDER_FEMALE : GENDER_MALE); + (loginData.sex == 0) ? + GENDER_FEMALE : GENDER_MALE); positionDialog(currentDialog, screenWidth, screenHeight); if (((CharSelectDialog*) currentDialog)-> diff --git a/src/map.cpp b/src/map.cpp index 716e9aee..b6ccad3b 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -330,7 +330,7 @@ Tileset* Map::getTilesetWithGid(int gid) const containsGid.gid = gid; Tilesets::const_iterator i = find_if(mTilesets.begin(), mTilesets.end(), - containsGid); + containsGid); return (i == mTilesets.end()) ? NULL : *i; } @@ -339,7 +339,7 @@ void Map::setWalk(int x, int y, bool walkable) { mMetaTiles[x + y * mWidth].walkable = walkable; } - + bool Map::occupied(int x, int y) const { Beings &beings = beingManager->getAll(); @@ -357,7 +357,7 @@ bool Map::occupied(int x, int y) const bool Map::tileCollides(int x, int y) const { - return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable); + return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable); } bool Map::contains(int x, int y) const @@ -459,6 +459,13 @@ Path Map::findPath(int startX, int startY, int destX, int destY) // 14 for moving diagonal (sqrt(200) = 14.1421...) int Gcost = curr.tile->Gcost + ((dx == 0 || dy == 0) ? 10 : 14); + // It costs extra to walk through a being (needs to be enough + // to make it more attractive to walk around). + if (occupied(x, y)) + { + Gcost += 30; + } + // Skip if Gcost becomes too much // Warning: probably not entirely accurate if (Gcost > 200) diff --git a/src/monster.cpp b/src/monster.cpp index 33703817..3b1e4c80 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -74,7 +74,7 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map): mNameColor = 0xff2020; } -Monster::~Monster() +Monster::~Monster() { if (mText) { @@ -199,7 +199,7 @@ void Monster::showName(bool show) { mText = new Text(getInfo().getName(), mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET - getHeight(), - gcn::Graphics::CENTER, gcn::Color(255, 32, 32)); + gcn::Graphics::CENTER, gcn::Color(255, 64, 64)); } else { diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 69f462ec..0db8fcbf 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -59,6 +59,7 @@ BeingHandler::BeingHandler(bool enableSync): SMSG_PLAYER_STOP, SMSG_PLAYER_MOVE_TO_ATTACK, 0x0119, + 0x0196, 0 }; handledMessages = _messages; @@ -69,13 +70,16 @@ void BeingHandler::handleMessage(MessageIn *msg) Uint32 id; Uint16 job, speed; Uint16 headTop, headMid, headBottom; - Uint16 shoes, gloves, cape, misc1, misc2; + Uint16 shoes, gloves; Uint16 weapon, shield; Uint16 gmstatus; Sint16 param1; + int stunMode; + Uint32 statusEffects; Sint8 type; + Uint16 status; Being *srcBeing, *dstBeing; - int hairStyle, hairColor; + int hairStyle, hairColor, flag; switch (msg->getId()) { @@ -84,9 +88,9 @@ void BeingHandler::handleMessage(MessageIn *msg) // Information about a being in range id = msg->readInt32(); speed = msg->readInt16(); - msg->readInt16(); // opt1 - msg->readInt16(); // opt2 - msg->readInt16(); // option + stunMode = msg->readInt16(); // opt1 + statusEffects = msg->readInt16(); // opt2 + statusEffects |= ((Uint32)msg->readInt16()) << 16; // option job = msg->readInt16(); // class dstBeing = beingManager->findBeing(id); @@ -110,6 +114,7 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->setAction(Being::STAND); } + // Prevent division by 0 when calculating frame if (speed == 0) { speed = 150; } @@ -128,14 +133,14 @@ void BeingHandler::handleMessage(MessageIn *msg) headTop = msg->readInt16(); headMid = msg->readInt16(); hairColor = msg->readInt16(); - shoes = msg->readInt16(); - gloves = msg->readInt16(); + shoes = msg->readInt16(); // clothes color - "abused" as shoes + gloves = msg->readInt16(); // head dir - "abused" as gloves msg->readInt16(); // guild msg->readInt16(); // unknown msg->readInt16(); // unknown msg->readInt16(); // manner - msg->readInt16(); // karma - msg->readInt8(); // unknown + dstBeing->setStatusEffectBlock(32, msg->readInt16()); // opt3 + msg->readInt8(); // karma dstBeing->setGender( (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE); @@ -166,6 +171,10 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt8(); // unknown msg->readInt8(); // unknown msg->readInt8(); // unknown / sit + + dstBeing->setStunMode(stunMode); + dstBeing->setStatusEffectBlock(0, (statusEffects >> 16) & 0xffff); + dstBeing->setStatusEffectBlock(16, statusEffects & 0xffff); break; case SMSG_BEING_MOVE2: @@ -230,7 +239,7 @@ void BeingHandler::handleMessage(MessageIn *msg) switch (type) { case 0x0a: // Critical Damage - if (dstBeing) + if (dstBeing) dstBeing->showCrit(); case 0x00: // Damage if (dstBeing) @@ -240,7 +249,7 @@ void BeingHandler::handleMessage(MessageIn *msg) break; case 0x02: // Sit - if (srcBeing) + if (srcBeing) { srcBeing->mFrame = 0; srcBeing->setAction(Being::SIT); @@ -248,7 +257,7 @@ void BeingHandler::handleMessage(MessageIn *msg) break; case 0x03: // Stand up - if (srcBeing) + if (srcBeing) { srcBeing->mFrame = 0; srcBeing->setAction(Being::STAND); @@ -371,9 +380,10 @@ void BeingHandler::handleMessage(MessageIn *msg) // An update about a player, potentially including movement. id = msg->readInt32(); speed = msg->readInt16(); - cape = msg->readInt16(); - misc1 = msg->readInt16(); - misc2 = msg->readInt16(); + stunMode = msg->readInt16(); // opt1; Aethyra use this as cape + statusEffects = msg->readInt16(); // opt2; Aethyra use this as misc1 + statusEffects |= ((Uint32) msg->readInt16()) + << 16; // status.options; Aethyra uses this as misc2 job = msg->readInt16(); dstBeing = beingManager->findBeing(id); @@ -398,11 +408,12 @@ void BeingHandler::handleMessage(MessageIn *msg) headTop = msg->readInt16(); headMid = msg->readInt16(); hairColor = msg->readInt16(); - shoes = msg->readInt16(); - gloves = msg->readInt16(); + msg->readInt16(); // clothes color - Aethyra-"abused" as shoes, we ignore it + msg->readInt16(); // head dir - Aethyra-"abused" as gloves, we ignore it msg->readInt32(); // guild - msg->readInt32(); // emblem + msg->readInt16(); // emblem msg->readInt16(); // manner + dstBeing->setStatusEffectBlock(32, msg->readInt16()); // opt3 msg->readInt8(); // karma dstBeing->setGender( (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE); @@ -413,13 +424,9 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom); dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid); dstBeing->setSprite(Being::HAT_SPRITE, headTop); - dstBeing->setSprite(Being::SHOE_SPRITE, shoes); - // Compensation for the unpatched TMW server - if (gloves > 10) - dstBeing->setSprite(Being::GLOVES_SPRITE, gloves); - dstBeing->setSprite(Being::CAPE_SPRITE, cape); - dstBeing->setSprite(Being::MISC1_SPRITE, misc1); - dstBeing->setSprite(Being::MISC2_SPRITE, misc2); + //dstBeing->setSprite(Being::CAPE_SPRITE, cape); + //dstBeing->setSprite(Being::MISC1_SPRITE, misc1); + //dstBeing->setSprite(Being::MISC2_SPRITE, misc2); dstBeing->setHairStyle(hairStyle, hairColor); if (msg->getId() == SMSG_PLAYER_MOVE) @@ -446,7 +453,7 @@ void BeingHandler::handleMessage(MessageIn *msg) switch (msg->readInt8()) { case 1: - if (dstBeing->getType() != Being::NPC) + if (dstBeing->getType() != Being::NPC) dstBeing->setAction(Being::DEAD); break; @@ -465,6 +472,10 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->mWalkTime = tick_time; dstBeing->mFrame = 0; + + dstBeing->setStunMode(stunMode); + dstBeing->setStatusEffectBlock(0, (statusEffects >> 16) & 0xffff); + dstBeing->setStatusEffectBlock(16, statusEffects & 0xffff); break; case SMSG_PLAYER_STOP: @@ -504,11 +515,30 @@ void BeingHandler::handleMessage(MessageIn *msg) break; case 0x0119: - // Change in players look - logger->log("0x0119 %i %i %i %x %i", msg->readInt32(), - msg->readInt16(), msg->readInt16(), msg->readInt16(), - msg->readInt8()); + // Change in players' flags + id = msg->readInt32(); + dstBeing = beingManager->findBeing(id); + stunMode = msg->readInt16(); + statusEffects = msg->readInt16(); + statusEffects |= ((Uint32) msg->readInt16()) << 16; + msg->readInt8(); + + if (dstBeing) { + dstBeing->setStunMode(stunMode); + dstBeing->setStatusEffectBlock(0, (statusEffects >> 16) & 0xffff); + dstBeing->setStatusEffectBlock(16, statusEffects & 0xffff); + } + break; + + case 0x0196: + // Status change + status = msg->readInt16(); + id = msg->readInt32(); + flag = msg->readInt8(); // 0: stop, 1: start + + dstBeing = beingManager->findBeing(id); + if (dstBeing) + dstBeing->setStatusEffect(status, flag); break; } } - diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp index 4f5f2acc..41314d16 100644 --- a/src/net/loginhandler.cpp +++ b/src/net/loginhandler.cpp @@ -113,7 +113,7 @@ void LoginHandler::handleMessage(MessageIn *msg) iptostring(server_info[i]->address), server_info[i]->port); } - state = CHAR_SERVER_STATE; + state = CHAR_SERVER_STATE; break; case 0x006a: diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index 4e17a27e..ea03537f 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -79,7 +79,7 @@ void NPCHandler::handleMessage(MessageIn *msg) case SMSG_NPC_CLOSE: id = msg->readInt32(); if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id))) - current_npc = NULL; + current_npc = NULL; break; case SMSG_NPC_NEXT: diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp index 2437d0a0..03aca66d 100644 --- a/src/net/partyhandler.cpp +++ b/src/net/partyhandler.cpp @@ -34,17 +34,17 @@ PartyHandler::PartyHandler(Party *party) : mParty(party) { static const Uint16 _messages[] = { - SMSG_PARTY_CREATE, - SMSG_PARTY_INFO, - SMSG_PARTY_INVITE, - SMSG_PARTY_INVITED, - SMSG_PARTY_SETTINGS, - SMSG_PARTY_MEMBER_INFO, - SMSG_PARTY_LEAVE, - SMSG_PARTY_UPDATE_HP, - SMSG_PARTY_UPDATE_COORDS, - SMSG_PARTY_MESSAGE, - 0 + SMSG_PARTY_CREATE, + SMSG_PARTY_INFO, + SMSG_PARTY_INVITE, + SMSG_PARTY_INVITED, + SMSG_PARTY_SETTINGS, + SMSG_PARTY_MEMBER_INFO, + SMSG_PARTY_LEAVE, + SMSG_PARTY_UPDATE_HP, + SMSG_PARTY_UPDATE_COORDS, + SMSG_PARTY_MESSAGE, + 0 }; handledMessages = _messages; } @@ -53,70 +53,70 @@ void PartyHandler::handleMessage(MessageIn *msg) { switch (msg->getId()) { - case SMSG_PARTY_CREATE: - mParty->createResponse(msg->readInt8()); - break; - case SMSG_PARTY_INFO: - break; - case SMSG_PARTY_INVITE: - { - std::string nick = msg->readString(24); - int status = msg->readInt8(); - mParty->inviteResponse(nick, status); - break; - } - case SMSG_PARTY_INVITED: - { - int id = msg->readInt32(); - Being *being = beingManager->findBeing(id); - if (being == NULL) - { - break; - } - std::string nick; + case SMSG_PARTY_CREATE: + mParty->createResponse(msg->readInt8()); + break; + case SMSG_PARTY_INFO: + break; + case SMSG_PARTY_INVITE: + { + std::string nick = msg->readString(24); + int status = msg->readInt8(); + mParty->inviteResponse(nick, status); + break; + } + case SMSG_PARTY_INVITED: + { + int id = msg->readInt32(); + Being *being = beingManager->findBeing(id); + if (being == NULL) + { + break; + } + std::string nick; int gender = 0; - std::string partyName = ""; - if (being->getType() != Being::PLAYER) - { - nick = ""; - } - else - { - nick = being->getName(); - gender = being->getGender(); - partyName = msg->readString(24); - } - mParty->invitedAsk(nick, gender, partyName); - break; - } - case SMSG_PARTY_SETTINGS: - break; - case SMSG_PARTY_MEMBER_INFO: - break; - case SMSG_PARTY_LEAVE: - { - /*int id = */msg->readInt32(); - std::string nick = msg->readString(24); - /*int fail = */msg->readInt8(); - mParty->leftResponse(nick); - break; - } - case SMSG_PARTY_UPDATE_HP: - break; - case SMSG_PARTY_UPDATE_COORDS: - break; - case SMSG_PARTY_MESSAGE: - { // new block to enable local variables - int msgLength = msg->readInt16() - 8; - if (msgLength <= 0) - { - return; - } - int id = msg->readInt32(); - Being *being = beingManager->findBeing(id); - std::string chatMsg = msg->readString(msgLength); - mParty->receiveChat(being, chatMsg); - } - break; + std::string partyName = ""; + if (being->getType() != Being::PLAYER) + { + nick = ""; + } + else + { + nick = being->getName(); + gender = being->getGender(); + partyName = msg->readString(24); + } + mParty->invitedAsk(nick, gender, partyName); + break; + } + case SMSG_PARTY_SETTINGS: + break; + case SMSG_PARTY_MEMBER_INFO: + break; + case SMSG_PARTY_LEAVE: + { + /*int id = */msg->readInt32(); + std::string nick = msg->readString(24); + /*int fail = */msg->readInt8(); + mParty->leftResponse(nick); + break; + } + case SMSG_PARTY_UPDATE_HP: + break; + case SMSG_PARTY_UPDATE_COORDS: + break; + case SMSG_PARTY_MESSAGE: + { // new block to enable local variables + int msgLength = msg->readInt16() - 8; + if (msgLength <= 0) + { + return; + } + int id = msg->readInt32(); + Being *being = beingManager->findBeing(id); + std::string chatMsg = msg->readString(msgLength); + mParty->receiveChat(being, chatMsg); + } + break; } } diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index 08d85ad0..048da9b1 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -29,11 +29,11 @@ class Party; class PartyHandler : public MessageHandler { public: - PartyHandler(Party *party); + PartyHandler(Party *party); - void handleMessage(MessageIn *msg); + void handleMessage(MessageIn *msg); private: - Party *mParty; + Party *mParty; }; #endif diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index d06f1108..46ded32e 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -146,7 +146,7 @@ void PlayerHandler::handleMessage(MessageIn *msg) /* Scroll if neccessary */ if (!nearby || (abs(x - player_node->mX) > MAP_TELEPORT_SCROLL_DISTANCE) - || (abs(y - player_node->mY) > MAP_TELEPORT_SCROLL_DISTANCE)) + || (abs(y - player_node->mY) > MAP_TELEPORT_SCROLL_DISTANCE)) { scrollOffsetX = (x - player_node->mX) * 32; scrollOffsetY = (y - player_node->mY) * 32; diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 0c7c9205..c5465835 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -112,7 +112,7 @@ void TradeHandler::handleMessage(MessageIn *msg) BY_SERVER); break; case 2: // Invite request check failed... - chatWindow->chatLog(_("Trade cancelled due to an unknown reason."), + chatWindow->chatLog(_("Trade cancelled due to an unknown reason."), BY_SERVER); break; case 3: // Trade accepted @@ -191,7 +191,7 @@ void TradeHandler::handleMessage(MessageIn *msg) BY_SERVER); break; default: - chatWindow->chatLog(_("Failed adding item for unknown reason."), + chatWindow->chatLog(_("Failed adding item for unknown reason."), BY_SERVER); break; } diff --git a/src/npc.cpp b/src/npc.cpp index 7b7db125..dfbc7d16 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -144,10 +144,10 @@ void NPC::stringInput(const std::string &value) { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_STR_RESPONSE); - outMsg.writeInt16(value.length() + 15); + outMsg.writeInt16(value.length() + 8); outMsg.writeInt32(mId); - outMsg.writeString(value, value.length() + 6); - outMsg.writeInt8(0); + outMsg.writeString(value, value.length()); + outMsg.writeInt8(0); // Just to be safe } /* diff --git a/src/particle.cpp b/src/particle.cpp index d89d0a3e..45cbb4c9 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -251,7 +251,7 @@ void Particle::moveTo(float x, float y) moveTo(Vector(x, y, mPos.z)); } -Particle* Particle::addEffect(const std::string &particleEffectFile, +Particle *Particle::addEffect(const std::string &particleEffectFile, int pixelX, int pixelY, int rotation) { Particle *newParticle = NULL; diff --git a/src/particle.h b/src/particle.h index 881bbb74..e79a46dd 100644 --- a/src/particle.h +++ b/src/particle.h @@ -284,7 +284,7 @@ class Particle : public Sprite // follow-point particles Particle *mTarget; /**< The particle that attracts this particle*/ - float mAcceleration; /**< Acceleration towards the target particle in pixels per game-tick²*/ + float mAcceleration; /**< Acceleration towards the target particle in pixels per game-tick²*/ float mInvDieDistance; /**< Distance in pixels from the target particle that causes the destruction of the particle*/ float mMomentum; /**< How much speed the particle retains after each game tick*/ }; diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index 1ed51053..63f89079 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -24,15 +24,17 @@ #include "particle.h" #include "particlecontainer.h" -ParticleContainer::ParticleContainer(ParticleContainer *parent, bool delParent) : + +ParticleContainer::ParticleContainer(ParticleContainer *parent, + bool delParent): mDelParent(delParent), mNext(parent) -{}; +{} ParticleContainer::~ParticleContainer() { clearLocally(); - if (mNext && mDelParent) + if (mDelParent) delete mNext; } @@ -51,10 +53,12 @@ void ParticleContainer::moveTo(float x, float y) // -- particle list ---------------------------------------- -ParticleList::ParticleList(ParticleContainer *parent, bool delParent) : - ParticleContainer(parent, delParent) {}; +ParticleList::ParticleList(ParticleContainer *parent, bool delParent): + ParticleContainer(parent, delParent) +{} -ParticleList::~ParticleList() {} +ParticleList::~ParticleList() +{} void ParticleList::addLocally(Particle *particle) { @@ -70,10 +74,12 @@ void ParticleList::removeLocally(Particle *particle) { for (std::list<Particle *>::iterator it = mElements.begin(); it != mElements.end(); it++) + { if (*it == particle) { (*it)->kill(); mElements.erase(it); } + } } void ParticleList::clearLocally() @@ -81,7 +87,7 @@ void ParticleList::clearLocally() for (std::list<Particle *>::iterator it = mElements.begin(); it != mElements.end(); it++) (*it)->kill(); - + mElements.clear(); } @@ -105,10 +111,12 @@ void ParticleList::moveTo(float x, float y) // -- particle vector ---------------------------------------- -ParticleVector::ParticleVector(ParticleContainer *parent, bool delParent) : - ParticleContainer(parent, delParent) {}; +ParticleVector::ParticleVector(ParticleContainer *parent, bool delParent): + ParticleContainer(parent, delParent) +{} -ParticleVector::~ParticleVector() {}; +ParticleVector::~ParticleVector() +{} void ParticleVector::setLocally(int index, Particle *particle) { @@ -119,6 +127,8 @@ void ParticleVector::setLocally(int index, Particle *particle) if (mIndexedElements.size() <= (unsigned) index) mIndexedElements.resize(index + 1, NULL); + if (particle) + particle->disableAutoDelete(); mIndexedElements[index] = particle; } @@ -148,7 +158,7 @@ void ParticleVector::moveTo(float x, float y) ParticleContainer::moveTo(x, y); for (std::vector<Particle *>::iterator it = mIndexedElements.begin(); - it != mIndexedElements.end(); it++) + it != mIndexedElements.end(); it++) { if (*it) { (*it)->moveTo(x, y); @@ -159,5 +169,6 @@ void ParticleVector::moveTo(float x, float y) *it = NULL; } } + } } diff --git a/src/particlecontainer.h b/src/particlecontainer.h index 4fb00027..26539dd7 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -60,8 +60,8 @@ public: virtual void moveTo(float x, float y); protected: - bool mDelParent; /**< Delete mNext in destructor */ - ParticleContainer *mNext; /**< Contained container, if any */ + bool mDelParent; /**< Delete mNext in destructor */ + ParticleContainer *mNext; /**< Contained container, if any */ }; /** @@ -88,7 +88,7 @@ public: virtual void moveTo(float x, float y); protected: - std::list<Particle *> mElements; /**< Contained particle effects */ + std::list<Particle *> mElements; /**< Contained particle effects */ }; /** diff --git a/src/party.cpp b/src/party.cpp index 70e0d3c2..fe575a37 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -33,7 +33,9 @@ #include "utils/strprintf.h" Party::Party(ChatWindow *chat, Network *network) : - mChat(chat), mNetwork(network), mInviteListener(network, &mInParty) + mChat(chat), + mNetwork(network), + mInviteListener(network, &mInParty) { } @@ -41,24 +43,24 @@ void Party::respond(const std::string &command, const std::string &args) { if (command == "new" || command == "create") { - create(args); - return; + create(args); + return; } if (command == "leave") { - leave(args); - return; + leave(args); + return; } if (command == "settings") { - mChat->chatLog(_("Not yet implemented!"), BY_SERVER); - return; - /* - MessageOut outMsg(mNetwork); - outMsg.writeInt16(CMSG_PARTY_SETTINGS); - outMsg.writeInt16(0); // Experience - outMsg.writeInt16(0); // Item - */ + mChat->chatLog(_("Not yet implemented!"), BY_SERVER); + return; + /* + MessageOut outMsg(mNetwork); + outMsg.writeInt16(CMSG_PARTY_SETTINGS); + outMsg.writeInt16(0); // Experience + outMsg.writeInt16(0); // Item + */ } mChat->chatLog(_("Party command not known."), BY_SERVER); } @@ -67,8 +69,8 @@ void Party::create(const std::string &party) { if (party == "") { - mChat->chatLog(_("Party name is missing."), BY_SERVER); - return; + mChat->chatLog(_("Party name is missing."), BY_SERVER); + return; } MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_PARTY_CREATE); @@ -88,12 +90,12 @@ void Party::createResponse(bool ok) { if (ok) { - mChat->chatLog(_("Party successfully created."), BY_SERVER); - mInParty = true; + mChat->chatLog(_("Party successfully created."), BY_SERVER); + mInParty = true; } else { - mChat->chatLog(_("Could not create party."), BY_SERVER); + mChat->chatLog(_("Could not create party."), BY_SERVER); } } @@ -102,34 +104,34 @@ void Party::inviteResponse(const std::string &nick, int status) switch (status) { case 0: - mChat->chatLog(strprintf(_("%s is already a member of a party."), - nick.c_str()), BY_SERVER); - break; + mChat->chatLog(strprintf(_("%s is already a member of a party."), + nick.c_str()), BY_SERVER); + break; case 1: - mChat->chatLog(strprintf(_("%s refused your invitation."), - nick.c_str()), BY_SERVER); - break; + mChat->chatLog(strprintf(_("%s refused your invitation."), + nick.c_str()), BY_SERVER); + break; case 2: - mChat->chatLog(strprintf(_("%s is now a member of your party."), - nick.c_str()), BY_SERVER); - break; + mChat->chatLog(strprintf(_("%s is now a member of your party."), + nick.c_str()), BY_SERVER); + break; } } void Party::invitedAsk(const std::string &nick, int gender, - const std::string &partyName) + const std::string &partyName) { mPartyName = partyName; /* Quick and nasty - needs redoing */ if (nick == "") { mChat->chatLog(_("You can\'t have a blank party name!"), BY_SERVER); - return; + return; } mCreating = false; ConfirmDialog *dlg = new ConfirmDialog(_("Invite to party"), - strprintf(_("%s invites you to join" - " the %s party, do you accept?"), - nick.c_str(), partyName.c_str())); + strprintf(_("%s invites you to join" + " the %s party, do you accept?"), + nick.c_str(), partyName.c_str())); dlg->addActionListener(&mInviteListener); } @@ -145,7 +147,7 @@ void Party::InviteListener::action(const gcn::ActionEvent &event) void Party::leftResponse(const std::string &nick) { - mChat->chatLog(strprintf(_("%s has left your party."), nick.c_str()), + mChat->chatLog(strprintf(_("%s has left your party."), nick.c_str()), BY_SERVER); } @@ -153,13 +155,13 @@ void Party::receiveChat(Being *being, const std::string &msg) { if (being == NULL) { - return; + return; } if (being->getType() != Being::PLAYER) { - mChat->chatLog(_("Party chat received, but being is not a player"), + mChat->chatLog(_("Party chat received, but being is not a player"), BY_SERVER); - return; + return; } being->setSpeech(msg, SPEECH_TIME); mChat->chatLog(being->getName() + " : " + msg, BY_PARTY); @@ -169,46 +171,46 @@ void Party::help(const std::string &msg) { if (msg == "") { - mChat->chatLog(_("Command: /party <command> <args>"), BY_SERVER); - mChat->chatLog(_("where <command> can be one of:"), BY_SERVER); - mChat->chatLog(_(" /new"), BY_SERVER); - mChat->chatLog(_(" /create"), BY_SERVER); - mChat->chatLog(_(" /prefix"), BY_SERVER); - mChat->chatLog(_(" /leave"), BY_SERVER); - mChat->chatLog(_("This command implements the partying function."), - BY_SERVER); - mChat->chatLog(_("Type /help party <command> for further help."), - BY_SERVER); - return; + mChat->chatLog(_("Command: /party <command> <args>"), BY_SERVER); + mChat->chatLog(_("where <command> can be one of:"), BY_SERVER); + mChat->chatLog(_(" /new"), BY_SERVER); + mChat->chatLog(_(" /create"), BY_SERVER); + mChat->chatLog(_(" /prefix"), BY_SERVER); + mChat->chatLog(_(" /leave"), BY_SERVER); + mChat->chatLog(_("This command implements the partying function."), + BY_SERVER); + mChat->chatLog(_("Type /help party <command> for further help."), + BY_SERVER); + return; } if (msg == "new" || msg == "create") { - mChat->chatLog(_("Command: /party new <party-name>"), BY_SERVER); - mChat->chatLog(_("Command: /party create <party-name>"), BY_SERVER); - mChat->chatLog(_("These commands create a new party <party-name."), - BY_SERVER); - return; + mChat->chatLog(_("Command: /party new <party-name>"), BY_SERVER); + mChat->chatLog(_("Command: /party create <party-name>"), BY_SERVER); + mChat->chatLog(_("These commands create a new party <party-name."), + BY_SERVER); + return; } if (msg == "prefix") { - mChat->chatLog(_("Command: /party prefix <prefix-char>"), BY_SERVER); - mChat->chatLog(_("This command sets the party prefix character."), - BY_SERVER); - mChat->chatLog(_("Any message preceded by <prefix-char> is sent to " - "the party instead of everyone."), BY_SERVER); - mChat->chatLog(_("Command: /party prefix"), BY_SERVER); - mChat->chatLog(_("This command reports the current party prefix " - "character."), BY_SERVER); - return; + mChat->chatLog(_("Command: /party prefix <prefix-char>"), BY_SERVER); + mChat->chatLog(_("This command sets the party prefix character."), + BY_SERVER); + mChat->chatLog(_("Any message preceded by <prefix-char> is sent to " + "the party instead of everyone."), BY_SERVER); + mChat->chatLog(_("Command: /party prefix"), BY_SERVER); + mChat->chatLog(_("This command reports the current party prefix " + "character."), BY_SERVER); + return; } //if (msg == "settings") //if (msg == "info") if (msg == "leave") { - mChat->chatLog(_("Command: /party leave"), BY_SERVER); - mChat->chatLog(_("This command causes the player to leave the party."), - BY_SERVER); - return; + mChat->chatLog(_("Command: /party leave"), BY_SERVER); + mChat->chatLog(_("This command causes the player to leave the party."), + BY_SERVER); + return; } mChat->chatLog(_("Unknown /party command."), BY_SERVER); mChat->chatLog(_("Type /help party for a list of options."), BY_SERVER); diff --git a/src/party.h b/src/party.h index 5643f894..98252c37 100644 --- a/src/party.h +++ b/src/party.h @@ -33,40 +33,44 @@ class Network; class Party { - public: - Party(ChatWindow *chat, Network *network); - void respond(const std::string &command, const std::string &args); + public: + Party(ChatWindow *chat, Network *network); + void respond(const std::string &command, const std::string &args); - void create(const std::string &party); - void leave(const std::string &args); + void create(const std::string &party); + void leave(const std::string &args); - void createResponse(bool ok); - void inviteResponse(const std::string &nick, int status); - void invitedAsk(const std::string &nick, int gender, - const std::string &partyName); - void leftResponse(const std::string &nick); - void receiveChat(Being *being, const std::string &msg); + void createResponse(bool ok); + void inviteResponse(const std::string &nick, int status); + void invitedAsk(const std::string &nick, int gender, + const std::string &partyName); + void leftResponse(const std::string &nick); + void receiveChat(Being *being, const std::string &msg); - void help(const std::string &msg); - private: - ChatWindow *mChat; - std::string mPartyName; - Network *mNetwork; - bool mInParty; - bool mCreating; /**< Used to give an appropriate response to - failure */ - PartyHandler *handler; + void help(const std::string &msg); - class InviteListener : public gcn::ActionListener - { - public: - InviteListener(Network *network, bool *inParty) : - mNetwork(network), mInParty(inParty) {}; - void action(const gcn::ActionEvent &event); - Network *mNetwork; - private: - bool *mInParty; - }; - InviteListener mInviteListener; + private: + ChatWindow *mChat; + std::string mPartyName; + Network *mNetwork; + bool mInParty; + bool mCreating; /**< Used to give an appropriate response to + failure */ + PartyHandler *handler; + + class InviteListener : public gcn::ActionListener + { + public: + InviteListener(Network *network, bool *inParty) : + mNetwork(network), + mInParty(inParty) + {} + void action(const gcn::ActionEvent &event); + Network *mNetwork; + private: + bool *mInParty; + }; + InviteListener mInviteListener; }; + #endif diff --git a/src/properties.h b/src/properties.h index 4bad8e59..a2ce5b88 100644 --- a/src/properties.h +++ b/src/properties.h @@ -45,7 +45,8 @@ 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; @@ -59,7 +60,7 @@ class Properties * @return the value of the given property, or 0.0f when it doesn't * exist. */ - float getFloatProperty(std::string const &name, float def = 0.0f) const + float getFloatProperty(const std::string &name, float def = 0.0f) const { PropertyMap::const_iterator i = mProperties.find(name); float ret = def; diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index 541acabe..719ecab1 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -55,9 +55,9 @@ void BuddyList::loadFile() char *buddy = new char[LEN_MAX_USERNAME]; inputStream.getline(buddy, LEN_MAX_USERNAME); // Ugly ? - if(strcmp(buddy,"")) mBuddylist.push_back(buddy); + if (strcmp(buddy, "")) mBuddylist.push_back(buddy); delete [] buddy; - } while(!inputStream.eof()); + } while (!inputStream.eof()); // Read buddy and close file inputStream.close(); diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 7456f0e4..61ea4bc0 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -101,7 +101,7 @@ void ColorDB::unload() std::string& ColorDB::get(int id) { - if(!mLoaded) + if (!mLoaded) load(); ColorIterator i = mColors.find(id); diff --git a/src/resources/colordb.h b/src/resources/colordb.h index da36048a..892411f8 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -47,6 +47,6 @@ namespace ColorDB // Color DB typedef std::map<int, std::string> Colors; typedef Colors::iterator ColorIterator; -}; +} #endif diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 63d85501..22bd2411 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -25,7 +25,7 @@ #include "../log.h" -Palette::Palette(std::string const &description) +Palette::Palette(const std::string &description) { int size = description.length(); if (size == 0) return; @@ -108,7 +108,7 @@ void Palette::getColor(int intensity, int color[3]) const color[2] = ((255 - t) * b1 + t * b2) / 255; } -Dye::Dye(std::string const &description) +Dye::Dye(const std::string &description) { for (int i = 0; i < 7; ++i) mPalettes[i] = 0; @@ -174,7 +174,7 @@ void Dye::update(int color[3]) const mPalettes[i - 1]->getColor(cmax, color); } -void Dye::instantiate(std::string &target, std::string const &palettes) +void Dye::instantiate(std::string &target, const std::string &palettes) { std::string::size_type next_pos = target.find('|'); if (next_pos == std::string::npos || palettes.empty()) return; diff --git a/src/resources/dye.h b/src/resources/dye.h index 1db16c6a..3cef334a 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -37,7 +37,7 @@ class Palette * The string is either a file name or a sequence of hexadecimal RGB * values separated by ',' and starting with '#'. */ - Palette(std::string const &pallete); + Palette(const std::string &pallete); /** * Gets a pixel color depending on its intensity. @@ -64,7 +64,7 @@ class Dye * The parts of string are separated by semi-colons. Each part starts * by an uppercase letter, followed by a colon and then a palette name. */ - Dye(std::string const &dye); + Dye(const std::string &dye); /** * Destroys the associated palettes. @@ -80,7 +80,7 @@ class Dye * Fills the blank in a dye placeholder with some palette names. */ static void instantiate(std::string &target, - std::string const &palettes); + const std::string &palettes); private: diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index adc1635c..ac41b59c 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h index 0962edad..2b9dbbc2 100644 --- a/src/resources/emotedb.h +++ b/src/resources/emotedb.h @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Aethyra; if not, write to the Free Software Foundation, + * along with Aethyra; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index c182b44c..40d62797 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -87,7 +87,7 @@ void ProxyImage::convertToDisplayFormat() mSDLImage = NULL; } -gcn::Image *ImageLoader::load(std::string const &filename, bool convert) +gcn::Image *ImageLoader::load(const std::string &filename, bool convert) { ResourceManager *resman = ResourceManager::getInstance(); ProxyImage *i = new ProxyImage(resman->loadSDLSurface(filename)); diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h index 0ac7c899..1d6c9ae4 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -61,7 +61,8 @@ class ProxyImage : public gcn::Image class ImageLoader : public gcn::ImageLoader { public: - gcn::Image *load(std::string const &filename, bool convertToDisplayFormat); + gcn::Image *load(const std::string &filename, + bool convertToDisplayFormat); }; #endif diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 2278dc67..3270c665 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -359,12 +359,12 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) xmlNodePtr dataChild = childNode->xmlChildrenNode; if (!dataChild) continue; - + int len = strlen((const char*)dataChild->content) + 1; unsigned char *charData = new unsigned char[len + 1]; const char *charStart = (const char*)dataChild->content; unsigned char *charIndex = charData; - + while (*charStart) { if (*charStart != ' ' && *charStart != '\t' && *charStart != '\n') @@ -426,10 +426,10 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } } else { - // Read plain XML map file - for_each_xml_child_node(childNode2, childNode) - { - if (!xmlStrEqual(childNode2->name, BAD_CAST "tile")) + // Read plain XML map file + for_each_xml_child_node(childNode2, childNode) + { + if (!xmlStrEqual(childNode2->name, BAD_CAST "tile")) continue; const int gid = XML::getProperty(childNode2, "gid", -1); @@ -443,12 +443,12 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } } } - + if (y < h) std::cerr << "TOO SMALL!\n"; if (x) std::cerr << "TOO SMALL!\n"; - + // There can be only one data element break; } diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index 75464035..359791fd 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -67,13 +67,13 @@ class MonsterInfo void addParticleEffect(std::string filename); - const std::string& getName() const + const std::string& getName() const { return mName; } - const std::list<std::string>& getSprites() const + const std::list<std::string>& getSprites() const { return mSprites; } - Being::TargetCursorSize getTargetCursorSize() const + Being::TargetCursorSize getTargetCursorSize() const { return mTargetCursorSize; } std::string getSound(MonsterSoundEvent event) const; @@ -83,7 +83,7 @@ class MonsterInfo void addAttackParticleEffect(const std::string &particleEffect) { mAttackParticle = particleEffect; } - const std::list<std::string>& getParticleEffects() const + const std::list<std::string>& getParticleEffects() const { return mParticleEffects; } private: diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index f193d55d..3f58076e 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -207,13 +207,13 @@ std::string ResourceManager::getPath(const std::string &file) else { // if not found in search path return the default path - path = std::string(AETHYRA_DATADIR) + std::string("data") + "/" + file; + path = std::string(TMW_DATADIR) + std::string("data") + "/" + file; } return path; } -Resource *ResourceManager::get(std::string const &idPath, generator fun, +Resource *ResourceManager::get(const std::string &idPath, generator fun, void *data) { // Check if the id exists, and return the value if it does. @@ -265,7 +265,7 @@ struct ResourceLoader } }; -Resource *ResourceManager::load(std::string const &path, loader fun) +Resource *ResourceManager::load(const std::string &path, loader fun) { ResourceLoader l = { this, path, fun }; return get(path, ResourceLoader::load, &l); @@ -307,7 +307,7 @@ struct DyedImageLoader } }; -Image *ResourceManager::getImage(std::string const &idPath) +Image *ResourceManager::getImage(const std::string &idPath) { DyedImageLoader l = { this, idPath }; return static_cast<Image*>(get(idPath, DyedImageLoader::load, &l)); @@ -349,8 +349,7 @@ struct SpriteDefLoader } }; -SpriteDef *ResourceManager::getSprite - (std::string const &path, int variant) +SpriteDef *ResourceManager::getSprite(const std::string &path, int variant) { SpriteDefLoader l = { path, variant }; std::stringstream ss; @@ -379,7 +378,8 @@ void ResourceManager::release(Resource *res) ResourceManager *ResourceManager::getInstance() { // Create a new instance if necessary. - if (instance == NULL) instance = new ResourceManager(); + if (!instance) + instance = new ResourceManager(); return instance; } diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 7996e816..c3c68d88 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -98,8 +98,9 @@ class ResourceManager bool isDirectory(const std::string &path); /** - * Returns the real path to a file - * + * Returns the real path to a file. Note that this method will always + * return a path, it does not check whether the file exists. + * * @param file The file to get the real path to. * @return The real path. */ @@ -114,7 +115,7 @@ class ResourceManager * @return A valid resource or <code>NULL</code> if the resource could * not be generated. */ - Resource *get(std::string const &idPath, generator fun, void *data); + Resource *get(const std::string &idPath, generator fun, void *data); /** * Loads a resource from a file and adds it to the resource map. @@ -124,7 +125,7 @@ class ResourceManager * @return A valid resource or <code>NULL</code> if the resource could * not be loaded. */ - Resource *load(std::string const &path, loader fun); + Resource *load(const std::string &path, loader fun); /** * Convenience wrapper around ResourceManager::get for loading @@ -154,7 +155,7 @@ class ResourceManager * Creates a sprite definition based on a given path and the supplied * variant. */ - SpriteDef *getSprite(std::string const &path, int variant = 0); + SpriteDef *getSprite(const std::string &path, int variant = 0); /** * Releases a resource, placing it in the set of orphaned resources. diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index e8d064d4..af3281be 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -32,7 +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); @@ -45,7 +45,7 @@ Action* SpriteDef::getAction(SpriteAction action) const return i->second; } -SpriteDef *SpriteDef::load(std::string const &animationFile, int variant) +SpriteDef *SpriteDef::load(const std::string &animationFile, int variant) { std::string::size_type pos = animationFile.find('|'); std::string palettes; @@ -120,7 +120,7 @@ void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant, } } -void SpriteDef::loadImageSet(xmlNodePtr node, std::string const &palettes) +void SpriteDef::loadImageSet(xmlNodePtr node, const std::string &palettes) { const std::string name = XML::getProperty(node, "name", ""); @@ -319,7 +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; @@ -390,5 +390,5 @@ SpriteDirection SpriteDef::makeSpriteDirection(const std::string& direction) } else { return DIRECTION_INVALID; - }; + } } diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 99d570f1..b9d7b85d 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -71,13 +71,24 @@ class SpriteDef : public Resource /** * Loads a sprite definition file. */ - static SpriteDef *load(std::string const &file, int variant); + static SpriteDef *load(const std::string &file, int variant); /** * Returns the specified action. */ Action *getAction(SpriteAction action) const; + /** + * Converts a string into a SpriteAction enum. + */ + static SpriteAction makeSpriteAction(const std::string &action); + + /** + * Converts a string into a SpriteDirection enum. + */ + static SpriteDirection + makeSpriteDirection(const std::string &direction); + private: /** * Constructor. @@ -98,7 +109,7 @@ class SpriteDef : public Resource /** * Loads an imageset element. */ - void loadImageSet(xmlNodePtr node, std::string const &palettes); + void loadImageSet(xmlNodePtr node, const std::string &palettes); /** * Loads an action element. @@ -128,16 +139,6 @@ class SpriteDef : public Resource */ void substituteAction(SpriteAction complete, SpriteAction with); - /** - * Converts a string into a SpriteAction enum. - */ - static SpriteAction makeSpriteAction(const std::string &action); - - /** - * Converts a string into a SpriteDirection enum. - */ - static SpriteDirection makeSpriteDirection(const std::string &direction); - typedef std::map<std::string, ImageSet*> ImageSets; typedef ImageSets::iterator ImageSetIterator; diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index 9066ed7f..d90602a6 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -33,7 +33,7 @@ SimpleAnimation::SimpleAnimation(Animation *animation): mAnimationPhase(0), mCurrentFrame(mAnimation->getFrame(0)) { -}; +} SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode): mAnimationTime(0), diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp new file mode 100644 index 00000000..8872fd7b --- /dev/null +++ b/src/statuseffect.cpp @@ -0,0 +1,170 @@ +/* + * The Mana World + * Copyright (C) 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <map> + +#include "gui/chat.h" +#include "statuseffect.h" + +#include "log.h" +#include "utils/xml.h" + + +#define STATUS_EFFECTS_FILE "status-effects.xml" + +StatusEffect::StatusEffect() : + mPersistentParticleEffect(false) +{} + +StatusEffect::~StatusEffect() +{} + +void StatusEffect::playSFX() +{ + if (mSFXEffect != "") + sound.playSfx(mSFXEffect); +} + +void StatusEffect::deliverMessage() +{ + if (mMessage != "") + chatWindow->chatLog(mMessage, BY_SERVER); +} + +Particle *StatusEffect::getParticle() +{ + if (mParticleEffect == "") + return NULL; + else + return particleEngine->addEffect(mParticleEffect, 0, 0); +} + +AnimatedSprite *StatusEffect::getIcon() +{ + if (mIcon == "") + return NULL; + else { + AnimatedSprite *sprite = AnimatedSprite::load( + "graphics/sprites/" + mIcon); + if (false && sprite) { + sprite->play(ACTION_DEFAULT); + sprite->reset(); + } + return sprite; + } +} + +SpriteAction StatusEffect::getAction() +{ + if (mAction == "") + return ACTION_INVALID; + else + return SpriteDef::makeSpriteAction(mAction); +} + + +// -- initialisation and static parts -- + + +typedef std::map<int, StatusEffect *> status_effect_map[2]; + +static status_effect_map statusEffects; +static status_effect_map stunEffects; +static std::map<int, int> blockEffectIndexMap; + +int StatusEffect::blockEffectIndexToEffectIndex(int blockIndex) +{ + load(); + if (blockEffectIndexMap.find(blockIndex) == blockEffectIndexMap.end()) + return -1; + return blockEffectIndexMap[blockIndex]; +} + +StatusEffect *StatusEffect::getStatusEffect(int index, bool enabling) +{ + load(); + return statusEffects[enabling][index]; +} + +StatusEffect *StatusEffect::getStunEffect(int index, bool enabling) +{ + load(); + return stunEffects[enabling][index]; +} + +static bool status_effects_loaded = false; + + + +void StatusEffect::load() +{ + if (status_effects_loaded) + return; + + status_effects_loaded = true; + + XML::Document doc(STATUS_EFFECTS_FILE); + xmlNodePtr rootNode = doc.rootNode(); + + if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "status-effects")) + { + logger->log("Error loading status effects file: " + STATUS_EFFECTS_FILE); + return; + } + + for_each_xml_child_node(node, rootNode) + { + status_effect_map *the_map = NULL; + + int index = atoi(XML::getProperty(node, "id", "-1").c_str()); + + if (xmlStrEqual(node->name, BAD_CAST "status-effect")) + { + the_map = &statusEffects; + int block_index = atoi(XML::getProperty(node, "block-id", "-1").c_str()); + + if (index >= 0 && block_index >= 0) + blockEffectIndexMap[block_index] = index; + + } else if (xmlStrEqual(node->name, BAD_CAST "stun-effect")) + the_map = &stunEffects; + + if (the_map) { + StatusEffect *startEffect = new StatusEffect(); + StatusEffect *endEffect = new StatusEffect(); + + startEffect->mMessage = XML::getProperty(node, "start-message", ""); + startEffect->mSFXEffect = XML::getProperty(node, "start-audio", ""); + startEffect->mParticleEffect = XML::getProperty(node, "start-particle", ""); + startEffect->mIcon = XML::getProperty(node, "icon", ""); + startEffect->mAction = XML::getProperty(node, "action", ""); + startEffect->mPersistentParticleEffect = (XML::getProperty(node, "persistent-particle-effect", "no")) != "no"; + + endEffect->mMessage = XML::getProperty(node, "end-message", ""); + endEffect->mSFXEffect = XML::getProperty(node, "end-audio", ""); + endEffect->mParticleEffect = XML::getProperty(node, "end-particle", ""); + + (*the_map)[1][index] = startEffect; + (*the_map)[0][index] = endEffect; + } + } +} diff --git a/src/statuseffect.h b/src/statuseffect.h new file mode 100644 index 00000000..16fed69a --- /dev/null +++ b/src/statuseffect.h @@ -0,0 +1,108 @@ +/* + * The Mana World + * Copyright (C) 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef STATUS_EFFECT_H +#define STATUS_EFFECT_H + +#include "resources/animation.h" +#include "particle.h" +#include "animatedsprite.h" +#include "sound.h" + +class StatusEffect +{ +public: + StatusEffect(); + ~StatusEffect(); + + /** + * Plays the sound effect associated with this status effect, if possible. + */ + void playSFX(); + + /** + * Delivers the chat message associated with this status effect, if + * possible. + */ + void deliverMessage(); + + /** + * Creates the particle effect associated with this status effect, if + * possible. + */ + Particle *getParticle(); + + /** + * Retrieves the status icon for this effect, if applicable + */ + AnimatedSprite *getIcon(); + + /** + * Retrieves an action to perform, or ACTION_INVALID + */ + SpriteAction getAction(); + + /** + * Determines whether the particle effect should be restarted when the + * being changes maps + */ + bool particleEffectIsPersistent() const { return mPersistentParticleEffect; } + + + /** + * Retrieves a status effect. + * + * \param index Index of the status effect. + * \param enabling Whether to retrieve the activating effect (true) or + * the deactivating effect (false). + */ + static StatusEffect *getStatusEffect(int index, bool enabling); + + /** + * Retrieves a stun effect. + * + * \param index Index of the stun effect. + * \param enabling Whether to retrieve the activating effect (true) or + * the deactivating effect (false). + */ + static StatusEffect *getStunEffect(int index, bool enabling); + + /** + * Maps a block effect index to its corresponding effect index. Block + * effect indices are used for opt2/opt3/status.option blocks; their + * mapping to regular effect indices is handled in the config file. + * + * Returns -1 on failure. + */ + static int blockEffectIndexToEffectIndex(int blocKIndex); + +private: + static void load(); + + std::string mMessage; + std::string mSFXEffect; + std::string mParticleEffect; + std::string mIcon; + std::string mAction; + bool mPersistentParticleEffect; +}; + +#endif // !defined(STATUS_EFFECT_H) diff --git a/src/text.cpp b/src/text.cpp index 8f93f157..e4f1d409 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -1,43 +1,75 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* + * Support for non-overlapping floating text + * Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net> + * Copyright (C) 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "text.h" #include <guichan/font.hpp> -#include "text.h" +#include "configuration.h" #include "textmanager.h" +#include "resources/resourcemanager.h" +#include "resources/image.h" #include "gui/gui.h" int Text::mInstances = 0; +ImageRect Text::mBubble; +Image *Text::mBubbleArrow; Text::Text(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour) : - mText(text), mColour(colour) + gcn::Graphics::Alignment alignment, + gcn::Color colour, bool isSpeech) : + mText(text), + mColour(colour), + mIsSpeech(isSpeech) { if (textManager == 0) { - textManager = new TextManager(); + textManager = new TextManager; + ResourceManager *resman = ResourceManager::getInstance(); + Image *sbImage = resman->getImage("graphics/gui/bubble.png|W:#" + + config.getValue("speechBubbleColour", "000000")); + mBubble.grid[0] = sbImage->getSubImage(0, 0, 5, 5); + mBubble.grid[1] = sbImage->getSubImage(5, 0, 5, 5); + mBubble.grid[2] = sbImage->getSubImage(10, 0, 5, 5); + mBubble.grid[3] = sbImage->getSubImage(0, 5, 5, 5); + mBubble.grid[4] = sbImage->getSubImage(5, 5, 5, 5); + mBubble.grid[5] = sbImage->getSubImage(10, 5, 5, 5); + mBubble.grid[6] = sbImage->getSubImage(0, 10, 5, 5); + mBubble.grid[7] = sbImage->getSubImage(5, 10, 5, 5); + mBubble.grid[8] = sbImage->getSubImage(10, 10, 5, 5); + mBubbleArrow = sbImage->getSubImage(0, 15, 15, 10); + const float bubbleAlpha = config.getValue("speechBubbleAlpha", 1.0); + for (int i = 0; i < 9; i++) + { + mBubble.grid[i]->setAlpha(bubbleAlpha); + } + mBubbleArrow->setAlpha(bubbleAlpha); + sbImage->decRef(); } ++mInstances; mHeight = boldFont->getHeight(); mWidth = boldFont->getWidth(text); + switch (alignment) { case gcn::Graphics::LEFT: @@ -55,11 +87,6 @@ Text::Text(const std::string &text, int x, int y, textManager->addText(this); } -void Text::adviseXY(int x, int y) -{ - textManager->moveText(this, x - mXOffset, y); -} - Text::~Text() { textManager->removeText(this); @@ -67,34 +94,81 @@ Text::~Text() { delete textManager; textManager = 0; + delete mBubble.grid[0]; + delete mBubble.grid[1]; + delete mBubble.grid[2]; + delete mBubble.grid[3]; + delete mBubble.grid[4]; + delete mBubble.grid[5]; + delete mBubble.grid[6]; + delete mBubble.grid[7]; + delete mBubble.grid[8]; + delete mBubbleArrow; } } +void Text::adviseXY(int x, int y) +{ + textManager->moveText(this, x - mXOffset, y); +} + void Text::draw(gcn::Graphics *graphics, int xOff, int yOff) { graphics->setFont(boldFont); + if (mIsSpeech) { + static_cast<Graphics*>(graphics)->drawImageRect( + mX - xOff - 5, mY - yOff - 5, mWidth + 10, mHeight + 10, + mBubble); + /* + if (mWidth >= 15) { + static_cast<Graphics*>(graphics)->drawImage( + mBubbleArrow, mX - xOff - 7 + mWidth / 2, + mY - yOff + mHeight + 4); + } + */ + } + // Text shadow graphics->setColor(gcn::Color(0, 0, 0)); graphics->drawText(mText, mX - xOff + 1, mY - yOff + 1, - gcn::Graphics::LEFT); - - // Text outline - graphics->drawText(mText, mX - xOff + 1, mY - yOff, - gcn::Graphics::LEFT); - graphics->drawText(mText, mX - xOff - 1, mY - yOff, - gcn::Graphics::LEFT); - graphics->drawText(mText, mX - xOff, mY - yOff + 1, - gcn::Graphics::LEFT); - graphics->drawText(mText, mX - xOff, mY - yOff - 1, - gcn::Graphics::LEFT); + gcn::Graphics::LEFT); + + if (!mIsSpeech) { + graphics->setColor(gcn::Color(0, 0, 0, 64)); + /* + // TODO: Reanable when we can draw it nicely in software mode + graphics->drawText(mText, mX - xOff + 2, mY - yOff + 2, + gcn::Graphics::LEFT); + graphics->drawText(mText, mX - xOff + 1, mY - yOff + 2, + gcn::Graphics::LEFT); + graphics->drawText(mText, mX - xOff + 2, mY - yOff + 1, + gcn::Graphics::LEFT); + */ + + // Text outline + graphics->setColor(gcn::Color(0, 0, 0)); + graphics->drawText(mText, mX - xOff + 1, mY - yOff, + gcn::Graphics::LEFT); + + graphics->drawText(mText, mX - xOff - 1, mY - yOff, + gcn::Graphics::LEFT); + + graphics->drawText(mText, mX - xOff, mY - yOff + 1, + gcn::Graphics::LEFT); + + graphics->drawText(mText, mX - xOff, mY - yOff - 1, + gcn::Graphics::LEFT); + } graphics->setColor(mColour); - graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT); + graphics->drawText(mText, mX - xOff, mY - yOff, + gcn::Graphics::LEFT); } FlashText::FlashText(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour) : + gcn::Graphics::Alignment alignment, + gcn::Color colour) : Text(text, x, y, alignment, colour), mTime(0) { @@ -1,29 +1,31 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* + * Support for non-overlapping floating text + * Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net> + * Copyright (C) 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #ifndef TEXT_H #define TEXT_H #include <guichan/color.hpp> -#include <guichan/graphics.hpp> +#include "graphics.h" #include "guichanfwd.h" class TextManager; @@ -37,7 +39,8 @@ class Text * Constructor creates a text object to display on the screen. */ Text(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour); + gcn::Graphics::Alignment alignment, + gcn::Color colour, bool isSpeech = false); /** * Destructor. The text is removed from the screen. @@ -63,13 +66,19 @@ class Text static int mInstances; /**< Instances of text. */ std::string mText; /**< The text to display. */ gcn::Color mColour; /**< The colour of the text. */ + bool mIsSpeech; /**< Is this text a speech bubble? */ + + protected: + static ImageRect mBubble; /**< Speech bubble graphic */ + static Image *mBubbleArrow; /**< Speech bubble arrow graphic */ }; class FlashText : public Text { public: FlashText(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour); + gcn::Graphics::Alignment alignment, + gcn::Color colour); /** * Remove the text from the screen @@ -77,12 +86,12 @@ class FlashText : public Text virtual ~FlashText() {} /** - * Flash the text for so many refreshes + * Flash the text for so many refreshes. */ void flash(int time) {mTime = time; } /** - * Draws the text + * Draws the text. */ virtual void draw(gcn::Graphics *graphics, int xOff, int yOff); diff --git a/src/textmanager.cpp b/src/textmanager.cpp index d40ba4d2..6bc8f8b6 100644 --- a/src/textmanager.cpp +++ b/src/textmanager.cpp @@ -1,27 +1,29 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* + * Support for non-overlapping floating text + * Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net> + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "textmanager.h" #include <cstring> #include "text.h" -#include "textmanager.h" TextManager *textManager = 0; diff --git a/src/textmanager.h b/src/textmanager.h index b1e10f08..ee8e1209 100644 --- a/src/textmanager.h +++ b/src/textmanager.h @@ -1,22 +1,23 @@ -/*************************************************************************** - * Copyright (C) 2008 by Douglas Boffey * - * * - * DougABoffey@netscape.net * - * This program 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 * - * (at your option) any later version. * - * * - * This program 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 this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/* + * Support for non-overlapping floating text + * Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net> + * + * This file is part of The Mana World. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #ifndef TEXTMANAGER_H #define TEXTMANAGER_H diff --git a/src/aethyra.rc b/src/tmw.rc index d2db954f..9661ac6b 100644 --- a/src/aethyra.rc +++ b/src/tmw.rc @@ -1,22 +1,23 @@ -#include <windows.h> // include for version info constants
-
-#include "winver.h"
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/aethyra.ico"
-
-1 VERSIONINFO
-FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-FILETYPE VFT_APP {
- BLOCK "StringFileInfo" {
- BLOCK "040904E4" {
- VALUE "CompanyName", "Aethyra Development Team"
- VALUE "FileVersion", PACKAGE_VERSION
- VALUE "FileDescription", "Aethyra Experiment"
- VALUE "LegalCopyright", "2008 (C)"
- VALUE "OriginalFilename", "aethyra.exe"
- VALUE "ProductName", "Aethyra MMORPG"
- VALUE "ProductVersion", PACKAGE_VERSION
- }
- }
+#include <windows.h> // include for version info constants + +#include "winver.h" + +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico" + +1 VERSIONINFO +FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +FILETYPE VFT_APP { + BLOCK "StringFileInfo" { + BLOCK "040904E4" { + VALUE "CompanyName", "The Mana World Development Team" + VALUE "FileVersion", PACKAGE_VERSION + VALUE "FileDescription", "The Mana World" + VALUE "LegalCopyright", "2004-2006 (C)" + VALUE "OriginalFilename", "tmw.exe" + VALUE "ProductName", "The Mana World MMORPG" + VALUE "ProductVersion", PACKAGE_VERSION + } + } } + diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 0b71fa50..8dbc441f 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -51,5 +51,4 @@ inline void delete_all(Container &c) std::for_each(c.begin(), c.end(), make_dtor(c)); } - #endif diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 24058558..d5dd54be 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -28,7 +28,7 @@ namespace XML { Document::Document(const std::string &filename): - mDoc(NULL) + mDoc(0) { int size; ResourceManager *resman = ResourceManager::getInstance(); @@ -87,7 +87,8 @@ 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) { @@ -107,4 +108,5 @@ namespace XML return NULL; } -} + +} // namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index 2e08dd50..76a63ff4 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -22,10 +22,10 @@ #ifndef XML_H #define XML_H -#include <string> - #include <libxml/tree.h> +#include <string> + /** * XML helper functions. */ @@ -81,7 +81,8 @@ namespace XML /** * 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 diff --git a/src/winver.h b/src/winver.h index ac53cd73..45043409 100644 --- a/src/winver.h +++ b/src/winver.h @@ -1,6 +1,6 @@ -/* VERSION DEFINITIONS */
-#define VER_MAJOR 0
-#define VER_MINOR 0
-#define VER_RELEASE 27
-#define VER_BUILD 1
-#define PACKAGE_VERSION "0.0.27.1" +/* VERSION DEFINITIONS */ +#define VER_MAJOR 0 +#define VER_MINOR 0 +#define VER_RELEASE 28 +#define VER_BUILD 0 +#define PACKAGE_VERSION "0.0.28" @@ -2,19 +2,21 @@ <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> - <Option title="Aethyra" /> + <Option title="The Mana World" /> <Option pch_mode="0" /> <Option compiler="gcc" /> <Build> <Target title="default"> - <Option output="aethyra.exe" prefix_auto="0" extension_auto="0" /> + <Option output="tmw.exe" prefix_auto="0" extension_auto="0" /> <Option type="0" /> <Option compiler="gcc" /> + <Option parameters='-u -d "D:/tmw/data"' /> <Option projectResourceIncludeDirsRelation="0" /> <Compiler> <Add option="-Wall" /> <Add option="-DUSE_OPENGL" /> <Add option="-DNOGDI" /> + <Add option="-DENABLE_NLS" /> </Compiler> <Linker> <Add library="guichan" /> @@ -34,11 +36,12 @@ <Add library="z.dll" /> <Add library="physfs" /> <Add library="curl.dll" /> + <Add library="intl" /> </Linker> </Target> <Target title="unix"> <Option platforms="Unix;" /> - <Option output="aethyra" prefix_auto="1" extension_auto="1" /> + <Option output="tmw" prefix_auto="1" extension_auto="1" /> <Option type="0" /> <Option compiler="gcc" /> <Compiler> @@ -68,25 +71,14 @@ <Add alias="All" targets="default;" /> </VirtualTargets> <Compiler> - <Add option="-fexpensive-optimizations" /> - <Add option="-O3" /> - <Add option="-O2" /> - <Add option="-O1" /> - <Add option="-O" /> - <Add option="-W" /> - <Add option="-Wall" /> - <Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include\SDL" /> - <Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include" /> + <Add directory="src\" /> + <Add directory="include" /> + <Add directory="include\libxml2" /> + <Add directory="include\SDL" /> </Compiler> <Linker> - <Add option="-s" /> - <Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\dll" /> + <Add directory="lib" /> </Linker> - <Unit filename="src\SDLMain.h" /> - <Unit filename="src\aethyra.rc"> - <Option compilerVar="WINDRES" /> - <Option target="default" /> - </Unit> <Unit filename="src\animatedsprite.cpp" /> <Unit filename="src\animatedsprite.h" /> <Unit filename="src\animationparticle.cpp" /> @@ -98,10 +90,6 @@ <Unit filename="src\configlistener.h" /> <Unit filename="src\configuration.cpp" /> <Unit filename="src\configuration.h" /> - <Unit filename="src\effectmanager.cpp" /> - <Unit filename="src\effectmanager.h" /> - <Unit filename="src\emoteshortcut.cpp" /> - <Unit filename="src\emoteshortcut.h" /> <Unit filename="src\engine.cpp" /> <Unit filename="src\engine.h" /> <Unit filename="src\equipment.cpp" /> @@ -116,6 +104,8 @@ <Unit filename="src\graphics.h" /> <Unit filename="src\gui\browserbox.cpp" /> <Unit filename="src\gui\browserbox.h" /> + <Unit filename="src\gui\buddywindow.cpp" /> + <Unit filename="src\gui\buddywindow.h" /> <Unit filename="src\gui\button.cpp" /> <Unit filename="src\gui\button.h" /> <Unit filename="src\gui\buy.cpp" /> @@ -132,20 +122,12 @@ <Unit filename="src\gui\chatinput.h" /> <Unit filename="src\gui\checkbox.cpp" /> <Unit filename="src\gui\checkbox.h" /> - <Unit filename="src\gui\colour.cpp" /> - <Unit filename="src\gui\colour.h" /> <Unit filename="src\gui\confirm_dialog.cpp" /> <Unit filename="src\gui\confirm_dialog.h" /> <Unit filename="src\gui\connection.cpp" /> <Unit filename="src\gui\connection.h" /> <Unit filename="src\gui\debugwindow.cpp" /> <Unit filename="src\gui\debugwindow.h" /> - <Unit filename="src\gui\emotecontainer.cpp" /> - <Unit filename="src\gui\emotecontainer.h" /> - <Unit filename="src\gui\emoteshortcutcontainer.cpp" /> - <Unit filename="src\gui\emoteshortcutcontainer.h" /> - <Unit filename="src\gui\emotewindow.cpp" /> - <Unit filename="src\gui\emotewindow.h" /> <Unit filename="src\gui\equipmentwindow.cpp" /> <Unit filename="src\gui\equipmentwindow.h" /> <Unit filename="src\gui\focushandler.cpp" /> @@ -164,12 +146,10 @@ <Unit filename="src\gui\item_amount.h" /> <Unit filename="src\gui\itemcontainer.cpp" /> <Unit filename="src\gui\itemcontainer.h" /> - <Unit filename="src\gui\itemlinkhandler.cpp" /> - <Unit filename="src\gui\itemlinkhandler.h" /> - <Unit filename="src\gui\itempopup.cpp" /> - <Unit filename="src\gui\itempopup.h" /> <Unit filename="src\gui\itemshortcutcontainer.cpp" /> <Unit filename="src\gui\itemshortcutcontainer.h" /> + <Unit filename="src\gui\itemshortcutwindow.cpp" /> + <Unit filename="src\gui\itemshortcutwindow.h" /> <Unit filename="src\gui\linkhandler.h" /> <Unit filename="src\gui\listbox.cpp" /> <Unit filename="src\gui\listbox.h" /> @@ -215,8 +195,6 @@ <Unit filename="src\gui\setup.h" /> <Unit filename="src\gui\setup_audio.cpp" /> <Unit filename="src\gui\setup_audio.h" /> - <Unit filename="src\gui\setup_colours.cpp" /> - <Unit filename="src\gui\setup_colours.h" /> <Unit filename="src\gui\setup_joystick.cpp" /> <Unit filename="src\gui\setup_joystick.h" /> <Unit filename="src\gui\setup_keyboard.cpp" /> @@ -230,16 +208,10 @@ <Unit filename="src\gui\shop.h" /> <Unit filename="src\gui\shoplistbox.cpp" /> <Unit filename="src\gui\shoplistbox.h" /> - <Unit filename="src\gui\shortcutcontainer.cpp" /> - <Unit filename="src\gui\shortcutcontainer.h" /> - <Unit filename="src\gui\shortcutwindow.cpp" /> - <Unit filename="src\gui\shortcutwindow.h" /> <Unit filename="src\gui\skill.cpp" /> <Unit filename="src\gui\skill.h" /> <Unit filename="src\gui\slider.cpp" /> <Unit filename="src\gui\slider.h" /> - <Unit filename="src\gui\speechbubble.cpp" /> - <Unit filename="src\gui\speechbubble.h" /> <Unit filename="src\gui\status.cpp" /> <Unit filename="src\gui\status.h" /> <Unit filename="src\gui\table.cpp" /> @@ -258,8 +230,6 @@ <Unit filename="src\gui\updatewindow.h" /> <Unit filename="src\gui\viewport.cpp" /> <Unit filename="src\gui\viewport.h" /> - <Unit filename="src\gui\widgets\dropdown.cpp" /> - <Unit filename="src\gui\widgets\dropdown.h" /> <Unit filename="src\gui\widgets\layout.cpp" /> <Unit filename="src\gui\widgets\layout.h" /> <Unit filename="src\gui\widgets\layouthelper.cpp" /> @@ -327,8 +297,7 @@ <Unit filename="src\net\network.h" /> <Unit filename="src\net\npchandler.cpp" /> <Unit filename="src\net\npchandler.h" /> - <Unit filename="src\net\partyhandler.cpp" /> - <Unit filename="src\net\partyhandler.h" /> + <Unit filename="src\net\packet.h" /> <Unit filename="src\net\playerhandler.cpp" /> <Unit filename="src\net\playerhandler.h" /> <Unit filename="src\net\protocol.cpp" /> @@ -348,14 +317,10 @@ <Unit filename="src\particleemitter.cpp" /> <Unit filename="src\particleemitter.h" /> <Unit filename="src\particleemitterprop.h" /> - <Unit filename="src\party.cpp" /> - <Unit filename="src\party.h" /> <Unit filename="src\player.cpp" /> <Unit filename="src\player.h" /> <Unit filename="src\player_relations.cpp" /> <Unit filename="src\player_relations.h" /> - <Unit filename="src\position.cpp" /> - <Unit filename="src\position.h" /> <Unit filename="src\properties.h" /> <Unit filename="src\resources\action.cpp" /> <Unit filename="src\resources\action.h" /> @@ -365,12 +330,8 @@ <Unit filename="src\resources\animation.h" /> <Unit filename="src\resources\buddylist.cpp" /> <Unit filename="src\resources\buddylist.h" /> - <Unit filename="src\resources\colordb.cpp" /> - <Unit filename="src\resources\colordb.h" /> <Unit filename="src\resources\dye.cpp" /> <Unit filename="src\resources\dye.h" /> - <Unit filename="src\resources\emotedb.cpp" /> - <Unit filename="src\resources\emotedb.h" /> <Unit filename="src\resources\image.cpp" /> <Unit filename="src\resources\image.h" /> <Unit filename="src\resources\imageloader.cpp" /> @@ -409,6 +370,8 @@ <Unit filename="src\sound.cpp" /> <Unit filename="src\sound.h" /> <Unit filename="src\sprite.h" /> + <Unit filename="src\statuseffect.cpp" /> + <Unit filename="src\statuseffect.h" /> <Unit filename="src\text.cpp" /> <Unit filename="src\text.h" /> <Unit filename="src\textmanager.cpp" /> @@ -416,26 +379,25 @@ <Unit filename="src\textparticle.cpp" /> <Unit filename="src\textparticle.h" /> <Unit filename="src\tileset.h" /> + <Unit filename="src\tmw.rc"> + <Option compilerVar="CPP" /> + </Unit> <Unit filename="src\utils\base64.cpp" /> <Unit filename="src\utils\base64.h" /> <Unit filename="src\utils\dtor.h" /> <Unit filename="src\utils\fastsqrt.h" /> - <Unit filename="src\utils\gettext.h" /> - <Unit filename="src\utils\mutex.h" /> <Unit filename="src\utils\strprintf.cpp" /> <Unit filename="src\utils\strprintf.h" /> <Unit filename="src\utils\tostring.h" /> <Unit filename="src\utils\trim.h" /> <Unit filename="src\utils\xml.cpp" /> <Unit filename="src\utils\xml.h" /> - <Unit filename="src\vector.cpp" /> <Unit filename="src\vector.h" /> <Unit filename="src\winver.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> - <lib_finder disable_auto="1" /> </Extensions> </Project> </CodeBlocks_project_file> diff --git a/aethyra.desktop b/tmw.desktop index eb75b5cf..398fb439 100644 --- a/aethyra.desktop +++ b/tmw.desktop @@ -1,16 +1,16 @@ [Desktop Entry] Version=1.0 Encoding=UTF-8 -Name=Aethyra -Name[fr]=Aethyra +Name=The Mana World +Name[fr]=Le Monde de Mana Comment=An on-line fantasy role playing game Comment[fr]=Un jeu en ligne dans un univers fantastique Comment[de]=ein Online Fantasy Spiel Comment[it]=Un gioco fantasy online Comment[nl]=Een online role playing game -Exec=aethyra +Exec=tmw StartupNotify=false Terminal=false Type=Application -Icon=aethyra.png +Icon=tmw.png Categories=Application;Game diff --git a/tools/adler32.c b/tools/adler32.c index cd85d58e..5dd7e4c1 100644 --- a/tools/adler32.c +++ b/tools/adler32.c @@ -10,6 +10,7 @@ #include <stdlib.h> #include <stdio.h> #include <zlib.h> + /** * Calculates the Adler-32 checksum for the given file. */ diff --git a/tools/tmxcopy/main.cpp b/tools/tmxcopy/main.cpp index ab67afe6..ac18ce04 100644 --- a/tools/tmxcopy/main.cpp +++ b/tools/tmxcopy/main.cpp @@ -27,7 +27,7 @@ int main(int argc, char * argv[] ) // parsing command line options if (argc < 9 || argc > 10) { - std::cerr<<"Usage: srcFile x y width height tgtFile x y [outfile]"; + std::cerr<<"Usage: srcFile x y width height tgtFile x y [outfile]\n"; return -1; } diff --git a/tools/tmxcopy/map.cpp b/tools/tmxcopy/map.cpp index 92e661fd..d9fc8ada 100644 --- a/tools/tmxcopy/map.cpp +++ b/tools/tmxcopy/map.cpp @@ -22,6 +22,7 @@ #include <map> #include <list> +#include <string.h> #include <zlib.h> #include "xmlutils.h" diff --git a/tools/upalyzer/analyze.php b/tools/upalyzer/analyze.php index 106fcbb5..43057af1 100644 --- a/tools/upalyzer/analyze.php +++ b/tools/upalyzer/analyze.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ header("Content-type: text/html"); -header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); @@ -31,6 +31,8 @@ header("Pragma: no-cache"); List of current updates: <?php +$download_url_base = 'http://updates.themanaworld.org/tmwdata/'; +$checkout_path = '/home/eathena/public_html/updates/tmwdata/'; $update_file = array_filter(array_reverse(file('resources2.txt'))); $updates = array(); $update_file_maxlen = 0; @@ -62,16 +64,20 @@ foreach ($update_file as $update_line) $update['uncompressed_size'] += zip_entry_filesize($zip_entry); $entry_name = zip_entry_name($zip_entry); $entry_size = zip_entry_compressedsize($zip_entry); + $entry_exists = file_exists($checkout_path . $entry_name); $entry_used = !array_key_exists($entry_name, $update_entries); $entries[$entry_name] = array( 'name' => $entry_name, 'size' => $entry_size, - 'used' => $entry_used); + 'used' => $entry_used, + 'obsolete' => !$entry_exists); $update['size'] += $entry_size; if ($entry_used) { - $update['used_entry_count']++; - $update['used_size'] += $entry_size; + if ($entry_exists) { + $update['used_entry_count']++; + $update['used_size'] += $entry_size; + } $update_entries[$entry_name] = $update; } @@ -107,7 +113,7 @@ function print_update_name($update, $pad = true) foreach (array_reverse($updates) as $update) { print_update_name($update); - echo ' '. $update['adler32']; + printf(" %8s", $update['adler32']); printf(" %4d kb", $update['filesize'] / 1024); if (!$update['zip_error']) { printf(" %4d kb", $update['uncompressed_size'] / 1024); @@ -140,8 +146,14 @@ ksort($update_entries); foreach ($update_entries as $entry => $update) { - printf("%-{$update_entry_maxlen}s ", $entry); - print_update_name($update, false); + $exists = file_exists($checkout_path . $entry); + printf("<span style=\"color: %s;\">%-{$update_entry_maxlen}s</span> ", + $exists ? "black" : "rgb(100,100,100)", + $entry); + print_update_name($update, true); + + if ($exists && substr($entry, strlen($entry) - 1) != '/') + printf(' <a href="%s%s">download</a>', $download_url_base, $entry); echo "\n"; } @@ -153,10 +165,13 @@ foreach (array_reverse($updates) as $update) print "\n<a name=\"".$update['file']."\"/><b>".$update['file']."</b>\n"; foreach ($update['entries'] as $entry_name => $entry) { - printf("%-{$update_entry_maxlen}s", $entry_name); - if ($entry['used']) { + printf("%s%-{$update_entry_maxlen}s%s", + $entry['obsolete'] ? "<span style=\"color: rgb(100,100,100);\">" : "", + $entry_name, + $entry['obsolete'] ? "</span>" : ""); + if ($entry['used'] && !$entry['obsolete']) { echo ' *'; - } else { + } elseif (!$entry['obsolete']) { echo ' '; print_update_name($update_entries[$entry_name], false); } diff --git a/update.sh b/update.sh deleted file mode 100755 index b72539c4..00000000 --- a/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -#automated script to update aethyra from git -#author=Blame <blame@aethyra.com> -#last modified 2008-12-03 Tametomo -file=~/src/aethyra -file1=~/src -# test for the aethyra client folder -if [ -e $file ]; then - #change to the aethyra directory - cd $file; - #issue the git update command - git pull; - #issue the autobuild command - ./autobuild.sh; - echo "Aethyra has been updated" - exit 1; -else - #make directory /home/user-name/src - mkdir $file1 - #change to directory /home/user-name/src - cd $file1 - #execute the git command to download the client files - git clone git://gitorious.org/tmw/aethyra.git - #change to the aethyra directory - cd $file; - #issue the auto build script to compile the client - ./autobuild.sh - echo "congratulations on installing aethyra enjoy" - exit 1; -fi |
