diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | po/LINGUAS | 1 | ||||
| -rw-r--r-- | po/nl.po | 458 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 58 | ||||
| -rw-r--r-- | src/gui/viewport.h | 17 |
5 files changed, 506 insertions, 34 deletions
@@ -1,3 +1,9 @@ +2007-10-15 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/viewport.h, src/gui/viewport.cpp: Put drawing of debug path + into a private method. + * po/LINGUAS, po/nl.po: Added Dutch translation (incomplete). + 2007-10-01 Guillaume Melquiond <guillaume.melquiond@gmail.com> * src/item.cpp, src/gui/itemcontainer.cpp, src/resources/itemdb.cpp: @@ -2,4 +2,5 @@ de fr it +nl pl diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 00000000..b856ff56 --- /dev/null +++ b/po/nl.po @@ -0,0 +1,458 @@ +# Dutch translation of The Mana World. +# Copyright (C) 2007 The Mana World Development Team +# This file is distributed under the same license as the The Mana World package. +# Bjørn Lindeijer <bjorn@lindeijer.nl>, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: The Mana World 0.1.0\n" +"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2007-08-13 12:30+0200\n" +"PO-Revision-Date: 2007-10-15 17:05+0000\n" +"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n" +"Language-Team: Dutch\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2007-10-15 17:28+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: src/gui/char_select.cpp:68 +msgid "Confirm" +msgstr "Bevestigen" + +#: src/gui/char_select.cpp:69 +msgid "Are you sure you want to delete this character?" +msgstr "Weet je zeker dat je deze personage wilt verwijderen?" + +#: src/gui/char_select.cpp:85 +msgid "Select Character" +msgstr "Kies Personage" + +#: src/gui/char_select.cpp:89 src/gui/item_amount.cpp:46 src/gui/login.cpp:49 +#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42 +#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44 +#: src/gui/serverdialog.cpp:138 +msgid "Ok" +msgstr "Oké" + +#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:279 +#: src/gui/connection.cpp:59 src/gui/item_amount.cpp:47 src/gui/login.cpp:50 +#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45 +#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:139 src/gui/setup.cpp:51 +msgid "Cancel" +msgstr "Annuleren" + +#: src/gui/char_select.cpp:91 +msgid "New" +msgstr "Nieuw" + +#: src/gui/char_select.cpp:92 +msgid "Delete" +msgstr "Verwijderen" + +#: src/gui/char_select.cpp:93 +msgid "Previous" +msgstr "Vorige" + +#: src/gui/char_select.cpp:94 +msgid "Next" +msgstr "Volgende" + +#: src/gui/char_select.cpp:95 +msgid "Unregister" +msgstr "Registreren" + +#: src/gui/char_select.cpp:97 src/gui/char_select.cpp:203 +#: src/gui/char_select.cpp:214 src/gui/inventorywindow.cpp:66 +#: src/gui/inventorywindow.cpp:131 +#, c-format +msgid "Name: %s" +msgstr "Naam: %s" + +#: src/gui/char_select.cpp:98 src/gui/char_select.cpp:204 +#: src/gui/char_select.cpp:215 +#, c-format +msgid "Level: %d" +msgstr "" + +#: src/gui/char_select.cpp:99 src/gui/char_select.cpp:205 +#: src/gui/char_select.cpp:216 +#, c-format +msgid "Money: %d" +msgstr "Geld: %d" + +#: src/gui/char_select.cpp:264 +msgid "Create Character" +msgstr "Personage Aanmaken" + +#: src/gui/char_select.cpp:271 src/gui/login.cpp:44 src/gui/register.cpp:67 +msgid "Name:" +msgstr "Naam:" + +#: src/gui/char_select.cpp:274 +msgid "Hair Color:" +msgstr "Haarkleur:" + +#: src/gui/char_select.cpp:277 +msgid "Hair Style:" +msgstr "Haarstijl:" + +#: src/gui/char_select.cpp:278 +msgid "Create" +msgstr "Aanmaken" + +#: src/gui/char_select.cpp:281 +msgid "Strength:" +msgstr "" + +#: src/gui/char_select.cpp:282 +msgid "Agility:" +msgstr "" + +#: src/gui/char_select.cpp:283 +msgid "Dexterity:" +msgstr "" + +#: src/gui/char_select.cpp:284 +msgid "Vitality:" +msgstr "" + +#: src/gui/char_select.cpp:285 +msgid "Intelligence:" +msgstr "" + +#: src/gui/char_select.cpp:286 +msgid "Willpower:" +msgstr "" + +#: src/gui/char_select.cpp:287 +msgid "Charisma:" +msgstr "" + +#: src/gui/char_select.cpp:295 src/gui/char_select.cpp:441 +#, c-format +msgid "Please distribute %d points" +msgstr "" + +#: src/gui/char_select.cpp:387 src/gui/register.cpp:220 +#: src/gui/serverdialog.cpp:205 +msgid "Error" +msgstr "Fout" + +#: src/gui/char_select.cpp:388 +msgid "Your name needs to be at least 4 characters." +msgstr "Je naam moet uit tenminste 4 tekens bestaan" + +#: src/gui/char_select.cpp:433 +msgid "Character stats OK" +msgstr "" + +#: src/gui/char_select.cpp:445 +#, c-format +msgid "Please remove %d points" +msgstr "" + +#: src/gui/confirm_dialog.cpp:37 +msgid "Yes" +msgstr "Ja" + +#: src/gui/confirm_dialog.cpp:38 +msgid "No" +msgstr "Nee" + +#: src/gui/connection.cpp:62 +msgid "Connecting..." +msgstr "" + +#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:62 +msgid "Equipment" +msgstr "" + +#: src/gui/equipmentwindow.cpp:65 +msgid "Unequip" +msgstr "" + +#: src/gui/inventorywindow.cpp:48 src/gui/menuwindow.cpp:63 +msgid "Inventory" +msgstr "" + +#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:195 +msgid "Use" +msgstr "Gebruiken" + +#: src/gui/inventorywindow.cpp:57 +msgid "Drop" +msgstr "Neerleggen" + +#: src/gui/inventorywindow.cpp:67 src/gui/inventorywindow.cpp:135 +#, c-format +msgid "Description: %s" +msgstr "Beschrijving: %s" + +#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:133 +#, c-format +msgid "Effect: %s" +msgstr "Effect: %s" + +#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:97 +#, c-format +msgid "Total Weight: %d - Maximum Weight: %d" +msgstr "" + +#: src/gui/inventorywindow.cpp:192 +msgid "Equip" +msgstr "" + +#: src/gui/item_amount.cpp:79 +msgid "Select amount of items to trade." +msgstr "" + +#: src/gui/item_amount.cpp:83 +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:68 +msgid "Password:" +msgstr "Wachtword:" + +#: src/gui/login.cpp:48 +msgid "Keep" +msgstr "Behouden" + +#: src/gui/login.cpp:51 src/gui/register.cpp:63 src/gui/register.cpp:75 +msgid "Register" +msgstr "Aanmelden" + +#: src/gui/menuwindow.cpp:61 +msgid "Status" +msgstr "" + +#: src/gui/menuwindow.cpp:64 +msgid "Skills" +msgstr "" + +#: src/gui/menuwindow.cpp:65 src/gui/setup.cpp:44 +msgid "Setup" +msgstr "" + +#: src/gui/minimap.cpp:35 +msgid "MiniMap" +msgstr "" + +#: src/gui/npclistdialog.cpp:37 src/gui/npc_text.cpp:37 +msgid "NPC" +msgstr "" + +#: src/gui/popupmenu.cpp:79 +#, c-format +msgid "@@trade|Trade With %s@@" +msgstr "" + +#: src/gui/popupmenu.cpp:81 +#, c-format +msgid "@@attack|Attack %s@@" +msgstr "" + +#: src/gui/popupmenu.cpp:90 +msgid "@@talk|Talk To NPC@@" +msgstr "" + +#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116 +#: src/gui/popupmenu.cpp:227 +msgid "@@cancel|Cancel@@" +msgstr "" + +#: src/gui/popupmenu.cpp:112 +#, c-format +msgid "@@pickup|Pick Up %s@@" +msgstr "" + +#: src/gui/popupmenu.cpp:219 +msgid "@@use|Equip@@" +msgstr "" + +#: src/gui/popupmenu.cpp:222 +msgid "@@use|Use@@" +msgstr "" + +#: src/gui/popupmenu.cpp:224 +msgid "@@drop|Drop@@" +msgstr "" + +#: src/gui/popupmenu.cpp:225 +msgid "@@description|Description@@" +msgstr "" + +#: src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40 +#: src/gui/quitdialog.cpp:41 +msgid "Quit" +msgstr "Afsluiten" + +#: src/gui/quitdialog.cpp:42 +msgid "Switch server" +msgstr "" + +#: src/gui/quitdialog.cpp:43 +msgid "Switch character" +msgstr "" + +#: src/gui/register.cpp:69 +msgid "Confirm:" +msgstr "Bevestigen:" + +#: src/gui/register.cpp:70 +msgid "Email:" +msgstr "E-mail:" + +#: src/gui/register.cpp:168 +#, c-format +msgid "The username needs to be at least %d characters long." +msgstr "" + +#: src/gui/register.cpp:176 +#, c-format +msgid "The username needs to be less than %d characters long." +msgstr "" + +#: src/gui/register.cpp:184 +#, c-format +msgid "The password needs to be at least %d characters long." +msgstr "" + +#: src/gui/register.cpp:192 +#, c-format +msgid "The password needs to be less than %d characters long." +msgstr "" + +#: src/gui/register.cpp:199 +msgid "Passwords do not match." +msgstr "Wachtwoorden komen niet overeen." + +#: src/gui/serverdialog.cpp:102 +msgid "Choose your Mana World Server" +msgstr "" + +#: src/gui/serverdialog.cpp:104 +msgid "Server:" +msgstr "Server:" + +#: src/gui/serverdialog.cpp:105 +msgid "Port:" +msgstr "Poort:" + +#: src/gui/setup_audio.cpp:42 +msgid "Sound" +msgstr "Geluid" + +#: src/gui/setup_audio.cpp:48 +msgid "Sfx volume" +msgstr "" + +#: src/gui/setup_audio.cpp:49 +msgid "Music volume" +msgstr "Muziek volume" + +#: src/gui/setup.cpp:51 +msgid "Apply" +msgstr "Toepassen" + +#: src/gui/setup.cpp:51 +msgid "Reset Windows" +msgstr "" + +#: src/gui/setup.cpp:68 +msgid "Video" +msgstr "" + +#: src/gui/setup.cpp:72 +msgid "Audio" +msgstr "" + +#: src/gui/setup.cpp:76 +msgid "Joystick" +msgstr "Joystick" + +#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72 +msgid "Press the button to start calibration" +msgstr "" + +#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70 +msgid "Calibrate" +msgstr "Kalibreren" + +#: src/gui/setup_joystick.cpp:40 +msgid "Enable joystick" +msgstr "" + +#: src/gui/setup_joystick.cpp:75 +msgid "Stop" +msgstr "" + +#: src/gui/setup_joystick.cpp:76 +msgid "Rotate the stick" +msgstr "" + +#: src/gui/setup_video.cpp:113 +msgid "Full screen" +msgstr "Volledig scherm" + +#: src/gui/setup_video.cpp:114 +msgid "OpenGL" +msgstr "OpenGL" + +#: src/gui/setup_video.cpp:115 +msgid "Custom cursor" +msgstr "" + +#: src/gui/setup_video.cpp:117 +msgid "FPS Limit:" +msgstr "" + +#: src/gui/setup_video.cpp:133 +msgid "Gui opacity" +msgstr "" + +#: src/gui/setup_video.cpp:186 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_video.cpp:194 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_video.cpp:202 +msgid "Ambient FX" +msgstr "" + +#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369 +msgid "off" +msgstr "uit" + +#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372 +msgid "low" +msgstr "laag" + +#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375 +msgid "high" +msgstr "hoog" + +#: src/gui/setup_video.cpp:268 +msgid "Switching to full screen" +msgstr "" + +#: src/gui/setup_video.cpp:269 +msgid "Restart needed for changes to take effect." +msgstr "" + +#: src/gui/setup_video.cpp:280 +msgid "Changing OpenGL" +msgstr "" + +#: src/gui/setup_video.cpp:281 +msgid "Applying change to OpenGL requires restart." +msgstr "" diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 4c6b04a2..915b618d 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -87,8 +87,8 @@ void Viewport::loadTargetCursor(std::string filename, int width, int height, bool outRange, Being::TargetCursorSize size) { - assert(size > -1); - assert(size < 3); + assert(size >= Being::TC_SMALL); + assert(size < Being::NUM_TC); ImageSet* currentImageSet; SimpleAnimation* currentCursor; @@ -226,32 +226,9 @@ Viewport::draw(gcn::Graphics *gcnGraphics) drawTargetName(graphics); } - // Find a path from the player to the mouse, and draw it. This is for debug - // purposes. if (mShowDebugPath && mMap) { - // Get the current mouse position - int mouseX, mouseY; - SDL_GetMouseState(&mouseX, &mouseY); - - int mouseTileX = (mouseX + mCameraX) / 32; - int mouseTileY = (mouseY + mCameraY) / 32; - - Path debugPath = mMap->findPath( - player_node->mX / 32, player_node->mY / 32, - mouseTileX, mouseTileY); - - graphics->setColor(gcn::Color(255, 0, 0)); - for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++) - { - int squareX = i->x * 32 - mCameraX + 12; - int squareY = i->y * 32 - mCameraY + 12; - - graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8)); - graphics->drawText( - toString(mMap->getMetaTile(i->x, i->y)->Gcost), - squareX + 4, squareY + 12, gcn::Graphics::CENTER); - } + drawDebugPath(graphics); } // Draw player nickname, speech, and emotion sprite as needed @@ -286,7 +263,7 @@ Viewport::logic() mWalkTime = player_node->mWalkTime; } - for (int i = 0; i < 3; i++) + for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) { mTargetCursorInRange[i]->update(10); mTargetCursorOutRange[i]->update(10); @@ -347,6 +324,33 @@ Viewport::drawTargetName(Graphics *graphics) } void +Viewport::drawDebugPath(Graphics *graphics) +{ + // Get the current mouse position + int mouseX, mouseY; + SDL_GetMouseState(&mouseX, &mouseY); + + int mouseTileX = (mouseX + mCameraX) / 32; + int mouseTileY = (mouseY + mCameraY) / 32; + + Path debugPath = mMap->findPath( + player_node->mX / 32, player_node->mY / 32, + mouseTileX, mouseTileY); + + graphics->setColor(gcn::Color(255, 0, 0)); + for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++) + { + int squareX = i->x * 32 - mCameraX + 12; + int squareY = i->y * 32 - mCameraY + 12; + + graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8)); + graphics->drawText( + toString(mMap->getMetaTile(i->x, i->y)->Gcost), + squareX + 4, squareY + 12, gcn::Graphics::CENTER); + } +} + +void Viewport::mousePressed(gcn::MouseEvent &event) { // Check if we are alive and kickin' diff --git a/src/gui/viewport.h b/src/gui/viewport.h index eeb31bae..1547c0a4 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -132,21 +132,24 @@ class Viewport : public WindowContainer, public gcn::MouseListener, /** * Helper function for loading target cursors */ - void - loadTargetCursor(std::string filename, int width, int height, - bool outRange, Being::TargetCursorSize size); + void loadTargetCursor(std::string filename, int width, int height, + bool outRange, Being::TargetCursorSize size); /** * Draws range based target cursor */ - void - drawTargetCursor(Graphics *graphics); + void drawTargetCursor(Graphics *graphics); /** * Draws target name */ - void - drawTargetName(Graphics *graphics); + void drawTargetName(Graphics *graphics); + + /** + * Finds a path from the player to the mouse, and draws it. This is for + * debug purposes. + */ + void drawDebugPath(Graphics *graphics); Map *mMap; /**< The current map. */ |