From 261ff1fa32cb75254d68d214f13f8a5aaec33962 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 5 Feb 2012 17:30:36 +0300 Subject: Move language functions to langs.cpp and langs.h files. --- manaplus.cbp | 2 + src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/gui/didyouknowwindow.cpp | 3 +- src/gui/gui.cpp | 2 + src/gui/helpwindow.cpp | 1 + src/gui/serverdialog.cpp | 2 +- src/net/tmwa/npchandler.cpp | 2 + src/utils/langs.cpp | 87 ++++++++++++++++++++++++++++++++++++++++++++ src/utils/langs.h | 38 +++++++++++++++++++ src/utils/stringutils.cpp | 56 ---------------------------- src/utils/stringutils.h | 6 --- 12 files changed, 139 insertions(+), 64 deletions(-) create mode 100644 src/utils/langs.cpp create mode 100644 src/utils/langs.h diff --git a/manaplus.cbp b/manaplus.cbp index e44f3718d..ba3367806 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -664,6 +664,8 @@ + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 955795a14..a52ce41da 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -451,6 +451,8 @@ SET(SRCS utils/copynpaste.h utils/dtor.h utils/gettext.h + utils/langs.cpp + utils/langs.h utils/mathutils.h utils/paths.cpp utils/paths.h diff --git a/src/Makefile.am b/src/Makefile.am index 0e76af87c..c5fdaeac1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -456,6 +456,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/copynpaste.h \ utils/dtor.h \ utils/gettext.h \ + utils/langs.cpp \ + utils/langs.h \ utils/mathutils.h \ utils/mkdir.cpp \ utils/mkdir.h \ diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index db0878360..a6b89923e 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -22,6 +22,7 @@ #include "gui/didyouknowwindow.h" +#include "configuration.h" #include "logger.h" #include "gui/gui.h" @@ -34,9 +35,9 @@ #include "gui/widgets/scrollarea.h" #include "resources/resourcemanager.h" -#include "configuration.h" #include "utils/gettext.h" +#include "utils/langs.h" #include "debug.h" diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 1d8b45872..f8d68a672 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -42,6 +42,8 @@ #include "resources/imageloader.h" #include "resources/resourcemanager.h" +#include "utils/langs.h" + #include #include diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index a099c7a7a..5876667da 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -36,6 +36,7 @@ #include "configuration.h" #include "utils/gettext.h" +#include "utils/langs.h" #include "debug.h" diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 59bdf9660..c50c2b802 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -46,9 +46,9 @@ #include "net/net.h" #include "utils/gettext.h" +#include "utils/langs.h" #include "utils/stringutils.h" #include "utils/xml.h" -#include "widgets/dropdown.h" #include diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index d86c64a96..837b83337 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -35,6 +35,8 @@ #include "net/ea/eaprotocol.h" +#include "utils/langs.h" + #include "debug.h" extern Net::NpcHandler *npcHandler; diff --git a/src/utils/langs.cpp b/src/utils/langs.cpp new file mode 100644 index 000000000..2efbd781a --- /dev/null +++ b/src/utils/langs.cpp @@ -0,0 +1,87 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#include "utils/langs.h" + +#include "configuration.h" + +#include +#include +#include +#include +#include + +#include "debug.h" + +std::vector getLang() +{ + std::vector langs; + + std::string lang = config.getValue("lang", "").c_str(); + if (lang.empty()) + { + char *lng = getenv("LANG"); + if (!lng) + return langs; + lang = lng; + } + + int dot = lang.find("."); + if (dot != (signed)std::string::npos) + lang = lang.substr(0, dot); + langs.push_back(lang); + dot = lang.find("_"); + if (dot != (signed)std::string::npos) + langs.push_back(lang.substr(0, dot)); + return langs; +} + +std::string getLangSimple() +{ + std::string lang = config.getValue("lang", "").c_str(); + if (lang.empty()) + { + char *lng = getenv("LANG"); + if (!lng) + return ""; + return lng; + } + return lang; +} + +std::string getLangShort() +{ + std::string lang = config.getValue("lang", "").c_str(); + if (lang.empty()) + { + char *lng = getenv("LANG"); + if (!lng) + return ""; + lang = lng; + } + + int dot = lang.find("."); + if (dot != (signed)std::string::npos) + lang = lang.substr(0, dot); + dot = lang.find("_"); + if (dot != (signed)std::string::npos) + return lang.substr(0, dot); + return lang; +} diff --git a/src/utils/langs.h b/src/utils/langs.h new file mode 100644 index 000000000..c3f2f1398 --- /dev/null +++ b/src/utils/langs.h @@ -0,0 +1,38 @@ +/* + * The ManaPlus Client + * Copyright (C) 2007-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#ifndef UTILS_LANGS_H +#define UTILS_LANGS_H + +#include +#include +#include +#include +#include + +std::vector getLang(); + +std::string getLangSimple(); + +std::string getLangShort(); + +#endif // UTILS_LANGS_H diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 08bcac9e6..b07a4e367 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -486,62 +486,6 @@ std::string combineDye2(std::string file, std::string dye) } } -std::vector getLang() -{ - std::vector langs; - - std::string lang = config.getValue("lang", "").c_str(); - if (lang.empty()) - { - char *lng = getenv("LANG"); - if (!lng) - return langs; - lang = lng; - } - - int dot = lang.find("."); - if (dot != (signed)std::string::npos) - lang = lang.substr(0, dot); - langs.push_back(lang); - dot = lang.find("_"); - if (dot != (signed)std::string::npos) - langs.push_back(lang.substr(0, dot)); - return langs; -} - -std::string getLangSimple() -{ - std::string lang = config.getValue("lang", "").c_str(); - if (lang.empty()) - { - char *lng = getenv("LANG"); - if (!lng) - return ""; - return lng; - } - return lang; -} - -std::string getLangShort() -{ - std::string lang = config.getValue("lang", "").c_str(); - if (lang.empty()) - { - char *lng = getenv("LANG"); - if (!lng) - return ""; - lang = lng; - } - - int dot = lang.find("."); - if (dot != (signed)std::string::npos) - lang = lang.substr(0, dot); - dot = lang.find("_"); - if (dot != (signed)std::string::npos) - return lang.substr(0, dot); - return lang; -} - std::string packList(std::list &list) { std::list::const_iterator i = list.begin(); diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 0b22ef847..a685a9b17 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -186,12 +186,6 @@ std::string combineDye(std::string file, std::string dye); std::string combineDye2(std::string file, std::string dye); -std::vector getLang(); - -std::string getLangSimple(); - -std::string getLangShort(); - std::string packList(std::list &list); std::list unpackList(const std::string &str); -- cgit v1.2.3-70-g09d2 From 8db4a7da23c36718152ca29cfb067bcfc759a92f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 5 Feb 2012 17:38:54 +0300 Subject: Move path functions from stringutils to paths. --- src/gui/logindialog.cpp | 1 + src/gui/updaterwindow.cpp | 1 + src/main.cpp | 1 + src/net/ea/loginhandler.cpp | 1 + src/utils/paths.cpp | 10 ++++++++++ src/utils/paths.h | 2 ++ src/utils/stringutils.cpp | 10 ---------- src/utils/stringutils.h | 2 -- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index ef8fd6bf0..cafc4f72c 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -41,6 +41,7 @@ #include "net/net.h" #include "utils/gettext.h" +#include "utils/paths.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 28bd8467c..3aaf93557 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -42,6 +42,7 @@ #include "resources/resourcemanager.h" #include "utils/gettext.h" +#include "utils/paths.h" #include "utils/stringutils.h" #include "utils/xml.h" diff --git a/src/main.cpp b/src/main.cpp index 5025d6d29..dc87ca9e0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,6 +31,7 @@ #include #include +#include "utils/paths.h" #include "utils/stringutils.h" #include "utils/xml.h" diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 291a92906..39a920f03 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -28,6 +28,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" +#include "utils/paths.h" #include "debug.h" diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index 8decb6e95..faa1882e6 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -55,3 +55,13 @@ bool isRealPath(const std::string &str) std::string path = getRealPath(str); return str == path; } + +bool checkPath(std::string path) +{ + if (path.empty()) + return true; + return path.find("../") == std::string::npos + && path.find("..\\") == std::string::npos + && path.find("/..") == std::string::npos + && path.find("\\..") == std::string::npos; +} diff --git a/src/utils/paths.h b/src/utils/paths.h index 804900587..f92fcdcb5 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -27,4 +27,6 @@ std::string getRealPath(const std::string &str); bool isRealPath(const std::string &str); +bool checkPath(std::string path); + #endif // UTILS_PATHS_H diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index b07a4e367..16542526f 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -592,13 +592,3 @@ std::string &removeProtocol(std::string &url) url = url.substr(i + 3); return url; } - -bool checkPath(std::string path) -{ - if (path.empty()) - return true; - return path.find("../") == std::string::npos - && path.find("..\\") == std::string::npos - && path.find("/..") == std::string::npos - && path.find("\\..") == std::string::npos; -} diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index a685a9b17..7b512b081 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -204,6 +204,4 @@ bool findCutFirst(std::string &str1, std::string str2); std::string &removeProtocol(std::string &url); -bool checkPath(std::string path); - #endif // UTILS_STRINGUTILS_H -- cgit v1.2.3-70-g09d2 From 101ba08f997bd1912da32abe778cdc3305048380 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 5 Feb 2012 19:42:09 +0300 Subject: Separate map class to map and maplayer. --- manaplus.cbp | 2 + src/CMakeLists.txt | 2 + src/Makefile.am | 4 +- src/gui/popupmenu.cpp | 1 + src/gui/socialwindow.cpp | 1 + src/gui/viewport.cpp | 1 + src/gui/widgets/avatarlistbox.cpp | 1 + src/localplayer.cpp | 1 + src/map.cpp | 788 +----------------------------------- src/map.h | 265 ------------- src/maplayer.cpp | 817 ++++++++++++++++++++++++++++++++++++++ src/maplayer.h | 299 ++++++++++++++ src/resources/mapreader.cpp | 1 + 13 files changed, 1131 insertions(+), 1052 deletions(-) create mode 100644 src/maplayer.cpp create mode 100644 src/maplayer.h diff --git a/manaplus.cbp b/manaplus.cbp index ba3367806..13cb1b513 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -428,6 +428,8 @@ + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a52ce41da..96c1eac67 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -559,6 +559,8 @@ SET(SRCS main.h map.cpp map.h + maplayer.cpp + maplayer.h opengl1graphics.cpp opengl1graphics.h openglgraphics.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c5fdaeac1..e9af09463 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -564,8 +564,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ logger.h \ main.cpp \ main.h \ - map.cpp\ + map.cpp \ map.h \ + maplayer.cpp \ + maplayer.h \ opengl1graphics.cpp\ opengl1graphics.h \ openglgraphics.cpp\ diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 142acc69c..c987843d3 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -35,6 +35,7 @@ #include "localplayer.h" #include "logger.h" #include "map.h" +#include "maplayer.h" #include "party.h" #include "playerinfo.h" #include "playerrelations.h" diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 59ace1685..287089790 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -28,6 +28,7 @@ #include "localplayer.h" #include "logger.h" #include "map.h" +#include "maplayer.h" #include "party.h" #include "playerrelations.h" #include "gui/whoisonline.h" diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 7ff2c8850..2e1e15c92 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -31,6 +31,7 @@ #include "keyboardconfig.h" #include "localplayer.h" #include "map.h" +#include "maplayer.h" #include "textmanager.h" #include "gui/beingpopup.h" diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 1bf897301..2e3472515 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -26,6 +26,7 @@ #include "graphics.h" #include "guild.h" #include "localplayer.h" +#include "maplayer.h" #include "gui/chatwindow.h" #include "gui/gui.h" diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 27897a486..f50e3440c 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -33,6 +33,7 @@ #include "keyboardconfig.h" #include "logger.h" #include "map.h" +#include "maplayer.h" #include "party.h" #include "particle.h" #include "playerinfo.h" diff --git a/src/map.cpp b/src/map.cpp index 488fb16e9..a9aed4531 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -23,11 +23,10 @@ #include "map.h" #include "actorspritemanager.h" -#include "client.h" #include "configuration.h" -#include "graphics.h" -#include "graphicsvertexes.h" + #include "logger.h" +#include "maplayer.h" #include "particle.h" #include "simpleanimation.h" #include "tileset.h" @@ -37,17 +36,11 @@ #include "resources/image.h" #include "resources/resourcemanager.h" -#include "gui/gui.h" -#include "gui/palette.h" -#include "gui/sdlfont.h" - #include "gui/widgets/chattab.h" #include "utils/dtor.h" #include "utils/mkdir.h" -#include "utils/stringutils.h" -#include #include #include @@ -123,485 +116,6 @@ void TileAnimation::update(int ticks) } } -MapLayer::MapLayer(int x, int y, int width, int height, bool fringeLayer): - mX(x), mY(y), - mWidth(width), mHeight(height), - mIsFringeLayer(fringeLayer), - mHighlightAttackRange(config.getBoolValue("highlightAttackRange")) -{ - const int size = mWidth * mHeight; - mTiles = new Image*[size]; - - std::fill_n(mTiles, size, static_cast(nullptr)); - - config.addListener("highlightAttackRange", this); -} - -MapLayer::~MapLayer() -{ - config.removeListener("highlightAttackRange", this); - delete[] mTiles; - delete_all(mTempRows); - mTempRows.clear(); -} - -void MapLayer::optionChanged(const std::string &value) -{ - if (value == "highlightAttackRange") - { - mHighlightAttackRange = - config.getBoolValue("highlightAttackRange"); - } -} - -void MapLayer::setTile(int x, int y, Image *img) -{ - mTiles[x + y * mWidth] = img; -} - -void MapLayer::draw(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY, - int debugFlags) const -{ - if (!player_node) - return; - - startX -= mX; - startY -= mY; - endX -= mX; - endY -= mY; - - if (startX < 0) - startX = 0; - if (startY < 0) - startY = 0; - if (endX > mWidth) - endX = mWidth; - if (endY > mHeight) - endY = mHeight; - - const int dx = (mX * 32) - scrollX; - const int dy = (mY * 32) - scrollY + 32; - const bool flag = (debugFlags != Map::MAP_SPECIAL - && debugFlags != Map::MAP_SPECIAL2); - - for (int y = startY; y < endY; y++) - { - const int y32 = y * 32; - const int yWidth = y * mWidth; - - const int py0 = y32 + dy; - - Image **tilePtr = mTiles + startX + yWidth; - - for (int x = startX; x < endX; x++, tilePtr++) - { - const int x32 = x * 32; - - int c = 0; - Image *img = *tilePtr; - if (img) - { - const int px = x32 + dx; - const int py = py0 - img->mBounds.h; - if (flag || img->mBounds.h <= 32) - { - int width = 0; - // here need not draw over player position - c = getTileDrawWidth(img, endX - x, width); - - if (!c) - { - graphics->drawImage(img, px, py); - } - else - { - graphics->drawImagePattern(img, px, py, - width, img->mBounds.h); - } - } - } - - x += c; - } - } -} - -void MapLayer::updateSDL(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY, - int debugFlags) -{ - delete_all(mTempRows); - mTempRows.clear(); - - startX -= mX; - startY -= mY; - endX -= mX; - endY -= mY; - - if (startX < 0) - startX = 0; - if (startY < 0) - startY = 0; - if (endX > mWidth) - endX = mWidth; - if (endY > mHeight) - endY = mHeight; - - const int dx = (mX * 32) - scrollX; - const int dy = (mY * 32) - scrollY + 32; - const bool flag = (debugFlags != Map::MAP_SPECIAL - && debugFlags != Map::MAP_SPECIAL2); - - for (int y = startY; y < endY; y++) - { - MapRowVertexes *row = new MapRowVertexes(); - mTempRows.push_back(row); - - Image *lastImage = nullptr; - ImageVertexes *imgVert = nullptr; - - const int yWidth = y * mWidth; - const int py0 = y * 32 + dy; - Image **tilePtr = mTiles + startX + yWidth; - - for (int x = startX; x < endX; x++, tilePtr++) - { - Image *img = *tilePtr; - if (img) - { - const int px = x * 32 + dx; - const int py = py0 - img->mBounds.h; - if (flag || img->mBounds.h <= 32) - { - if (lastImage != img) - { - imgVert = new ImageVertexes(); - imgVert->image = img; - row->images.push_back(imgVert); - lastImage = img; - } - graphics->calcTile(imgVert, px, py); - } - } - } - } -} - -void MapLayer::drawSDL(Graphics *graphics) -{ - MapRows::const_iterator rit = mTempRows.begin(); - MapRows::const_iterator rit_end = mTempRows.end(); - while (rit != rit_end) - { - MepRowImages *images = &(*rit)->images; - MepRowImages::const_iterator iit = images->begin(); - MepRowImages::const_iterator iit_end = images->end(); - while (iit != iit_end) - { - graphics->drawTile(*iit); - ++ iit; - } - ++ rit; - } -} - -void MapLayer::updateOGL(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY, - int debugFlags) -{ - delete_all(mTempRows); - mTempRows.clear(); - - startX -= mX; - startY -= mY; - endX -= mX; - endY -= mY; - - if (startX < 0) - startX = 0; - if (startY < 0) - startY = 0; - if (endX > mWidth) - endX = mWidth; - if (endY > mHeight) - endY = mHeight; - - const int dx = (mX * 32) - scrollX; - const int dy = (mY * 32) - scrollY + 32; - const bool flag = (debugFlags != Map::MAP_SPECIAL - && debugFlags != Map::MAP_SPECIAL2); - - for (int y = startY; y < endY; y++) - { - MapRowVertexes *row = new MapRowVertexes(); - mTempRows.push_back(row); - - Image *lastImage = nullptr; - ImageVertexes *imgVert = nullptr; - - const int yWidth = y * mWidth; - const int py0 = y * 32 + dy; - std::map imgSet; - - Image **tilePtr = mTiles + startX + yWidth; - for (int x = startX; x < endX; x++, tilePtr++) - { - Image *img = *tilePtr; - if (img) - { - const int px = x * 32 + dx; - const int py = py0 - img->mBounds.h; - if (flag || img->mBounds.h <= 32) - { - if (lastImage != img) - { - if (img->mBounds.w > 32) - imgSet.clear(); - - imgSet[lastImage] = imgVert; - if (imgSet.find(img) != imgSet.end()) - { - imgVert = imgSet[img]; - } - else - { - imgVert = new ImageVertexes(); - imgVert->image = img; - row->images.push_back(imgVert); - } - lastImage = img; - } - graphics->calcTile(imgVert, px, py); - } - } - } - } -} - -void MapLayer::drawOGL(Graphics *graphics) -{ - MapRows::const_iterator rit = mTempRows.begin(); - MapRows::const_iterator rit_end = mTempRows.end(); - while (rit != rit_end) - { - MepRowImages *images = &(*rit)->images; - MepRowImages::const_iterator iit = images->begin(); - MepRowImages::const_iterator iit_end = images->end(); - while (iit != iit_end) - { - graphics->drawTile(*iit); - ++ iit; - } - ++ rit; - } -} - -void MapLayer::drawFringe(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY, - const Actors *actors, int debugFlags, int yFix) const -{ - if (!player_node || !mSpecialLayer || !mTempLayer) - return; - - startX -= mX; - startY -= mY; - endX -= mX; - endY -= mY; - - if (startX < 0) - startX = 0; - if (startY < 0) - startY = 0; - if (endX > mWidth) - endX = mWidth; - if (endY > mHeight) - endY = mHeight; - - Actors::const_iterator ai = actors->begin(); - - const int dx = (mX * 32) - scrollX; - const int dy = (mY * 32) - scrollY + 32; - - int specialWidth = mSpecialLayer->mWidth; - int specialHeight = mSpecialLayer->mHeight; - - for (int y = startY; y < endY; y++) - { - const int y32 = y * 32; - const int y32s = (y + yFix) * 32; - const int yWidth = y * mWidth; - - // If drawing the fringe layer, make sure all actors above this row of - // tiles have been drawn - while (ai != actors->end() && (*ai)->getPixelY() <= y32s) - { - (*ai)->draw(graphics, -scrollX, -scrollY); - ++ ai; - } - - if (debugFlags == Map::MAP_SPECIAL3 - || debugFlags == Map::MAP_BLACKWHITE) - { - if (y < specialHeight) - { - int ptr = y * specialWidth; - const int py1 = y32 - scrollY; - int endX1 = endX; - if (endX1 > specialWidth) - endX1 = specialWidth; - if (endX1 < 0) - endX1 = 0; - - for (int x = startX; x < endX1; x++) - { - const int px1 = x * 32 - scrollX; - - MapItem *item = mSpecialLayer->mTiles[ptr + x]; - if (item) - item->draw(graphics, px1, py1, 32, 32); - - item = mTempLayer->mTiles[ptr + x]; - if (item) - item->draw(graphics, px1, py1, 32, 32); - } - } - } - else - { - const int py0 = y32 + dy; - const int py1 = y32 - scrollY; - - Image **tilePtr = mTiles + startX + yWidth; - for (int x = startX; x < endX; x++, tilePtr++) - { - const int x32 = x * 32; - - const int px1 = x32 - scrollX; - int c = 0; - Image *img = *tilePtr; - if (img) - { - const int px = x32 + dx; - const int py = py0 - img->mBounds.h; - if ((debugFlags != Map::MAP_SPECIAL - && debugFlags != Map::MAP_SPECIAL2) - || img->mBounds.h <= 32) - { - int width = 0; - // here need not draw over player position - c = getTileDrawWidth(img, endX - x, width); - - if (!c) - { - graphics->drawImage(img, px, py); - } - else - { - graphics->drawImagePattern(img, px, py, - width, img->mBounds.h); - } - } - } - - if (y < specialHeight) - { - int c1 = c; - if (c1 + x + 1 > specialWidth) - c1 = specialWidth - x - 1; - if (c1 < 0) - c1 = 0; - - int ptr = y * specialWidth + x; - - for (int x1 = 0; x1 < c1 + 1; x1 ++) - { - MapItem *item1 = mSpecialLayer->mTiles[ptr + x1]; - MapItem *item2 = mTempLayer->mTiles[ptr + x1]; - if (item1 || item2) - { - const int px2 = px1 + (x1 * 32); - if (item1 && item1->mType != MapItem::EMPTY) - item1->draw(graphics, px2, py1, 32, 32); - - if (item2 && item2->mType != MapItem::EMPTY) - item2->draw(graphics, px2, py1, 32, 32); - } - } - } - x += c; - } - } - } - - // Draw any remaining actors - if (debugFlags != Map::MAP_SPECIAL3) - { - while (ai != actors->end()) - { - (*ai)->draw(graphics, -scrollX, -scrollY); - ++ai; - } - if (mHighlightAttackRange && player_node) - { - const int px = player_node->getPixelX() - scrollX - 16; - const int py = player_node->getPixelY() - scrollY - 32; - const int attackRange = player_node->getAttackRange() * 32; - - int x = px - attackRange; - int y = py - attackRange; - int w = 2 * attackRange + 32; - int h = w; - if (attackRange <= 32) - { - x -= 16; - y -= 16; - w += 32; - h += 32; - } - - if (userPalette) - { - graphics->setColor(userPalette->getColorWithAlpha( - UserPalette::ATTACK_RANGE)); - - graphics->fillRectangle(gcn::Rectangle( - x, y, - w, h)); - - graphics->setColor(userPalette->getColorWithAlpha( - UserPalette::ATTACK_RANGE_BORDER)); - - graphics->drawRectangle(gcn::Rectangle( - x, y, - w, h)); - } - } - } -} - -int MapLayer::getTileDrawWidth(Image *img, int endX, int &width) const -{ - Image *img1 = img; - int c = 0; - if (!img1) - { - width = 0; - return c; - } - width = img1->mBounds.w; - for (int x = 1; x < endX; x++) - { - img ++; - if (img != img1) - break; - c ++; - if (img) - width += img->mBounds.w; - } - return c; -} - Map::Map(int width, int height, int tileWidth, int tileHeight): mWidth(width), mHeight(height), mTileWidth(tileWidth), mTileHeight(tileHeight), @@ -2055,301 +1569,3 @@ void Map::redrawMap() { mRedrawMap = true; } - -SpecialLayer::SpecialLayer(int width, int height, bool drawSprites): - mWidth(width), mHeight(height) -{ - const int size = mWidth * mHeight; - mTiles = new MapItem*[size]; - std::fill_n(mTiles, size, static_cast(nullptr)); - mDrawSprites = drawSprites; -} - -SpecialLayer::~SpecialLayer() -{ - for (int f = 0; f < mWidth * mHeight; f ++) - { - delete mTiles[f]; - mTiles[f] = nullptr; - } - delete[] mTiles; -} - -MapItem* SpecialLayer::getTile(int x, int y) const -{ - if (x < 0 || x >= mWidth || - y < 0 || y >= mHeight) - { - return nullptr; - } - return mTiles[x + y * mWidth]; -} - -void SpecialLayer::setTile(int x, int y, MapItem *item) -{ - if (x < 0 || x >= mWidth || - y < 0 || y >= mHeight) - { - return; - } - - int idx = x + y * mWidth; - delete mTiles[idx]; - if (item) - item->setPos(x, y); - mTiles[idx] = item; -} - -void SpecialLayer::setTile(int x, int y, int type) -{ - if (x < 0 || x >= mWidth || - y < 0 || y >= mHeight) - { - return; - } - - int idx = x + y * mWidth; - if (mTiles[idx]) - mTiles[idx]->setType(type); - else - mTiles[idx] = new MapItem(type); - mTiles[idx]->setPos(x, y); -} - -void SpecialLayer::addRoad(Path road) -{ - for (Path::const_iterator i = road.begin(), i_end = road.end(); - i != i_end; ++i) - { - Position pos = (*i); - MapItem *item = getTile(pos.x, pos.y); - if (!item) - { - item = new MapItem(MapItem::ROAD); - setTile(pos.x, pos.y, item); - } - else - { - item->setType(MapItem::ROAD); - } - } -} - -void SpecialLayer::clean() -{ - if (!mTiles) - return; - - for (int f = 0; f < mWidth * mHeight; f ++) - { - MapItem *item = mTiles[f]; - if (item) - item->setType(MapItem::EMPTY); - } -} - -void SpecialLayer::draw(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY) -{ - if (startX < 0) - startX = 0; - if (startY < 0) - startY = 0; - if (endX > mWidth) - endX = mWidth; - if (endY > mHeight) - endY = mHeight; - - for (int y = startY; y < endY; y++) - { - for (int x = startX; x < endX; x++) - itemDraw(graphics, x, y, scrollX, scrollY); - } -} - -void SpecialLayer::itemDraw(Graphics *graphics, int x, int y, - int scrollX, int scrollY) -{ - MapItem *item = getTile(x, y); - if (item) - { - const int px = x * 32 - scrollX; - const int py = y * 32 - scrollY; - item->draw(graphics, px, py, 32, 32); - } -} - - -MapItem::MapItem(): - mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1) -{ - setType(EMPTY); -} - -MapItem::MapItem(int type): - mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1) -{ - setType(type); -} - -MapItem::MapItem(int type, std::string comment): - mImage(nullptr), mComment(comment), mName(""), mX(-1), mY(-1) -{ - setType(type); -} - -MapItem::MapItem(int type, std::string comment, int x, int y): - mImage(nullptr), mComment(comment), mName(""), mX(x), mY(y) -{ - setType(type); -} - -MapItem::~MapItem() -{ - if (mImage) - { - mImage->decRef(); - mImage = nullptr; - } -} - -void MapItem::setType(int type) -{ - std::string name(""); - mType = type; - if (mImage) - mImage->decRef(); - - switch (type) - { - case ARROW_UP: - name = "graphics/sprites/arrow_up.gif"; - break; - case ARROW_DOWN: - name = "graphics/sprites/arrow_down.gif"; - break; - case ARROW_LEFT: - name = "graphics/sprites/arrow_left.gif"; - break; - case ARROW_RIGHT: - name = "graphics/sprites/arrow_right.gif"; - break; - default: - break; - } - - if (name != "") - { - ResourceManager *resman = ResourceManager::getInstance(); - mImage = resman->getImage(name); - } - else - { - mImage = nullptr; - } -} - -void MapItem::setPos(int x, int y) -{ - mX = x; - mY = y; -} - -void MapItem::draw(Graphics *graphics, int x, int y, int dx, int dy) -{ - if (mImage) - graphics->drawImage(mImage, x, y); - - switch(mType) - { - case ROAD: - case CROSS: - graphics->setColor(userPalette->getColorWithAlpha( - UserPalette::ROAD_POINT)); - graphics->fillRectangle(gcn::Rectangle(x + dx / 3, y + dy / 3, - dx / 3, dy / 3)); - break; - case HOME: - { - graphics->setColor(userPalette->getColorWithAlpha( - UserPalette::HOME_PLACE)); - graphics->fillRectangle(gcn::Rectangle( - x, y, - dx, dy)); - graphics->setColor(userPalette->getColorWithAlpha( - UserPalette::HOME_PLACE_BORDER)); - graphics->drawRectangle(gcn::Rectangle( - x, y, - dx, dy)); - break; - } - default: - break; - } - if (!mName.empty() && mType != PORTAL && mType != EMPTY && userPalette) - { - gcn::Font *font = gui->getFont(); - if (font) - { - graphics->setColor(userPalette->getColor(UserPalette::BEING)); - font->drawString(graphics, mName, x, y); - } - } -} - -ObjectsLayer::ObjectsLayer(unsigned width, unsigned height) : - mWidth(width), mHeight(height) -{ - const unsigned size = width * height; - mTiles = new MapObjectList*[size]; - std::fill_n(mTiles, size, static_cast(nullptr)); -} - -ObjectsLayer::~ObjectsLayer() -{ - const unsigned size = mWidth * mHeight; - for (unsigned f = 0; f < size; f ++) - delete mTiles[f]; - - delete [] mTiles; - mTiles = nullptr; -} - -void ObjectsLayer::addObject(std::string name, int type, - unsigned x, unsigned y, - unsigned dx, unsigned dy) -{ - if (!mTiles) - return; - - if (x + dx > mWidth) - dx = mWidth - x; - if (y + dy > mHeight) - dy = mHeight - y; - - for (unsigned y1 = y; y1 < y + dy; y1 ++) - { - unsigned idx1 = x + y1 * mWidth; - unsigned idx2 = idx1 + dx; - - for (unsigned i = idx1; i < idx2; i ++) - { - if (!mTiles[i]) - mTiles[i] = new MapObjectList(); - mTiles[i]->objects.push_back(MapObject(type, name)); - } - } -} - -MapObjectList *ObjectsLayer::getAt(unsigned x, unsigned y) -{ - if (x >= mWidth || y >= mHeight) - return nullptr; - return mTiles[x + y * mWidth]; -} - -MapRowVertexes::~MapRowVertexes() -{ - delete_all(images); - images.clear(); -} diff --git a/src/map.h b/src/map.h index e157628cc..5b79ec8f5 100644 --- a/src/map.h +++ b/src/map.h @@ -28,14 +28,11 @@ #include "position.h" #include "properties.h" -#include #include #include class Animation; class AmbientLayer; -class Graphics; -class GraphicsVertexes; class MapLayer; class Particle; class SimpleAnimation; @@ -44,24 +41,8 @@ class SpecialLayer; class MapItem; class ObjectsLayer; -class ImageVertexes; - typedef std::vector Tilesets; typedef std::vector Layers; -typedef std::vector MepRowImages; - -class MapRowVertexes -{ - public: - MapRowVertexes() - { - images.reserve(30); - } - - ~MapRowVertexes(); - - MepRowImages images; -}; /** * A meta tile stores additional information about a location on a tile map. @@ -87,25 +68,6 @@ struct MetaTile unsigned char blockmask; /**< Blocking properties of this tile */ }; -class MapObject -{ - public: - MapObject(int type0, std::string data0) - { - type = type0; - data = data0; - } - - int type; - std::string data; -}; - -class MapObjectList -{ - public: - std::vector objects; -}; - /** * Animation cycle of a tile image which changes the map accordingly. */ @@ -123,114 +85,6 @@ class TileAnimation Image *mLastImage; }; -/** - * A map layer. Stores a grid of tiles and their offset, and implements layer - * rendering. - */ -class MapLayer: public ConfigListener -{ - public: - friend class Map; - - /** - * Constructor, taking layer origin, size and whether this layer is the - * fringe layer. The fringe layer is the layer that draws the actors. - * There can be only one fringe layer per map. - */ - MapLayer(int x, int y, int width, int height, bool isFringeLayer); - - /** - * Destructor. - */ - ~MapLayer(); - - /** - * Set tile image, with x and y in layer coordinates. - */ - void setTile(int x, int y, Image *img); - - /** - * Set tile image with x + y * width already known. - */ - void setTile(int index, Image *img) - { mTiles[index] = img; } - - /** - * Draws this layer to the given graphics context. The coordinates are - * expected to be in map range and will be translated to local layer - * coordinates and clipped to the layer's dimensions. - * - * The given actors are only drawn when this layer is the fringe - * layer. - */ - void draw(Graphics *graphics, - int startX, int startY, - int endX, int endY, - int scrollX, int scrollY, - int mDebugFlags) const; - - void drawOGL(Graphics *graphics); - - void drawSDL(Graphics *graphics); - - void updateOGL(Graphics *graphics, - int startX, int startY, - int endX, int endY, - int scrollX, int scrollY, - int mDebugFlags); - - void updateSDL(Graphics *graphics, - int startX, int startY, - int endX, int endY, - int scrollX, int scrollY, - int mDebugFlags); - - void drawFringe(Graphics *graphics, - int startX, int startY, - int endX, int endY, - int scrollX, int scrollY, - const Actors *actors, - int mDebugFlags, int yFix) const; - - bool isFringeLayer() const - { return mIsFringeLayer; } - - void setSpecialLayer(SpecialLayer *val) - { mSpecialLayer = val; } - - void setTempLayer(SpecialLayer *val) - { mTempLayer = val; } - - int getWidth() const - { return mWidth; } - - int getHeight() const - { return mHeight; } - -// void setTileInfo(int x, int y, int width, int cnt); - -// void getTileInfo(int x, int y, int &width, int &cnt) const; - - void optionChanged(const std::string &value); - - int getTileDrawWidth(Image *img, int endX, int &width) const; - -// void initTileInfo(); - - private: - int mX, mY; - int mWidth, mHeight; - bool mIsFringeLayer; /**< Whether the actors are drawn. */ - bool mHighlightAttackRange; - Image **mTiles; -// int *mTilesWidth; -// int *mTilesCount; - SpecialLayer *mSpecialLayer; - SpecialLayer *mTempLayer; - typedef std::vector MapRows; - MapRows mTempRows; -}; - /** * A tile map. */ @@ -614,123 +468,4 @@ class Map : public Properties, public ConfigListener bool mBeingOpacity; }; - -class SpecialLayer -{ - public: - friend class Map; - friend class MapLayer; - - SpecialLayer(int width, int height, bool drawSprites = false); - - ~SpecialLayer(); - - void draw(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY); - - MapItem* getTile(int x, int y) const; - - void setTile(int x, int y, MapItem* item); - - void setTile(int x, int y, int type); - - void addRoad(Path road); - - void clean(); - - void itemDraw(Graphics *graphics, int x, int y, - int scrollX, int scrollY); - - private: - int mWidth, mHeight; - bool mDrawSprites; - MapItem **mTiles; -}; - -class MapItem -{ - public: - friend class Map; - friend class MapLayer; - - enum ItemType - { - EMPTY = 0, - HOME = 1, - ROAD = 2, - CROSS = 3, - ARROW_UP = 4, - ARROW_DOWN = 5, - ARROW_LEFT = 6, - ARROW_RIGHT = 7, - PORTAL = 8, - MUSIC = 9, - ATTACK = 10, - PRIORITY = 11, - IGNORE_ = 12, - SEPARATOR = 13 - }; - - MapItem(); - - MapItem(int type); - - MapItem(int type, std::string comment); - - MapItem(int type, std::string comment, int x, int y); - - ~MapItem(); - - int getType() const - { return mType; } - - void setType(int type); - - void setPos(int x, int y); - - int getX() const - { return mX; } - - int getY() const - { return mY; } - - std::string &getComment() - { return mComment; } - - void setComment(std::string comment) - { mComment = comment; } - - std::string &getName() - { return mName; } - - void setName(std::string name) - { mName = name; } - - void draw(Graphics *graphics, int x, int y, int dx, int dy); - - private: - int mType; - Image *mImage; - std::string mComment; - std::string mName; - int mX; - int mY; -}; - -class ObjectsLayer -{ - public: - ObjectsLayer(unsigned width, unsigned height); - ~ObjectsLayer(); - - void addObject(std::string name, int type, unsigned x, unsigned y, - unsigned dx, unsigned dy); - - MapObjectList *getAt(unsigned x, unsigned y); - private: - MapObjectList **mTiles; - unsigned mWidth; - unsigned mHeight; -}; - #endif diff --git a/src/maplayer.cpp b/src/maplayer.cpp new file mode 100644 index 000000000..3e9c47968 --- /dev/null +++ b/src/maplayer.cpp @@ -0,0 +1,817 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#include "maplayer.h" + +#include "configuration.h" + +#include "graphicsvertexes.h" + +#include "logger.h" +#include "localplayer.h" + +#include "resources/image.h" +#include "resources/resourcemanager.h" + +#include "gui/gui.h" +#include "gui/sdlfont.h" + +#include "utils/dtor.h" + +#include "debug.h" + +MapLayer::MapLayer(int x, int y, int width, int height, bool fringeLayer): + mX(x), mY(y), + mWidth(width), mHeight(height), + mIsFringeLayer(fringeLayer), + mHighlightAttackRange(config.getBoolValue("highlightAttackRange")) +{ + const int size = mWidth * mHeight; + mTiles = new Image*[size]; + + std::fill_n(mTiles, size, static_cast(nullptr)); + + config.addListener("highlightAttackRange", this); +} + +MapLayer::~MapLayer() +{ + config.removeListener("highlightAttackRange", this); + delete[] mTiles; + delete_all(mTempRows); + mTempRows.clear(); +} + +void MapLayer::optionChanged(const std::string &value) +{ + if (value == "highlightAttackRange") + { + mHighlightAttackRange = + config.getBoolValue("highlightAttackRange"); + } +} + +void MapLayer::setTile(int x, int y, Image *img) +{ + mTiles[x + y * mWidth] = img; +} + +void MapLayer::draw(Graphics *graphics, int startX, int startY, + int endX, int endY, int scrollX, int scrollY, + int debugFlags) const +{ + if (!player_node) + return; + + startX -= mX; + startY -= mY; + endX -= mX; + endY -= mY; + + if (startX < 0) + startX = 0; + if (startY < 0) + startY = 0; + if (endX > mWidth) + endX = mWidth; + if (endY > mHeight) + endY = mHeight; + + const int dx = (mX * 32) - scrollX; + const int dy = (mY * 32) - scrollY + 32; + const bool flag = (debugFlags != Map::MAP_SPECIAL + && debugFlags != Map::MAP_SPECIAL2); + + for (int y = startY; y < endY; y++) + { + const int y32 = y * 32; + const int yWidth = y * mWidth; + + const int py0 = y32 + dy; + + Image **tilePtr = mTiles + startX + yWidth; + + for (int x = startX; x < endX; x++, tilePtr++) + { + const int x32 = x * 32; + + int c = 0; + Image *img = *tilePtr; + if (img) + { + const int px = x32 + dx; + const int py = py0 - img->mBounds.h; + if (flag || img->mBounds.h <= 32) + { + int width = 0; + // here need not draw over player position + c = getTileDrawWidth(img, endX - x, width); + + if (!c) + { + graphics->drawImage(img, px, py); + } + else + { + graphics->drawImagePattern(img, px, py, + width, img->mBounds.h); + } + } + } + + x += c; + } + } +} + +void MapLayer::updateSDL(Graphics *graphics, int startX, int startY, + int endX, int endY, int scrollX, int scrollY, + int debugFlags) +{ + delete_all(mTempRows); + mTempRows.clear(); + + startX -= mX; + startY -= mY; + endX -= mX; + endY -= mY; + + if (startX < 0) + startX = 0; + if (startY < 0) + startY = 0; + if (endX > mWidth) + endX = mWidth; + if (endY > mHeight) + endY = mHeight; + + const int dx = (mX * 32) - scrollX; + const int dy = (mY * 32) - scrollY + 32; + const bool flag = (debugFlags != Map::MAP_SPECIAL + && debugFlags != Map::MAP_SPECIAL2); + + for (int y = startY; y < endY; y++) + { + MapRowVertexes *row = new MapRowVertexes(); + mTempRows.push_back(row); + + Image *lastImage = nullptr; + ImageVertexes *imgVert = nullptr; + + const int yWidth = y * mWidth; + const int py0 = y * 32 + dy; + Image **tilePtr = mTiles + startX + yWidth; + + for (int x = startX; x < endX; x++, tilePtr++) + { + Image *img = *tilePtr; + if (img) + { + const int px = x * 32 + dx; + const int py = py0 - img->mBounds.h; + if (flag || img->mBounds.h <= 32) + { + if (lastImage != img) + { + imgVert = new ImageVertexes(); + imgVert->image = img; + row->images.push_back(imgVert); + lastImage = img; + } + graphics->calcTile(imgVert, px, py); + } + } + } + } +} + +void MapLayer::drawSDL(Graphics *graphics) +{ + MapRows::const_iterator rit = mTempRows.begin(); + MapRows::const_iterator rit_end = mTempRows.end(); + while (rit != rit_end) + { + MepRowImages *images = &(*rit)->images; + MepRowImages::const_iterator iit = images->begin(); + MepRowImages::const_iterator iit_end = images->end(); + while (iit != iit_end) + { + graphics->drawTile(*iit); + ++ iit; + } + ++ rit; + } +} + +void MapLayer::updateOGL(Graphics *graphics, int startX, int startY, + int endX, int endY, int scrollX, int scrollY, + int debugFlags) +{ + delete_all(mTempRows); + mTempRows.clear(); + + startX -= mX; + startY -= mY; + endX -= mX; + endY -= mY; + + if (startX < 0) + startX = 0; + if (startY < 0) + startY = 0; + if (endX > mWidth) + endX = mWidth; + if (endY > mHeight) + endY = mHeight; + + const int dx = (mX * 32) - scrollX; + const int dy = (mY * 32) - scrollY + 32; + const bool flag = (debugFlags != Map::MAP_SPECIAL + && debugFlags != Map::MAP_SPECIAL2); + + for (int y = startY; y < endY; y++) + { + MapRowVertexes *row = new MapRowVertexes(); + mTempRows.push_back(row); + + Image *lastImage = nullptr; + ImageVertexes *imgVert = nullptr; + + const int yWidth = y * mWidth; + const int py0 = y * 32 + dy; + std::map imgSet; + + Image **tilePtr = mTiles + startX + yWidth; + for (int x = startX; x < endX; x++, tilePtr++) + { + Image *img = *tilePtr; + if (img) + { + const int px = x * 32 + dx; + const int py = py0 - img->mBounds.h; + if (flag || img->mBounds.h <= 32) + { + if (lastImage != img) + { + if (img->mBounds.w > 32) + imgSet.clear(); + + imgSet[lastImage] = imgVert; + if (imgSet.find(img) != imgSet.end()) + { + imgVert = imgSet[img]; + } + else + { + imgVert = new ImageVertexes(); + imgVert->image = img; + row->images.push_back(imgVert); + } + lastImage = img; + } + graphics->calcTile(imgVert, px, py); + } + } + } + } +} + +void MapLayer::drawOGL(Graphics *graphics) +{ + MapRows::const_iterator rit = mTempRows.begin(); + MapRows::const_iterator rit_end = mTempRows.end(); + while (rit != rit_end) + { + MepRowImages *images = &(*rit)->images; + MepRowImages::const_iterator iit = images->begin(); + MepRowImages::const_iterator iit_end = images->end(); + while (iit != iit_end) + { + graphics->drawTile(*iit); + ++ iit; + } + ++ rit; + } +} + +void MapLayer::drawFringe(Graphics *graphics, int startX, int startY, + int endX, int endY, int scrollX, int scrollY, + const Actors *actors, int debugFlags, int yFix) const +{ + if (!player_node || !mSpecialLayer || !mTempLayer) + return; + + startX -= mX; + startY -= mY; + endX -= mX; + endY -= mY; + + if (startX < 0) + startX = 0; + if (startY < 0) + startY = 0; + if (endX > mWidth) + endX = mWidth; + if (endY > mHeight) + endY = mHeight; + + Actors::const_iterator ai = actors->begin(); + + const int dx = (mX * 32) - scrollX; + const int dy = (mY * 32) - scrollY + 32; + + int specialWidth = mSpecialLayer->mWidth; + int specialHeight = mSpecialLayer->mHeight; + + for (int y = startY; y < endY; y++) + { + const int y32 = y * 32; + const int y32s = (y + yFix) * 32; + const int yWidth = y * mWidth; + + // If drawing the fringe layer, make sure all actors above this row of + // tiles have been drawn + while (ai != actors->end() && (*ai)->getPixelY() <= y32s) + { + (*ai)->draw(graphics, -scrollX, -scrollY); + ++ ai; + } + + if (debugFlags == Map::MAP_SPECIAL3 + || debugFlags == Map::MAP_BLACKWHITE) + { + if (y < specialHeight) + { + int ptr = y * specialWidth; + const int py1 = y32 - scrollY; + int endX1 = endX; + if (endX1 > specialWidth) + endX1 = specialWidth; + if (endX1 < 0) + endX1 = 0; + + for (int x = startX; x < endX1; x++) + { + const int px1 = x * 32 - scrollX; + + MapItem *item = mSpecialLayer->mTiles[ptr + x]; + if (item) + item->draw(graphics, px1, py1, 32, 32); + + item = mTempLayer->mTiles[ptr + x]; + if (item) + item->draw(graphics, px1, py1, 32, 32); + } + } + } + else + { + const int py0 = y32 + dy; + const int py1 = y32 - scrollY; + + Image **tilePtr = mTiles + startX + yWidth; + for (int x = startX; x < endX; x++, tilePtr++) + { + const int x32 = x * 32; + + const int px1 = x32 - scrollX; + int c = 0; + Image *img = *tilePtr; + if (img) + { + const int px = x32 + dx; + const int py = py0 - img->mBounds.h; + if ((debugFlags != Map::MAP_SPECIAL + && debugFlags != Map::MAP_SPECIAL2) + || img->mBounds.h <= 32) + { + int width = 0; + // here need not draw over player position + c = getTileDrawWidth(img, endX - x, width); + + if (!c) + { + graphics->drawImage(img, px, py); + } + else + { + graphics->drawImagePattern(img, px, py, + width, img->mBounds.h); + } + } + } + + if (y < specialHeight) + { + int c1 = c; + if (c1 + x + 1 > specialWidth) + c1 = specialWidth - x - 1; + if (c1 < 0) + c1 = 0; + + int ptr = y * specialWidth + x; + + for (int x1 = 0; x1 < c1 + 1; x1 ++) + { + MapItem *item1 = mSpecialLayer->mTiles[ptr + x1]; + MapItem *item2 = mTempLayer->mTiles[ptr + x1]; + if (item1 || item2) + { + const int px2 = px1 + (x1 * 32); + if (item1 && item1->mType != MapItem::EMPTY) + item1->draw(graphics, px2, py1, 32, 32); + + if (item2 && item2->mType != MapItem::EMPTY) + item2->draw(graphics, px2, py1, 32, 32); + } + } + } + x += c; + } + } + } + + // Draw any remaining actors + if (debugFlags != Map::MAP_SPECIAL3) + { + while (ai != actors->end()) + { + (*ai)->draw(graphics, -scrollX, -scrollY); + ++ai; + } + if (mHighlightAttackRange && player_node) + { + const int px = player_node->getPixelX() - scrollX - 16; + const int py = player_node->getPixelY() - scrollY - 32; + const int attackRange = player_node->getAttackRange() * 32; + + int x = px - attackRange; + int y = py - attackRange; + int w = 2 * attackRange + 32; + int h = w; + if (attackRange <= 32) + { + x -= 16; + y -= 16; + w += 32; + h += 32; + } + + if (userPalette) + { + graphics->setColor(userPalette->getColorWithAlpha( + UserPalette::ATTACK_RANGE)); + + graphics->fillRectangle(gcn::Rectangle( + x, y, + w, h)); + + graphics->setColor(userPalette->getColorWithAlpha( + UserPalette::ATTACK_RANGE_BORDER)); + + graphics->drawRectangle(gcn::Rectangle( + x, y, + w, h)); + } + } + } +} + +int MapLayer::getTileDrawWidth(Image *img, int endX, int &width) const +{ + Image *img1 = img; + int c = 0; + if (!img1) + { + width = 0; + return c; + } + width = img1->mBounds.w; + for (int x = 1; x < endX; x++) + { + img ++; + if (img != img1) + break; + c ++; + if (img) + width += img->mBounds.w; + } + return c; +} + +SpecialLayer::SpecialLayer(int width, int height, bool drawSprites): + mWidth(width), mHeight(height) +{ + const int size = mWidth * mHeight; + mTiles = new MapItem*[size]; + std::fill_n(mTiles, size, static_cast(nullptr)); + mDrawSprites = drawSprites; +} + +SpecialLayer::~SpecialLayer() +{ + for (int f = 0; f < mWidth * mHeight; f ++) + { + delete mTiles[f]; + mTiles[f] = nullptr; + } + delete[] mTiles; +} + +MapItem* SpecialLayer::getTile(int x, int y) const +{ + if (x < 0 || x >= mWidth || + y < 0 || y >= mHeight) + { + return nullptr; + } + return mTiles[x + y * mWidth]; +} + +void SpecialLayer::setTile(int x, int y, MapItem *item) +{ + if (x < 0 || x >= mWidth || + y < 0 || y >= mHeight) + { + return; + } + + int idx = x + y * mWidth; + delete mTiles[idx]; + if (item) + item->setPos(x, y); + mTiles[idx] = item; +} + +void SpecialLayer::setTile(int x, int y, int type) +{ + if (x < 0 || x >= mWidth || + y < 0 || y >= mHeight) + { + return; + } + + int idx = x + y * mWidth; + if (mTiles[idx]) + mTiles[idx]->setType(type); + else + mTiles[idx] = new MapItem(type); + mTiles[idx]->setPos(x, y); +} + +void SpecialLayer::addRoad(Path road) +{ + for (Path::const_iterator i = road.begin(), i_end = road.end(); + i != i_end; ++i) + { + Position pos = (*i); + MapItem *item = getTile(pos.x, pos.y); + if (!item) + { + item = new MapItem(MapItem::ROAD); + setTile(pos.x, pos.y, item); + } + else + { + item->setType(MapItem::ROAD); + } + } +} + +void SpecialLayer::clean() +{ + if (!mTiles) + return; + + for (int f = 0; f < mWidth * mHeight; f ++) + { + MapItem *item = mTiles[f]; + if (item) + item->setType(MapItem::EMPTY); + } +} + +void SpecialLayer::draw(Graphics *graphics, int startX, int startY, + int endX, int endY, int scrollX, int scrollY) +{ + if (startX < 0) + startX = 0; + if (startY < 0) + startY = 0; + if (endX > mWidth) + endX = mWidth; + if (endY > mHeight) + endY = mHeight; + + for (int y = startY; y < endY; y++) + { + for (int x = startX; x < endX; x++) + itemDraw(graphics, x, y, scrollX, scrollY); + } +} + +void SpecialLayer::itemDraw(Graphics *graphics, int x, int y, + int scrollX, int scrollY) +{ + MapItem *item = getTile(x, y); + if (item) + { + const int px = x * 32 - scrollX; + const int py = y * 32 - scrollY; + item->draw(graphics, px, py, 32, 32); + } +} + + +MapItem::MapItem(): + mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1) +{ + setType(EMPTY); +} + +MapItem::MapItem(int type): + mImage(nullptr), mComment(""), mName(""), mX(-1), mY(-1) +{ + setType(type); +} + +MapItem::MapItem(int type, std::string comment): + mImage(nullptr), mComment(comment), mName(""), mX(-1), mY(-1) +{ + setType(type); +} + +MapItem::MapItem(int type, std::string comment, int x, int y): + mImage(nullptr), mComment(comment), mName(""), mX(x), mY(y) +{ + setType(type); +} + +MapItem::~MapItem() +{ + if (mImage) + { + mImage->decRef(); + mImage = nullptr; + } +} + +void MapItem::setType(int type) +{ + std::string name(""); + mType = type; + if (mImage) + mImage->decRef(); + + switch (type) + { + case ARROW_UP: + name = "graphics/sprites/arrow_up.gif"; + break; + case ARROW_DOWN: + name = "graphics/sprites/arrow_down.gif"; + break; + case ARROW_LEFT: + name = "graphics/sprites/arrow_left.gif"; + break; + case ARROW_RIGHT: + name = "graphics/sprites/arrow_right.gif"; + break; + default: + break; + } + + if (name != "") + { + ResourceManager *resman = ResourceManager::getInstance(); + mImage = resman->getImage(name); + } + else + { + mImage = nullptr; + } +} + +void MapItem::setPos(int x, int y) +{ + mX = x; + mY = y; +} + +void MapItem::draw(Graphics *graphics, int x, int y, int dx, int dy) +{ + if (mImage) + graphics->drawImage(mImage, x, y); + + switch(mType) + { + case ROAD: + case CROSS: + graphics->setColor(userPalette->getColorWithAlpha( + UserPalette::ROAD_POINT)); + graphics->fillRectangle(gcn::Rectangle(x + dx / 3, y + dy / 3, + dx / 3, dy / 3)); + break; + case HOME: + { + graphics->setColor(userPalette->getColorWithAlpha( + UserPalette::HOME_PLACE)); + graphics->fillRectangle(gcn::Rectangle( + x, y, + dx, dy)); + graphics->setColor(userPalette->getColorWithAlpha( + UserPalette::HOME_PLACE_BORDER)); + graphics->drawRectangle(gcn::Rectangle( + x, y, + dx, dy)); + break; + } + default: + break; + } + if (!mName.empty() && mType != PORTAL && mType != EMPTY && userPalette) + { + gcn::Font *font = gui->getFont(); + if (font) + { + graphics->setColor(userPalette->getColor(UserPalette::BEING)); + font->drawString(graphics, mName, x, y); + } + } +} + +ObjectsLayer::ObjectsLayer(unsigned width, unsigned height) : + mWidth(width), mHeight(height) +{ + const unsigned size = width * height; + mTiles = new MapObjectList*[size]; + std::fill_n(mTiles, size, static_cast(nullptr)); +} + +ObjectsLayer::~ObjectsLayer() +{ + const unsigned size = mWidth * mHeight; + for (unsigned f = 0; f < size; f ++) + delete mTiles[f]; + + delete [] mTiles; + mTiles = nullptr; +} + +void ObjectsLayer::addObject(std::string name, int type, + unsigned x, unsigned y, + unsigned dx, unsigned dy) +{ + if (!mTiles) + return; + + if (x + dx > mWidth) + dx = mWidth - x; + if (y + dy > mHeight) + dy = mHeight - y; + + for (unsigned y1 = y; y1 < y + dy; y1 ++) + { + unsigned idx1 = x + y1 * mWidth; + unsigned idx2 = idx1 + dx; + + for (unsigned i = idx1; i < idx2; i ++) + { + if (!mTiles[i]) + mTiles[i] = new MapObjectList(); + mTiles[i]->objects.push_back(MapObject(type, name)); + } + } +} + +MapObjectList *ObjectsLayer::getAt(unsigned x, unsigned y) +{ + if (x >= mWidth || y >= mHeight) + return nullptr; + return mTiles[x + y * mWidth]; +} + +MapRowVertexes::~MapRowVertexes() +{ + delete_all(images); + images.clear(); +} diff --git a/src/maplayer.h b/src/maplayer.h new file mode 100644 index 000000000..861ef1318 --- /dev/null +++ b/src/maplayer.h @@ -0,0 +1,299 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#ifndef MAPLAYER_H +#define MAPLAYER_H + +#include "actor.h" +#include "configlistener.h" +#include "position.h" +#include "properties.h" + +#include +#include + +class MapItem; +class MapLayer; +class SpecialLayer; +class ImageVertexes; + +typedef std::vector MepRowImages; + +class MapRowVertexes +{ + public: + MapRowVertexes() + { + images.reserve(30); + } + + ~MapRowVertexes(); + + MepRowImages images; +}; + +class MapObject +{ + public: + MapObject(int type0, std::string data0) + { + type = type0; + data = data0; + } + + int type; + std::string data; +}; + +class MapObjectList +{ + public: + std::vector objects; +}; + +/** + * A map layer. Stores a grid of tiles and their offset, and implements layer + * rendering. + */ +class MapLayer: public ConfigListener +{ + public: + friend class Map; + + /** + * Constructor, taking layer origin, size and whether this layer is the + * fringe layer. The fringe layer is the layer that draws the actors. + * There can be only one fringe layer per map. + */ + MapLayer(int x, int y, int width, int height, bool isFringeLayer); + + /** + * Destructor. + */ + ~MapLayer(); + + /** + * Set tile image, with x and y in layer coordinates. + */ + void setTile(int x, int y, Image *img); + + /** + * Set tile image with x + y * width already known. + */ + void setTile(int index, Image *img) + { mTiles[index] = img; } + + /** + * Draws this layer to the given graphics context. The coordinates are + * expected to be in map range and will be translated to local layer + * coordinates and clipped to the layer's dimensions. + * + * The given actors are only drawn when this layer is the fringe + * layer. + */ + void draw(Graphics *graphics, + int startX, int startY, + int endX, int endY, + int scrollX, int scrollY, + int mDebugFlags) const; + + void drawOGL(Graphics *graphics); + + void drawSDL(Graphics *graphics); + + void updateOGL(Graphics *graphics, + int startX, int startY, + int endX, int endY, + int scrollX, int scrollY, + int mDebugFlags); + + void updateSDL(Graphics *graphics, + int startX, int startY, + int endX, int endY, + int scrollX, int scrollY, + int mDebugFlags); + + void drawFringe(Graphics *graphics, + int startX, int startY, + int endX, int endY, + int scrollX, int scrollY, + const Actors *actors, + int mDebugFlags, int yFix) const; + + bool isFringeLayer() const + { return mIsFringeLayer; } + + void setSpecialLayer(SpecialLayer *val) + { mSpecialLayer = val; } + + void setTempLayer(SpecialLayer *val) + { mTempLayer = val; } + + int getWidth() const + { return mWidth; } + + int getHeight() const + { return mHeight; } + +// void setTileInfo(int x, int y, int width, int cnt); + +// void getTileInfo(int x, int y, int &width, int &cnt) const; + + void optionChanged(const std::string &value); + + int getTileDrawWidth(Image *img, int endX, int &width) const; + +// void initTileInfo(); + + private: + int mX, mY; + int mWidth, mHeight; + bool mIsFringeLayer; /**< Whether the actors are drawn. */ + bool mHighlightAttackRange; + Image **mTiles; +// int *mTilesWidth; +// int *mTilesCount; + SpecialLayer *mSpecialLayer; + SpecialLayer *mTempLayer; + typedef std::vector MapRows; + MapRows mTempRows; +}; + +class SpecialLayer +{ + public: + friend class Map; + friend class MapLayer; + + SpecialLayer(int width, int height, bool drawSprites = false); + + ~SpecialLayer(); + + void draw(Graphics *graphics, int startX, int startY, + int endX, int endY, int scrollX, int scrollY); + + MapItem* getTile(int x, int y) const; + + void setTile(int x, int y, MapItem* item); + + void setTile(int x, int y, int type); + + void addRoad(Path road); + + void clean(); + + void itemDraw(Graphics *graphics, int x, int y, + int scrollX, int scrollY); + + private: + int mWidth, mHeight; + bool mDrawSprites; + MapItem **mTiles; +}; + +class MapItem +{ + public: + friend class Map; + friend class MapLayer; + + enum ItemType + { + EMPTY = 0, + HOME = 1, + ROAD = 2, + CROSS = 3, + ARROW_UP = 4, + ARROW_DOWN = 5, + ARROW_LEFT = 6, + ARROW_RIGHT = 7, + PORTAL = 8, + MUSIC = 9, + ATTACK = 10, + PRIORITY = 11, + IGNORE_ = 12, + SEPARATOR = 13 + }; + + MapItem(); + + MapItem(int type); + + MapItem(int type, std::string comment); + + MapItem(int type, std::string comment, int x, int y); + + ~MapItem(); + + int getType() const + { return mType; } + + void setType(int type); + + void setPos(int x, int y); + + int getX() const + { return mX; } + + int getY() const + { return mY; } + + std::string &getComment() + { return mComment; } + + void setComment(std::string comment) + { mComment = comment; } + + std::string &getName() + { return mName; } + + void setName(std::string name) + { mName = name; } + + void draw(Graphics *graphics, int x, int y, int dx, int dy); + + private: + int mType; + Image *mImage; + std::string mComment; + std::string mName; + int mX; + int mY; +}; + +class ObjectsLayer +{ + public: + ObjectsLayer(unsigned width, unsigned height); + ~ObjectsLayer(); + + void addObject(std::string name, int type, unsigned x, unsigned y, + unsigned dx, unsigned dy); + + MapObjectList *getAt(unsigned x, unsigned y); + private: + MapObjectList **mTiles; + unsigned mWidth; + unsigned mHeight; +}; + +#endif diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 8d71779f2..1ddb74f20 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -25,6 +25,7 @@ #include "configuration.h" #include "logger.h" #include "map.h" +#include "maplayer.h" #include "tileset.h" #include "resources/animation.h" -- cgit v1.2.3-70-g09d2 From 42990fcd0a9f662eea267097e88b68b9c30da457 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 5 Feb 2012 20:24:13 +0300 Subject: Fix string in pvp attack modes. --- src/localplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index f50e3440c..9fa755e54 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2129,7 +2129,7 @@ void LocalPlayer::switchPvpAttack() static const char *pvpAttackStrings[] = { N_("(a) attack all players"), - N_("(f) attack not friends"), + N_("(f) attack all except friends"), N_("(b) attack bad relations"), N_("(d) dont attack players"), N_("(?) pvp attack") -- cgit v1.2.3-70-g09d2 From bf435a79408d89072f5872ab98449949a8a077b0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 3 Feb 2012 15:53:55 +0300 Subject: Add own translation system. --- src/CMakeLists.txt | 6 + src/Makefile.am | 6 + src/client.cpp | 5 + src/game.cpp | 2 + src/utils/langs.h | 3 + src/utils/stringutils.cpp | 7 + src/utils/stringutils.h | 2 + src/utils/translation/podict.cpp | 55 +++++++ src/utils/translation/podict.h | 59 +++++++ src/utils/translation/poparser.cpp | 221 +++++++++++++++++++++++++++ src/utils/translation/poparser.h | 78 ++++++++++ src/utils/translation/translationmanager.cpp | 72 +++++++++ src/utils/translation/translationmanager.h | 39 +++++ src/utils/xml.cpp | 12 ++ src/utils/xml.h | 6 + 15 files changed, 573 insertions(+) create mode 100644 src/utils/translation/podict.cpp create mode 100644 src/utils/translation/podict.h create mode 100644 src/utils/translation/poparser.cpp create mode 100644 src/utils/translation/poparser.h create mode 100644 src/utils/translation/translationmanager.cpp create mode 100644 src/utils/translation/translationmanager.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 96c1eac67..3289aed66 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -443,6 +443,12 @@ SET(SRCS resources/spritedef.cpp resources/wallpaper.cpp resources/wallpaper.h + utils/translation/podict.cpp + utils/translation/podict.h + utils/translation/poparser.cpp + utils/translation/poparser.h + utils/translation/translationmanager.cpp + utils/translation/translationmanager.h utils/base64.cpp utils/base64.h utils/checkutils.cpp diff --git a/src/Makefile.am b/src/Makefile.am index e9af09463..204c21bfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -448,6 +448,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/spritedef.cpp \ resources/wallpaper.cpp \ resources/wallpaper.h \ + utils/translation/podict.cpp \ + utils/translation/podict.h \ + utils/translation/poparser.cpp \ + utils/translation/poparser.h \ + utils/translation/translationmanager.cpp \ + utils/translation/translationmanager.h \ utils/base64.cpp \ utils/base64.h \ utils/checkutils.cpp \ diff --git a/src/client.cpp b/src/client.cpp index c21194834..cb65c3b60 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -101,6 +101,8 @@ #include "utils/paths.h" #include "utils/stringutils.h" +#include "utils/translation/translationmanager.h" + #include "test/testlauncher.h" #include "test/testmain.h" @@ -458,6 +460,8 @@ void Client::gameInit() //resman->selectSkin(); + TranslationManager::loadCurrentLang(); + std::string iconFile = branding.getValue("appIcon", "icons/manaplus"); #ifdef WIN32 iconFile += ".ico"; @@ -1050,6 +1054,7 @@ int Client::gameExec() logger->log1("State: CONNECT SERVER"); mCurrentDialog = new ConnectionDialog( _("Connecting to server"), STATE_SWITCH_SERVER); + TranslationManager::loadCurrentLang(); break; case STATE_LOGIN: diff --git a/src/game.cpp b/src/game.cpp index 0d5c1113e..cd54f9c98 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -104,6 +104,8 @@ #include "utils/gettext.h" #include "utils/mkdir.h" +#include "utils/translation/translationmanager.h" + #include #include diff --git a/src/utils/langs.h b/src/utils/langs.h index c3f2f1398..3b9f49f71 100644 --- a/src/utils/langs.h +++ b/src/utils/langs.h @@ -29,6 +29,9 @@ #include #include +typedef std::vector LangVect; +typedef LangVect::const_iterator LangIter; + std::vector getLang(); std::string getLangSimple(); diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 16542526f..becb2124d 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -592,3 +592,10 @@ std::string &removeProtocol(std::string &url) url = url.substr(i + 3); return url; } + +bool strStartWith(std::string str1, std::string str2) +{ + if (str1.size() < str2.size()) + return false; + return str1.substr(0, str2.size()) == str2; +} diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 7b512b081..398737179 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -204,4 +204,6 @@ bool findCutFirst(std::string &str1, std::string str2); std::string &removeProtocol(std::string &url); +bool strStartWith(std::string str, std::string start); + #endif // UTILS_STRINGUTILS_H diff --git a/src/utils/translation/podict.cpp b/src/utils/translation/podict.cpp new file mode 100644 index 000000000..0be0b279f --- /dev/null +++ b/src/utils/translation/podict.cpp @@ -0,0 +1,55 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#include "utils/translation/podict.h" + +#include + +#include "localconsts.h" +#include "logger.h" + +#include "debug.h" + +std::string empty; + +PoDict *translator = nullptr; + +PoDict::PoDict(std::string lang) : + mLang(lang) +{ +} + +PoDict::~PoDict() +{ +} + +const std::string PoDict::getStr(std::string &str) +{ + if (mPoLines.find(str) == mPoLines.end()) + return str; + return mPoLines[str]; +} + +const char *PoDict::getChar(const char *str) +{ + if (mPoLines.find(str) == mPoLines.end()) + return str; + return mPoLines[str].c_str(); +} diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h new file mode 100644 index 000000000..0b7dd726c --- /dev/null +++ b/src/utils/translation/podict.h @@ -0,0 +1,59 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#ifndef UTILS_TRANSLATION_PODICT_H +#define UTILS_TRANSLATION_PODICT_H + +#include +#include + +typedef std::map PoMap; + +class PoDict +{ + public: + PoDict(std::string lang); + + ~PoDict(); + + const std::string getStr(std::string &str); + + const char *getChar(const char *str); + + protected: + friend class PoParser; + + PoMap *getMap() + { return &mPoLines; } + + void set(std::string key, std::string value) + { mPoLines[key] = value; } + + void setLang(std::string lang) + { mLang = lang; } + + private: + PoMap mPoLines; + std::string mLang; +}; + +extern PoDict *translator; + +#endif // UTILS_TRANSLATION_PODICT_H diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp new file mode 100644 index 000000000..24d2ee4d4 --- /dev/null +++ b/src/utils/translation/poparser.cpp @@ -0,0 +1,221 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#include "utils/translation/poparser.h" + +#include "resources/resourcemanager.h" + +#include "utils/stringutils.h" + +#include "localconsts.h" +#include "logger.h" + +#include +#include + +#include "debug.h" + +PoParser::PoParser() : + mDict(nullptr), + mReadingId(false), + mReadingStr(false) +{ +} + +void PoParser::openFile() +{ + ResourceManager *resman = ResourceManager::getInstance(); + int size; + char *buf = static_cast(resman->loadFile(getFileName(mLang), size)); + + mFile.str(std::string(buf, size)); + free(buf); +} + +PoDict *PoParser::load(std::string lang) +{ + setLang(lang); + mDict = getDict(); + + openFile(); + + mMsgId = ""; + mMsgStr = ""; + + // cycle by msgid+msgstr + while (readLine()) + { + // reading msgid + while (readMsgId()) + { + if (!readLine()) + break; + } + + if (!mMsgId.empty()) + { + // if we got msgid then reading msgstr + while (readMsgStr()) + { + if (!readLine()) + break; + } + } + + if (!mMsgId.empty() && !mMsgStr.empty()) + { +// logger->log("add key: " + mMsgId); +// logger->log("add value: " + mMsgStr); + + // store key and value + mDict->set(mMsgId, mMsgStr); + } + + mMsgId = ""; + mMsgStr = ""; + } + + return mDict; +} + +bool PoParser::readLine() +{ + char line[1001]; + if (!mFile.getline(line, 1000)) + return false; + mLine = line; + return true; +} + +bool PoParser::readMsgId() +{ + // if we reading msgstr then stop here + if (mReadingStr) + return false; + + const std::string msgId1 = "msgid \""; + + // check if in reading process + if (mReadingId) + { + // if we get empty line in file then stop reading + if (mLine.empty()) + { + mReadingId = false; + return false; + } + else if (checkLine()) + { + // reading text from: "text" + mMsgId += mLine.substr(1, mLine.size() - 2); + mLine = ""; + return true; + } + // stop reading in other case + mReadingId = false; + return false; + } + else + { + // check line start from msgid " + if (strStartWith(mLine, msgId1)) + { + mReadingId = true; + // reading text from: msgid "text" + mMsgId += mLine.substr(msgId1.size(), + mLine.size() - 1 - msgId1.size()); + mLine = ""; + return true; + } + // stop reading if we dont read msgid before + return mMsgId.empty(); + } +} + +bool PoParser::readMsgStr() +{ + const std::string msgStr1 = "msgstr \""; + + // check if in reading process + if (mReadingStr) + { + // if we get empty line in file then stop reading + if (mLine.empty()) + { + mReadingStr = false; + return false; + } + if (checkLine()) + { + // reading text from: "text" + mMsgStr += mLine.substr(1, mLine.size() - 2); + mLine = ""; + return true; + } + // stop reading in other case + mReadingStr = false; + } + else + { + // check line start from msgstr " + if (strStartWith(mLine, msgStr1)) + { + mReadingStr = true; + // reading text from: msgid "text" + mMsgStr += mLine.substr(msgStr1.size(), + mLine.size() - 1 - msgStr1.size()); + mLine = ""; + return true; + } + } + + // stop reading in other case + return false; +} + +bool PoParser::checkLine() +{ + // check is line in format: "text" + return mLine.size() > 2 && mLine[0] == '\"' + && mLine[mLine.size() - 1] == '\"'; +} + +PoDict *PoParser::getEmptyDict() +{ + return new PoDict(""); +} + +bool PoParser::checkLang(std::string lang) const +{ + // check is po file exists + ResourceManager *resman = ResourceManager::getInstance(); + return resman->exists(getFileName(lang)); +} + +std::string PoParser::getFileName(std::string lang) const +{ + // get po file name from lang name + return strprintf("translations/%s.po", lang.c_str()); +} + +PoDict *PoParser::getDict() +{ + return new PoDict(mLang); +} diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h new file mode 100644 index 000000000..799cd2fe7 --- /dev/null +++ b/src/utils/translation/poparser.h @@ -0,0 +1,78 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#ifndef UTILS_TRANSLATION_POPARSER_H +#define UTILS_TRANSLATION_POPARSER_H + +#include "utils/translation/podict.h" + +#include +#include + +class PoParser +{ + public: + PoParser(); + + PoDict *load(std::string fileName); + + bool checkLang(std::string lang) const; + + static PoDict *getEmptyDict(); + + private: + void setLang(std::string lang) + { mLang = lang; } + + void openFile(); + + bool readLine(); + + bool readMsgId(); + + bool readMsgStr(); + + bool checkLine(); + + std::string getFileName(std::string lang) const; + + PoDict *getDict(); + + // current lang + std::string mLang; + + // po file object + std::istringstream mFile; + + // current line from po file + std::string mLine; + + std::string mMsgId; + + std::string mMsgStr; + + PoDict *mDict; + + bool mReadingId; + + bool mReadingStr; +}; + +#endif // UTILS_TRANSLATION_POPARSER_H diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp new file mode 100644 index 000000000..b4ae0d949 --- /dev/null +++ b/src/utils/translation/translationmanager.cpp @@ -0,0 +1,72 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#include "utils/translation/translationmanager.h" + +#include "utils/langs.h" + +#include "utils/translation/podict.h" +#include "utils/translation/poparser.h" + +#include + +#include "localconsts.h" +#include "logger.h" + +#include "debug.h" + +void TranslationManager::init() +{ + if (translator) + delete translator; + translator = PoParser::getEmptyDict(); +} + +void TranslationManager::loadCurrentLang() +{ + if (translator) + delete translator; + translator = loadLang(getLang()); +} + +PoDict *TranslationManager::loadLang(LangVect lang) +{ + std::string name = ""; + PoParser parser; + + LangIter it = lang.begin(); + LangIter it_end = lang.end(); + + for (; it != it_end; ++ it) + { + if (*it == "C") + continue; + + if (parser.checkLang(*it)) + { + name = *it; + break; + } + } + if (!name.empty()) + return parser.load(name); + logger->log("can't find client data translation"); + return PoParser::getEmptyDict(); +} diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h new file mode 100644 index 000000000..de3875b0a --- /dev/null +++ b/src/utils/translation/translationmanager.h @@ -0,0 +1,39 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#ifndef UTILS_TRANSLATION_MANAGER_H +#define UTILS_TRANSLATION_MANAGER_H + +#include +#include + +class PoDict; + +class TranslationManager +{ + public: + static PoDict *loadLang(std::vector lang); + + static void init(); + + static void loadCurrentLang(); +}; + +#endif // UTILS_TRANSLATION_MANAGER_H diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 420915d8f..140da72df 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -26,6 +26,8 @@ #include "resources/resourcemanager.h" +#include "utils/translation/podict.h" + #include #include #include @@ -148,6 +150,16 @@ namespace XML return def; } + std::string langProperty(XmlNodePtr node, const char *name, + const std::string &def) + { + std::string str = getProperty(node, name, def); + if (!translator) + return str; + + return translator->getStr(str); + } + bool getBoolProperty(XmlNodePtr node, const char* name, bool def) { xmlChar *prop = xmlGetProp(node, BAD_CAST name); diff --git a/src/utils/xml.h b/src/utils/xml.h index f623fa618..eb5ee88b0 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -91,6 +91,12 @@ namespace XML std::string getProperty(XmlNodePtr node, const char *name, const std::string &def); + /** + * Gets a translated string property from an XmlNodePtr. + */ + std::string langProperty(XmlNodePtr node, const char *name, + const std::string &def); + /** * Gets a boolean property from an XmlNodePtr. */ -- cgit v1.2.3-70-g09d2 From 0cbb5fdd043733456565f705d1527ec67785a005 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Feb 2012 00:16:58 +0300 Subject: Use client data translation. For now language same as gui language. Fix some untranslated gettext lines. --- src/gui/skilldialog.cpp | 8 ++++---- src/localplayer.cpp | 16 ++++++++++++---- src/resources/colordb.cpp | 4 ++-- src/resources/emotedb.cpp | 4 ++-- src/resources/itemdb.cpp | 6 +++--- src/resources/monsterdb.cpp | 2 +- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 4ee674325..430705b1d 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -382,8 +382,8 @@ void SkillDialog::loadSkills(const std::string &file) SkillInfo *skill = new SkillInfo; skill->id = 1; - skill->name = "basic"; - skill->dispName = "Skill: basic, Id: 1"; + skill->name = _("basic"); + skill->dispName = _("Skill: basic, Id: 1"); skill->setIcon(""); skill->modifiable = true; skill->visible = true; @@ -428,14 +428,14 @@ void SkillDialog::loadSkills(const std::string &file) if (xmlNameEqual(node, "skill")) { int id = atoi(XML::getProperty(node, "id", "-1").c_str()); - std::string name = XML::getProperty(node, "name", + std::string name = XML::langProperty(node, "name", strprintf(_("Skill %d"), id)); std::string icon = XML::getProperty(node, "icon", ""); SkillInfo *skill = new SkillInfo; skill->id = static_cast(id); skill->name = name; - skill->dispName = strprintf("Skill: %s, Id: %d", + skill->dispName = strprintf(_("Skill: %s, Id: %d"), name.c_str(), skill->id); skill->setIcon(icon); skill->modifiable = false; diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 9fa755e54..81c988d53 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -1714,20 +1714,28 @@ void LocalPlayer::processEvent(Mana::Channels channel, if (!mMessages.empty()) { MessagePair pair = mMessages.back(); - if (pair.first.find(" xp") == pair.first.size() - 3) + // TRANSLATORS: this is normal experience + if (pair.first.find(strprintf(" %s", + _("xp"))) == pair.first.size() - 3) { mMessages.pop_back(); - pair.first += ", " + toString(change) + " job"; + // TRANSLATORS: this is job experience + pair.first += strprintf (", %d %s", + change, _("job")); mMessages.push_back(pair); } else { - addMessageToQueue(toString(change) + " job"); + // TRANSLATORS: this is job experience + addMessageToQueue(strprintf("%d %s", + change, _("job"))); } } else { - addMessageToQueue(toString(change) + " job"); + // TRANSLATORS: this is job experience + addMessageToQueue(strprintf( + "%d %s", change, _("job"))); } } } diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 2ddf27ac3..66c8de0a2 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -95,7 +95,7 @@ void ColorDB::loadHair() if (colors.find(id) != colors.end()) logger->log("ColorDB: Redefinition of dye ID %d", id); - colors[id] = ItemColor(id, XML::getProperty(node, "name", ""), + colors[id] = ItemColor(id, XML::langProperty(node, "name", ""), XML::getProperty(node, hairXml ? "value" : "dye", "#FFFFFF")); } } @@ -135,7 +135,7 @@ void ColorDB::loadColorLists() if (xmlNameEqual(colorNode, "color")) { ItemColor c(XML::getProperty(colorNode, "id", -1), - XML::getProperty(colorNode, "name", ""), + XML::langProperty(colorNode, "name", ""), XML::getProperty(colorNode, "value", "")); if (c.id > -1) colors[c.id] = c; diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index 07e192cd4..aba020261 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -93,7 +93,7 @@ void EmoteDB::load() spriteNode->xmlChildrenNode->content); currentSprite->sprite = AnimatedSprite::load(file, XML::getProperty(spriteNode, "variant", 0)); - currentSprite->name = XML::getProperty(spriteNode, "name", ""); + currentSprite->name = XML::langProperty(spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } else if (xmlNameEqual(spriteNode, "particlefx")) @@ -147,7 +147,7 @@ void EmoteDB::load() spriteNode->xmlChildrenNode->content); currentSprite->sprite = AnimatedSprite::load(file, XML::getProperty(spriteNode, "variant", 0)); - currentSprite->name = XML::getProperty(spriteNode, "name", ""); + currentSprite->name = XML::langProperty(spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } else if (xmlNameEqual(spriteNode, "particlefx")) diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 5fa68a88f..e81700ecc 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -202,10 +202,10 @@ void ItemDB::load() int weight = XML::getProperty(node, "weight", 0); int view = XML::getProperty(node, "view", 0); - std::string name = XML::getProperty(node, "name", ""); + std::string name = XML::langProperty(node, "name", ""); std::string image = XML::getProperty(node, "image", ""); std::string floor = XML::getProperty(node, "floor", ""); - std::string description = XML::getProperty(node, "description", ""); + std::string description = XML::langProperty(node, "description", ""); std::string attackAction = XML::getProperty(node, "attack-action", ""); std::string drawBefore = XML::getProperty(node, "drawBefore", ""); std::string drawAfter = XML::getProperty(node, "drawAfter", ""); @@ -316,7 +316,7 @@ void ItemDB::load() effect += " / "; effect += strprintf(it->format.c_str(), value); } - std::string temp = XML::getProperty(node, "effect", ""); + std::string temp = XML::langProperty(node, "effect", ""); if (!effect.empty() && !temp.empty()) effect += " / "; effect += temp; diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 9d295db35..2c9448fc3 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -80,7 +80,7 @@ void MonsterDB::load() | Map::BLOCKMASK_CHARACTER | Map::BLOCKMASK_MONSTER); currentInfo->setBlockType(Map::BLOCKTYPE_MONSTER); - currentInfo->setName(XML::getProperty( + currentInfo->setName(XML::langProperty( monsterNode, "name", _("unnamed"))); currentInfo->setTargetCursorSize(XML::getProperty(monsterNode, -- cgit v1.2.3-70-g09d2 From b83f880362244c59770311ece8a1d74af894465e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Feb 2012 02:40:32 +0300 Subject: Update and rebuild translations. --- po/cs.po | 819 +++++++++++++++++++++-------------------- po/de.po | 1085 ++++++++++++++++++++++++++++--------------------------- po/es.po | 821 +++++++++++++++++++++-------------------- po/fi.po | 821 +++++++++++++++++++++-------------------- po/fr.po | 823 +++++++++++++++++++++-------------------- po/id.po | 817 +++++++++++++++++++++-------------------- po/ja.po | 823 +++++++++++++++++++++-------------------- po/manaplus.pot | 817 +++++++++++++++++++++-------------------- po/nl_BE.po | 819 +++++++++++++++++++++-------------------- po/pl.po | 821 +++++++++++++++++++++-------------------- po/pt.po | 903 +++++++++++++++++++++++---------------------- po/pt_BR.po | 892 +++++++++++++++++++++++---------------------- po/ru.po | 819 +++++++++++++++++++++-------------------- po/zh_CN.po | 818 +++++++++++++++++++++-------------------- 14 files changed, 6104 insertions(+), 5794 deletions(-) diff --git a/po/cs.po b/po/cs.po index 107933f31..8759c9040 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" "PO-Revision-Date: 2012-02-02 16:45+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/" @@ -43,47 +43,47 @@ msgstr "" msgid "I" msgstr "" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Nastavení" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Výkon" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Připojuji se k serveru" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Přihlašuji se" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Vstupuji do herního světa" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Požaduji postavy" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Připojuji se k hernímu serveru" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Zaměňuji herní servery" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,50 +93,50 @@ msgstr "Zaměňuji herní servery" msgid "Error" msgstr "Chyba" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Požaduji registrační detaily" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Změna hesla" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Heslo úspěšně změněno!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Změna emailu" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Email úspěšně změněn!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Zrušení registrace úspěšné" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Nashledanou, vraťte se kdykoli..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Neplatný host updatů: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Chyba při vytváření adresáře s updaty!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji." @@ -325,43 +325,43 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Snímky obrazovky ukládat jako " -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Ukládání snímku obrazovky selhalo!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "Spojení se serverem bylo ztraceno." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Chyba sítě" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Ignorovat příchozí žádosti o obchodování" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Akceptovat příchozí žádosti o obchodování" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Nelze načíst mapu" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Chyba při načítání %s" @@ -394,20 +394,20 @@ msgstr "Ověřovač botů" msgid "Name" msgstr "Jméno" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Útok" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Mluvit" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "" @@ -420,8 +420,8 @@ msgid "Reset" msgstr "Vynulovat" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Nákup" @@ -469,8 +469,8 @@ msgstr "Vše" msgid "Shop" msgstr "Obchod" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -480,18 +480,18 @@ msgstr "Prodej" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Zrušit" @@ -527,7 +527,7 @@ msgstr "Emailové adresy nesouhlasí." msgid "Change Password" msgstr "Změnit heslo" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Heslo:" @@ -559,7 +559,7 @@ msgid "New Character" msgstr "" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Jméno:" @@ -595,7 +595,7 @@ msgid "Race:" msgstr "Rasa:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Vytvořit" @@ -738,7 +738,7 @@ msgid "rainbow 3" msgstr "duhová 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -769,13 +769,13 @@ msgstr "Ano" msgid "No" msgstr "Ne" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Ignorovat" @@ -915,25 +915,25 @@ msgstr "Příchozí: %d bytes/s" msgid "Out: %d bytes/s" msgstr "Odchozí: %d bytes/s" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Víte že ... ?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Zavřít" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Předchozí" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Další >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Automaticky otevírat toto okno" @@ -973,12 +973,12 @@ msgstr "Vybavení" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Odstranit z vybavení" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Pomoc" @@ -1016,31 +1016,31 @@ msgid "Filter:" msgstr "Filtr:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Vybavit" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Použít" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Upustit..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Rozdělit" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Výstroje" @@ -1049,17 +1049,17 @@ msgid "Weight:" msgstr "Hmotnost:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Uložit" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Vzít" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Upustit" @@ -1203,43 +1203,43 @@ msgstr "Jack O se rodí" msgid "You have left the guild." msgstr "Opustil jsi gildu." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Automaticky zavírat" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Přeskočit" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Přihlášení" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Server:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Vlastní host updatů" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Pamatovat přihlášení" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Updaty:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Registrace" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Změnit server" @@ -1300,7 +1300,7 @@ msgstr "Odeslat" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Vyprázdnit" @@ -1335,355 +1335,355 @@ msgstr "Nejdřív odstrojit" msgid "Away outfit" msgstr "Výstroj pro \"Away\"" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Obchod" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Šeptat" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Vyléčit" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Být přátelé" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Přehlížet" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 -msgid "Black list" -msgstr "" - #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 -msgid "Set as enemy" +#: src/gui/popupmenu.cpp:717 +msgid "Black list" msgstr "" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:703 +msgid "Set as enemy" +msgstr "" + +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Vymazat" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Odignorovat" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Kompletně ignorovat" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Následovat" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "imitovat" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Pozvat do party" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Vykopnout z party" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Vykopnout z gildy" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Změnit pozici v gildě" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Pozvat do gildy" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Vykopnout hráče" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Zobrazit věci" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Svléct" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Přidat komentář" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Koupit (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Prodat (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Vykopnout" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Vložit do seznamu ignorovaných" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Vložit jméno do chatu" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Hráči" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Sebrat" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Vložit do chatu" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Označit na mapě" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Přejmenovat" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Odebrat" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Kouzla" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Načíst stará kouzla" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Upravit kouzlo" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "vypnout zvýrazǒvání" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Zapnout zvýrazňování" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "Neodebírat jméno" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Odebrat jméno" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Zapnout \"away\"" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Vypnout \"away\"" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Odejít" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Přejmenovat značku an mapě" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Jméno: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Hráčův komentář" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Komentář: " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Přidat do transakce" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Přidat 10 do transakce" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Přidat polovinu do transakce" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Přidat vše do transakce" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Uschovat 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Uschovat polovinu" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Uschovat všechny" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Upustit vše" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Vzít 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Vzít polovinu" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Vzít všechny" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Načíst staré zkratky věcí" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Načíst staré zkratky upuštění" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Skrýt" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Zobrazit" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Resetovat žlutý pruh" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Zkopírovat do chatu" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Posunout nahoru" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Posunout dolů" @@ -2705,6 +2705,14 @@ msgstr "Zvýšit" msgid "Skill points available: %d" msgstr "" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2715,6 +2723,11 @@ msgstr "" msgid "Skill %d" msgstr "" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2725,204 +2738,204 @@ msgstr "" msgid "Lvl: %d (%+d)" msgstr "" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gilda" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Pozvali jste %s do gildy %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Požadován odchod z gildy %s." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Člen pozval do gildy" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Koho byste rád pozval do gildy %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Opustit gildu?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Jste si jisti že chcete opustit gildu %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Parta" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "" -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Prioritní monstra" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Útočit na monstra" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Ignorovat monstra" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Vytvořit gildu" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Vytvořit partu" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Společenství" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Pozvat" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Přijato pozvání do party od %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Odmítnuto přijetí do party od %s." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Přijato pozvání do gildy od %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Odmítnuto pozvání do gildy od %s." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Vytvářím gildu s názvem %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Vytvářím partu s názvem %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Název gildy" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Zvolte jméno vaší gildy." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s vás zve ke vstupu do gildy %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Přílmout pozvání do gildy" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "Byli jste pozváni k připojení se do party." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "Byli jste pozváni k připojení se do party %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s vás pozval ke vstupu do své party." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s vás zve ke vstupu do party: %s." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Přijmout pozvání do party" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Nemohu vytvořit partu. Již jste členem party." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Jméno party" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Zvolte jméno vaší party." @@ -3112,33 +3125,33 @@ msgstr "" msgid "Name: %s" msgstr "Jméno: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Aktualizuje se..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Připojuji se..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Hrát" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 Proces aktualizace není kompletní." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 silně doporučujeme zkusit" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 aktualizaci později" -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Hotovo" @@ -4010,42 +4023,42 @@ msgstr "" "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může " "chovat podivně." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Snažili jste se sebrat neexistující předmět." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Předmět je příliš těžký." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Předmět je příliš daleko." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "Inventář je plný." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "Hromada je příliš velká." -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Předmět patří někomu jinému." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Neznámý problém při pokusu sebrat předmět." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4053,388 +4066,398 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +#, fuzzy +msgid "xp" +msgstr "Exp:" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#, fuzzy +msgid "job" +msgstr "pruh práce" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) výchozí pohyby" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) invertované pohyby" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) pohyby s trochou šílených pohybů" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) pohyby s šílenými pohyby" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) dvojité normální + šílené" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) vlastní šílené pohyby" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) šílené pohyby" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) výchozí pohyb k cíli" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) pohyb k cíli do vzdálenosti 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) pohyb k cíli do vzdálenosti 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) pohyb k cíli do vzdálenosti 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) pohyb k cíli do vzdálenosti 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) pohyb k cíli do vzdálenosti 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) pohyb k cíli na útočný dosah" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) pohyb k cíli" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) výchozí následování" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) relativní následování" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) zrcadlené následování" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) neznámé následování" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) útok" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) výchozí útok" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) přepínat útok bez štítu" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) přepínat útok se štítem" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) jdi a útoč" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) jdi, útoč, sbírej" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) bez automatického útoku" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) malý sběr 1x1 pole" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) výchozí sběr 2x1 pole" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) sběr před 2x3 pole" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) sběr 3x3 pole" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) jdi a seber do vzdálenosti 4" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) jdi a seber do vzdálenosti 8" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) jdi a seber do max. vzdálenosti" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) sběr" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) Normální zobrazení mapy" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) debug zobrazení mapy" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) ultra zobrazení mapy" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) ultra zobrazení mapy 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) zobrazen prázdné mapy" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) zobrazení černobílé mapy" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) použij #flar pro magický útok" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) použij #chiza pro magický útok" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) použij #ingrav pro magický útok" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) použij #frillyar pro magický útok" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) použij #upmarmu pro magický útok" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) magický útok attack" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) výchozí imitace" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) imitace výstroje" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) imitace" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) u počítače" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) pryč (away)" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) away" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) mód herní kamery" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) mód volné kamery" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Modifikátory hry jsou zapnuty" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Modifikátory hry jsou vypnuty" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Následování zrušeno." -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitace zrušena." -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Vidíte " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Nastavení:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4492,7 +4515,7 @@ msgstr "" "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru " "existuje. " -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Špatné jméno." @@ -4785,66 +4808,66 @@ msgstr "Pokus o použití předmětu selhal." msgid "Unable to equip." msgstr "Nelze vybavit." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Účet nenalezen, prosím přihlaste se znovu." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Půvoní heslo je nesprávné." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Nové heslo je příliš krátké." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Neznámá chyba." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "Neregistované ID." -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Špatné heslo." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "Platnost účtu vypršela." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Odmítnut ze serveru." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Klient je příliš starý." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Server je přelidněný." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Toto uživatelské jméno je již používáno." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Uživatelské jméno bylo trvale odstraněno." diff --git a/po/de.po b/po/de.po index 497e53986..40a2199df 100644 --- a/po/de.po +++ b/po/de.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-02 16:45+0000\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/" "de/)\n" @@ -47,47 +47,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Einstellungen" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Leistung" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" -msgstr "" +msgstr "Themen" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Verbinde zum Server" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Anmelden" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Betrete die Spielwelt" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Spielfiguren werden angefragt" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Verbinde zum Charakterserver" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Charakterserver wechseln" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -97,50 +97,50 @@ msgstr "Charakterserver wechseln" msgid "Error" msgstr "Fehler" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Anfrage der Registrierungsdetails" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Passwort ändern" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Passwort erfolgreich geändert!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "E-Mail ändern" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "E-Mail erfolgreich geändert!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "erfolgreich abgemeldet." -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Leb wohl und komme jeder Zeit wieder..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s existiert nicht und kann nicht erstellt werden! Beende." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Ungültiger Updateserver: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" @@ -298,11 +298,11 @@ msgstr[1] "%d Sekunden" #: src/commandhandler.cpp:1060 msgid "font cache size" -msgstr "" +msgstr "Schrift-Cache Größe" #: src/commandhandler.cpp:1072 msgid "Cache size:" -msgstr "" +msgstr "Cache-Größe:" #: src/commandhandler.cpp:1076 msgid "Created:" @@ -314,7 +314,7 @@ msgstr "Gelöscht:" #: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 msgid "Resource images:" -msgstr "" +msgstr "Bild-Quellen:" #: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 msgid "Resource orphaned images:" @@ -326,43 +326,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Allgemein" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Debug" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Bildschirmfoto gespeichert unter" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Bildschirmfoto konnte nicht gespeichert werden!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "Die Verbindung zum Server wurde getrennt." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Netzwerkfehler" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Ignoriere eingehende Handelsanfragen" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Akzeptiere eingehende Handelsanfragen" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Karte konnte nicht geladen werden." -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Fehler beim Laden von %s" @@ -395,20 +395,20 @@ msgstr "Bot-Prüfer" msgid "Name" msgstr "Name" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Angriff" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Sprechen" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Bewegen" @@ -421,8 +421,8 @@ msgid "Reset" msgstr "Zurücksetzten" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Kaufen" @@ -470,8 +470,8 @@ msgstr "Max" msgid "Shop" msgstr "Laden" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -481,18 +481,18 @@ msgstr "Verkaufen" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Abbrechen" @@ -528,7 +528,7 @@ msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein." msgid "Change Password" msgstr "Passwort ändern" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Passwort:" @@ -557,10 +557,10 @@ msgstr "Die Passwörter stimmen nicht überein." #: src/gui/charcreatedialog.cpp:70 msgid "New Character" -msgstr "" +msgstr "Neuer Charakter" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Name :" @@ -589,14 +589,14 @@ msgstr "Frisur:" #: src/gui/charcreatedialog.cpp:112 msgid "^" -msgstr "" +msgstr "^" #: src/gui/charcreatedialog.cpp:119 msgid "Race:" msgstr "Rasse:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Erstellen" @@ -739,7 +739,7 @@ msgid "rainbow 3" msgstr "Regenbogen 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -770,13 +770,13 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "ignorieren" @@ -884,7 +884,7 @@ msgstr "Ziel Gilde:" #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 #: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 msgid "Attack delay:" -msgstr "" +msgstr "Attackier-Verzögerung:" #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 #: src/gui/debugwindow.cpp:351 @@ -916,27 +916,27 @@ msgstr "Eingehend: %d bytes/s" msgid "Out: %d bytes/s" msgstr "Ausgehend: %d bytes/s" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Wusstest du schon?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Schließen" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Zurück" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Vor >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" -msgstr "" +msgstr "Öffne dieses Fenster automatisch" #: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45 @@ -946,11 +946,11 @@ msgstr "Ok" #: src/gui/editserverdialog.cpp:54 msgid "Edit Server" -msgstr "" +msgstr "Bearbeite Server" #: src/gui/editserverdialog.cpp:62 msgid "Address:" -msgstr "" +msgstr "Adresse:" #: src/gui/editserverdialog.cpp:63 msgid "Port:" @@ -962,11 +962,11 @@ msgstr "Server Typ:" #: src/gui/editserverdialog.cpp:65 msgid "Description:" -msgstr "" +msgstr "Beschreibung:" #: src/gui/editserverdialog.cpp:175 msgid "Please at least type both the address and the port of the server." -msgstr "" +msgstr "Bitte die Adresse und den Port eines Servers eingeben." #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74 msgid "Equipment" @@ -974,12 +974,12 @@ msgstr "Ausrüstung" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Ablegen" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Hilfe" @@ -1017,31 +1017,31 @@ msgid "Filter:" msgstr "Filter:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Ausrüsten" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Benutzen" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Wegwerfen" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Aufteilen" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Ausrüstung" @@ -1050,17 +1050,17 @@ msgid "Weight:" msgstr "Gewicht:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Aufbewahren" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Abholen" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Wegwerfen" @@ -1202,43 +1202,43 @@ msgstr "" msgid "You have left the guild." msgstr "Du hast die Guilde verlassen." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normal" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "automatisch schließen" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "überspringen" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Anmelden" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Server:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Updateserver verwalten" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Benutzername merken" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Update:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Registrieren" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Wechsle den Server" @@ -1256,7 +1256,7 @@ msgstr "Erfahrungs Balken" #: src/gui/ministatuswindow.cpp:83 msgid "job bar" -msgstr "" +msgstr "Job Balken" #: src/gui/ministatuswindow.cpp:92 msgid "weight bar" @@ -1284,7 +1284,7 @@ msgstr "Muss" #: src/gui/npcdialog.cpp:52 msgid "Stop waiting" -msgstr "" +msgstr "Stoppe Warten" #: src/gui/npcdialog.cpp:53 msgid "Next" @@ -1299,7 +1299,7 @@ msgstr "Absenden" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Frei" @@ -1334,355 +1334,355 @@ msgstr "Zuerst ausziehen" msgid "Away outfit" msgstr "Abwesend-Outfit" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handeln" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Flüstern" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Heilen" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Befreunden" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" -msgstr "" +msgstr "Ignorieren" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Schwarze Liste" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Als Feind setzen" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Löschen" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Nicht mehr Ignorieren" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "@@ignore|Ignoriere %s komplett@@" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Folgen" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Imitation" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Lade ein zu Party" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Aus Party werfen" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Aus Gilde werfen" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" -msgstr "" +msgstr "Rang in Gilde ändern" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "In Gilde einladen" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Spieler rauswerfen" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" -msgstr "" +msgstr "Atombombe" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Zeige Items" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Ausziehen" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Kommentar hinzufügen" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Kaufen(?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Verkaufen(?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Rauswerfen" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Entferne aus Angriffsliste" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Hinzufügen zur Angriffsliste" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Hinzufügen zur Ignorierenliste" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Füge Name dem Chat hinzu" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Spieler" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Aufheben" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Zu Chat hinzufügen" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Karteneinstellung" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Umbenennen" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Entfernen" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Warp" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Zaubersprüche" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Lade alte Zaubersprüche" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Bearbeite Zauberspruch" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Hervorhebung abschalten" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Hervorhebung einschalten" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" -msgstr "" +msgstr "Lösche den Namen nicht" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Lösche Name" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Aktiviere abwesend" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Deaktiviere abwesend" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Verlassen" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "Kopiere in die Zwischenablage" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Position der Gilde ändern" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Kartenzeichen umbenennen" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Name:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Spieler Kommentar " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Kommentar: " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "10 zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Die hälfte zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Allles zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "10 aufbewahren" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Die Hälfte aufbewahren" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Alles aufbewahren" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Alles fallenlassen" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "10 abholen" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Die Hälfte abholen" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Alles abholen" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Lade alte Tastenkombinationen für Objekte" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Lade alte Tastenkombinationen zum fallen Lassen" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Verstecken" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Zeigen" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Setze gelben Balken zurück" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Kopiere zu Chat" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(normal)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Nach oben" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Nach unten" @@ -1866,7 +1866,7 @@ msgstr "Limitiere max Zeilen im Chat" #: src/gui/setup_chat.cpp:79 msgid "Logs" -msgstr "" +msgstr "Logs" #: src/gui/setup_chat.cpp:81 msgid "Enable chat Log" @@ -1886,7 +1886,7 @@ msgstr "Verstecke Laden-Mitteilungen" #: src/gui/setup_chat.cpp:94 msgid "Tabs" -msgstr "" +msgstr "Tabs" #: src/gui/setup_chat.cpp:96 msgid "Put all whispers in tabs" @@ -1914,7 +1914,7 @@ msgstr "Zeige Kampf-Ereignisse" #: src/gui/setup_chat.cpp:114 msgid "Resize chat tabs if need" -msgstr "" +msgstr "Größe der Chat-Tabs anpassen" #: src/gui/setup_chat.cpp:118 msgid "Time" @@ -1930,7 +1930,7 @@ msgstr "Sonstig" #: src/gui/setup_chat.cpp:125 msgid "Highlight words (separated by comma)" -msgstr "" +msgstr "Wörter hervorheben (welche mit Komma getrennt sind)" #: src/gui/setup_chat.cpp:128 msgid "Show MVP messages" @@ -2065,7 +2065,7 @@ msgstr "HP-Balken von Monster anzeigen" #: src/gui/setup_other.cpp:60 msgid "Cycle monster targets" -msgstr "Angriffsziele der Monster einkreisen" +msgstr "Durch die Angriffsziele wechseln" #: src/gui/setup_other.cpp:66 msgid "Show warps particles" @@ -2109,7 +2109,7 @@ msgstr "" #: src/gui/setup_other.cpp:97 msgid "Moving" -msgstr "" +msgstr "Bewegt sich" #: src/gui/setup_other.cpp:99 msgid "Auto fix position" @@ -2161,7 +2161,7 @@ msgstr "Zeige Job" #: src/gui/setup_other.cpp:135 msgid "Enable attack filter" -msgstr "" +msgstr "Aktiviere Attackenfilter" #: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" @@ -2189,7 +2189,7 @@ msgstr "Aktiviere auction bot unterstützung" #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" -msgstr "" +msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support" #: src/gui/setup_other.cpp:168 msgid "Enable server side attack" @@ -2225,7 +2225,7 @@ msgstr "Bessere Leistung (aktiviere für bessere Leistung)" #: src/gui/setup_perfomance.cpp:58 msgid "Auto adjust perfomance" -msgstr "" +msgstr "Performance autom. anpassen" #: src/gui/setup_perfomance.cpp:61 msgid "Hw acceleration" @@ -2249,7 +2249,7 @@ msgstr "" #: src/gui/setup_perfomance.cpp:77 msgid "Show beings transparency" -msgstr "" +msgstr "Zeige die Transperenz von Entitäten" #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." @@ -2357,7 +2357,7 @@ msgstr "Alt" #: src/gui/setup_relations.cpp:249 msgid "Relations" -msgstr "" +msgstr "Beziehungen" #: src/gui/setup_relations.cpp:271 msgid "When ignoring:" @@ -2568,11 +2568,11 @@ msgstr "als Partikeleffekt" #: src/gui/setup_video.cpp:301 msgid "Enable resize" -msgstr "" +msgstr "Erlaube Größenanpassung" #: src/gui/setup_video.cpp:302 msgid "No frame" -msgstr "" +msgstr "Kein Fensterrahmen" #: src/gui/setup_video.cpp:306 msgid "FPS limit:" @@ -2685,7 +2685,7 @@ msgstr "Zeige Links in Ankündigung" #: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150 msgid "Auction" -msgstr "" +msgstr "Auktion" #: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 @@ -2710,6 +2710,14 @@ msgstr "Erhöhen" msgid "Skill points available: %d" msgstr "Fähigkeitspunkte verfügbar: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2720,6 +2728,11 @@ msgstr "Fähigkeiten Tab %d" msgid "Skill %d" msgstr "Fähigkeit %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2730,204 +2743,204 @@ msgstr "Lvl: %d" msgid "Lvl: %d (%+d)" msgstr "Lvl: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gilde" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "%s in die Gilde %s einladen." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Gilde %s Ausstieg angefragt," -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Lade Mitglied in die Gilde ein." -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Wenn willst du in die Gilde %s einladen?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Guilde verlassen?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Party" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "%s zur Party einladen." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Partie %s Auflösung beauftragt." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Lade Mitglied in die Party ein." -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Wenn willst du zur Party %s einladen?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Partie verlassen?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Bist du sicher, dass du die Party %s verlassen willst?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Atk" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Ignoriere Monster" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Gilde erstellen" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Party erstellen" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Sozial" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Einladen" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" -msgstr "" +msgstr "P" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" -msgstr "" +msgstr "F" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Partyeinladung von %s angenommen." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Partyeinladung von %s abgelehnt." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Guildeneinladung von %s angenommen." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Guildeneinladung von %s abgelehnt." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Erstelle der Gilde %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Erstelle die Party \"%s\"" -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Gildenname" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Wähle den Namen deiner Gilde" -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Anfrage für eine Party erhalten, es wurde schoneinmal angefragt." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Nehme Gildeneinladung an" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "Du wurdest zu einer Party eingeladen." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "Du wurdest zu der Party %s eingeladen." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s hat dich in seine Party eingeladen." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Nehme Partyeinladung an" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Partyname" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Name deiner Party wählen." @@ -3119,33 +3132,33 @@ msgstr "" msgid "Name: %s" msgstr "Name : %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Aktualisiere..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Verbinde..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Los!" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 Update wurde nicht erfolgreich abgeschlossen." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 Es wird dringend empfohlen," #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 Du versuchts es später erneut." -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Fertig" @@ -3259,11 +3272,11 @@ msgstr "Portal hervorheben" #: src/gui/userpalette.cpp:151 msgid "Default collision Highlight" -msgstr "" +msgstr "Hervorhebung von normalen Kollisionen" #: src/gui/userpalette.cpp:153 msgid "Air collision Highlight" -msgstr "" +msgstr "Hervorhebung von Flug-Kollisionen" #: src/gui/userpalette.cpp:155 msgid "Water collision Highlight" @@ -3437,7 +3450,7 @@ msgstr "Befehl:/leave" #: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75 msgid "This command causes the player to leave the guild." -msgstr "" +msgstr "Dieser Kommando wirft einen Spieler aus der Gilde." #: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135 #: src/net/ea/gui/partytab.cpp:69 @@ -3454,7 +3467,7 @@ msgstr "/leave > Verlasse dir Gilde in der du bist" #: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138 msgid "/kick > Kick some one from the guild you are in" -msgstr "" +msgstr "/kick > Jemanden aus deiner Gilde werfen" #: src/gui/widgets/whispertab.cpp:107 msgid "/ignore > Ignore the other player" @@ -3565,7 +3578,7 @@ msgstr "WW" #: src/gui/windowmenu.cpp:98 msgid "YK" -msgstr "" +msgstr "WS" #: src/gui/windowmenu.cpp:98 msgid "Did you know" @@ -3593,11 +3606,11 @@ msgstr "Lager" #: src/inventory.cpp:253 msgid "Cart" -msgstr "" +msgstr "Einkaufswagen" #: src/keyboardconfig.cpp:43 msgid "Basic Keys" -msgstr "" +msgstr "Normale Tasten" #: src/keyboardconfig.cpp:44 msgid "Move Up" @@ -3645,7 +3658,7 @@ msgstr "Angriff abbrechen" #: src/keyboardconfig.cpp:65 msgid "Untarget" -msgstr "" +msgstr "Deselektieren" #: src/keyboardconfig.cpp:66 msgid "Target Closest" @@ -3665,7 +3678,7 @@ msgstr "Aufheben" #: src/keyboardconfig.cpp:72 msgid "Change Pickup Type" -msgstr "" +msgstr "Verändere den Aufnahme-Typ" #: src/keyboardconfig.cpp:74 msgid "Hide Windows" @@ -3693,11 +3706,11 @@ msgstr "OK auswählen" #: src/keyboardconfig.cpp:85 msgid "Shortcuts Keys" -msgstr "" +msgstr "Tastenkürzel" #: src/keyboardconfig.cpp:86 msgid "Item Shortcuts Key" -msgstr "" +msgstr "Item-Tastenkürzel" #: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90 #: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94 @@ -3845,7 +3858,7 @@ msgstr "Gefühlstaste %d" #: src/keyboardconfig.cpp:278 msgid "Outfits Keys" -msgstr "" +msgstr "Outfit Tasten" #: src/keyboardconfig.cpp:279 msgid "Wear Outfit" @@ -3937,7 +3950,7 @@ msgstr "Verrückte Bewegungen" #: src/keyboardconfig.cpp:320 msgid "Change Crazy Move mode" -msgstr "" +msgstr "Verändere den verrückte Bewegungen-Modus" #: src/keyboardconfig.cpp:322 msgid "Quick Drop N Items from 0 slot" @@ -3969,7 +3982,7 @@ msgstr "Wechsle magische Angriff" #: src/keyboardconfig.cpp:337 msgid "Switch pvp attack" -msgstr "" +msgstr "Wechsle PVP Attacke" #: src/keyboardconfig.cpp:338 msgid "Change move type" @@ -3977,7 +3990,7 @@ msgstr "Wechsle die Bewegungsart" #: src/keyboardconfig.cpp:340 msgid "Change Attack Weapon Type" -msgstr "" +msgstr "Verändere die Angriffswaffe" #: src/keyboardconfig.cpp:342 msgid "Change Attack Type" @@ -4005,7 +4018,7 @@ msgstr "Aktiviere/Deaktiviere abwesend Modus" #: src/keyboardconfig.cpp:354 msgid "Emulate right click from keyboard" -msgstr "" +msgstr "Emuliere Rechts-Klick mit der Tastatur" #: src/keyboardconfig.cpp:356 msgid "Toggle camera mode" @@ -4024,430 +4037,438 @@ msgstr "" "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder " "das Spiel lässt sich nicht richtig steuern." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "Du wurdest von einem %s getötet" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Du versucht einen nicht exitierenden Gegenstand aufzuheben." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Gegenstand ist zu schwer" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Gegenstand ist zu weit weg." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "Inventar ist voll" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "Stapel ist zu groß" -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Gegenstand gehört jemand anderem" -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Fehler bei dem Aufheben des Items." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben." msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) normale Bewegungen" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) bewegungen umkehren" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" -msgstr "" +msgstr "(c) bewegt sich etwas verrückt" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" -msgstr "" +msgstr "(C) bewegt sich verrückt" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" -msgstr "" +msgstr "(d) normal + verrückt Bewegen" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) unbekannte Bewegung" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) benutzerdefinierte verrückte Bewegung" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) verrückte Bewegung" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" -msgstr "" +msgstr "(0) bewegt sich normal zum Ziel" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" -msgstr "" +msgstr "(0) bewegt sich zum Ziel in Distanz 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" -msgstr "" +msgstr "(2) bewegt sich zum Ziel in Distanz 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" -msgstr "" +msgstr "(3) bewegt sich zum Ziel in Distanz 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" -msgstr "" +msgstr "(5) bewegt sich zum Ziel in Distanz 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" -msgstr "" +msgstr "(7) bewegt sich zum Ziel in Distanz 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" -msgstr "" +msgstr "(A) bewegt sich zum Ziel in Reichweite" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) Bogenschützen Angriffsreichweite" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" -msgstr "" +msgstr "(?) bewegt sich zu jedem Ziel" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" -msgstr "" +msgstr "(D) normales Folgen" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" -msgstr "" +msgstr "(R) relatives Folgen" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" -msgstr "" +msgstr "(M) gespiegeltes Folgen" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" -msgstr "" +msgstr "(P) hinterher Folgen" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" -msgstr "" +msgstr "(?) unbekannter Folge-Modus" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) Angriff" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) Normaler Angriff" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" -msgstr "" +msgstr "(s) wechsel das Attackenlayout ohne Schild" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" -msgstr "" +msgstr "(S) wechsel das Attackenlayout mit Schild" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) gehe und greife an" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) gehe, greife an, hebe auf" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) ohne automatischen Angriff" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) kleine aufhebe Zelle 1x1" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) normale aufhebe Zelle 2x1" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" -msgstr "" +msgstr "(F) 2x3 Kästchen nach vorne aufheben" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" -msgstr "" +msgstr "(3) 3x3 Kästchen aufheben" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" -msgstr "" +msgstr "(g) bis Distanz 4 gehen und aufheben" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" -msgstr "" +msgstr "(G) bis Distanz 8 gehen und aufheben" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" -msgstr "" +msgstr "(A) bis zur maximalen Distanz aufheben" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) aufheben" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) Normale Kartenansicht" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) Debug Kartenansicht" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) Ultra Kartenansicht" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) Ultra Kartenansicht 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) Leere Kartenansicht" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) Schwarz-Weiß Kartenansicht" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) benutze #flar als magischen Angriff" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) benutze #chiza als magischen Angriff" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) benutze #ingrav als magischen Angriff" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) benutze #frillyar als magischen Angriff" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) benutze #upmarmu als magischen Angriff" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) magischer Angriff" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" -msgstr "" +msgstr "(a) greife alle Spieler an" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" -msgstr "" +msgstr "(b) greife schlechte Beziehungen an" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) greife keine Spieler an" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" -msgstr "" +msgstr "(?) PVP Attacke" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) normale Imitation" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) Outfit Imitation" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) Imitation" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Abwesend" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) Anwesend" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) Abwesend" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) Abwesend" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" -msgstr "" +msgstr "(G) spielerverfolgende Kamera" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" -msgstr "" +msgstr "(F) freie Kamera" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Spielmodifikatoren sind aktiviert" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Spielmodifikatoren sind deaktiviert" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Folgen:" -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Folgen abgebrochen" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitation abgebrochen" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Du siehst" -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [options] [manaplus-file]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Optionen:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr "-l --log-file : Log Datei benutzen" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Verzeichnis für die Chat Log" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Die Version des Spieles anzeigen" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " - --help : Zeigt diesen Hilfstext an" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : zu benutzendes Einstellungsverueichniss" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Mit angegebenem Benutzernamen anmelden" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : Angegebenes Passwort benutzen" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --charakter : Mit angegebenem Spieler anmelden" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Name oder IP-Adresse des Loginservers" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Port des Loginservers" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Benutzt diesen Aktualisierungs Host" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Wähle zuletzt benutzten Server und Spieler aus" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Überspringe das Herunterladen von Updates" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Verzeichnis um Bildschirmfotos zu speichern" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr "--safemode : Starte das Spiel im sicheren Modus" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr "--no-opengl : Deaktiviere OpenGL für diese Sitzung" @@ -4490,6 +4511,7 @@ msgstr "Glück:" #: src/net/ea/charserverhandler.cpp:115 msgid "Access denied. Most likely, there are too many players on this server." msgstr "" +"Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server." #: src/net/ea/charserverhandler.cpp:119 msgid "Cannot use this ID." @@ -4502,22 +4524,24 @@ msgstr "Unbekannter char-server Fehler" #: src/net/ea/charserverhandler.cpp:151 msgid "Failed to create character. Most likely the name is already taken." msgstr "" +"Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wurde der Name " +"schon genommen." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Falscher Name." #: src/net/ea/charserverhandler.cpp:158 msgid "Incorrect stats." -msgstr "" +msgstr "Falsche Stats." #: src/net/ea/charserverhandler.cpp:161 msgid "Incorrect hair." -msgstr "" +msgstr "Falsche Haare." #: src/net/ea/charserverhandler.cpp:164 msgid "Incorrect slot." -msgstr "" +msgstr "Falscher Slot." #: src/net/ea/charserverhandler.cpp:167 msgid "Incorrect race." @@ -4540,7 +4564,7 @@ msgstr "Konnte Character nicht löschen." #: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89 #: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102 msgid "Channels are not supported!" -msgstr "" +msgstr "Kanäle sind nicht unterstützt!" #: src/net/ea/chathandler.cpp:129 #, c-format @@ -4550,7 +4574,7 @@ msgstr "Flüstern konnte nicht gesendet werden, %s ist nicht online." #: src/net/ea/chathandler.cpp:137 #, c-format msgid "Whisper could not be sent, ignored by %s." -msgstr "" +msgstr "Konnte nicht flüstern. Ignoriert von %s." #: src/net/ea/chathandler.cpp:346 msgid "MVP player." @@ -4587,7 +4611,7 @@ msgstr "Spiel" #: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" -msgstr "" +msgstr "Verlassen verweigert!" #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85 msgid "Guild created." @@ -4599,11 +4623,11 @@ msgstr "Du bist bereits in der Gilde" #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." -msgstr "" +msgstr "Erstellung der Gilde fehlgeschlagen." #: src/net/ea/guildhandler.cpp:103 msgid "Unknown server response." -msgstr "" +msgstr "Unbekannte Antwort des Servers." #: src/net/ea/guildhandler.cpp:180 #, c-format @@ -4628,27 +4652,27 @@ msgstr "Mitglieder Online: %d" #: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" -msgstr "" +msgstr "Max Mitglieder: %d" #: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" -msgstr "" +msgstr "Durchschn. Level: %d" #: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" -msgstr "" +msgstr "Gilden-EP: %d" #: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" -msgstr "" +msgstr "Verbl. Gilden-EP: %d" #: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" -msgstr "" +msgstr "Gildenburg: %s" #: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." @@ -4656,11 +4680,11 @@ msgstr "Kann Spieler nicht in die Gilde einladen." #: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." -msgstr "" +msgstr "Spieler hat die Gildeneinladung abgelehnt." #: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." -msgstr "" +msgstr "Spieler ist nun in deiner Gilde." #: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." @@ -4668,7 +4692,7 @@ msgstr "Deine Guilde ist voll." #: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." -msgstr "" +msgstr "Unbekannte Antwort auf Gildeneinladung." #: src/net/ea/guildhandler.cpp:464 #, c-format @@ -4698,19 +4722,19 @@ msgstr "/kick > werfen jemanden aus deiner Gilde raus" #: src/net/ea/gui/partytab.cpp:73 msgid "/item > Show/change party item sharing options" -msgstr "" +msgstr "/item > Zeige/ändere Party Item Einstellungen" #: src/net/ea/gui/partytab.cpp:74 msgid "/exp > Show/change party experience sharing options" -msgstr "" +msgstr "/exp > Zeige/ändere Party EP Einstellungen" #: src/net/ea/gui/partytab.cpp:84 msgid "This command invites to party with you." -msgstr "" +msgstr "Dieser Kommando läd in deine Party ein." #: src/net/ea/gui/partytab.cpp:91 msgid "This command causes the player to leave the party." -msgstr "" +msgstr "Dieser Kommando wirft einen Spieler aus der Party." #: src/net/ea/gui/partytab.cpp:95 msgid "Command: /item " @@ -4718,13 +4742,15 @@ msgstr "Befehl: /item " #: src/net/ea/gui/partytab.cpp:97 msgid "This command changes the party's item sharing policy." -msgstr "" +msgstr "Dieser Kommando ändert die Item Einstellungen" #: src/net/ea/gui/partytab.cpp:98 msgid "" " can be one of \"1\", \"yes\", \"true\" to enable item sharing, or " "\"0\", \"no\", \"false\" to disable item sharing." msgstr "" +" kann \"1\", \"yes\", \"true\" zum aktivieren von Item-Sharing, oder " +"\"0\", \"no\", \"false\" sein, um es zu deaktivieren." #: src/net/ea/gui/partytab.cpp:101 msgid "Command: /item" @@ -4732,21 +4758,23 @@ msgstr "Befehl: /item" #: src/net/ea/gui/partytab.cpp:102 msgid "This command displays the party's current item sharing policy." -msgstr "" +msgstr "Dieser Kommando zeigt die derzeitigen Item Einstellungen der Party." #: src/net/ea/gui/partytab.cpp:107 msgid "Command: /exp " -msgstr "" +msgstr "Kommando: /exp " #: src/net/ea/gui/partytab.cpp:108 msgid "This command changes the party's experience sharing policy." -msgstr "" +msgstr "Dieser Kommando verändert die EP Einstellungen der Party." #: src/net/ea/gui/partytab.cpp:110 msgid "" " can be one of \"1\", \"yes\", \"true\" to enable experience " "sharing, or \"0\", \"no\", \"false\" to disable experience sharing." msgstr "" +" kann \"1\", \"yes\", \"true\" zum aktivieren von EP-Sharing, oder " +"\"0\", \"no\", \"false\" sein, um es zu deaktivieren." #: src/net/ea/gui/partytab.cpp:113 msgid "Command: /exp" @@ -4754,23 +4782,23 @@ msgstr "Befehl:/exp" #: src/net/ea/gui/partytab.cpp:114 msgid "This command displays the party's current experience sharing policy." -msgstr "" +msgstr "Dieser Kommando zeigt die derzeitigen EP Einstellungen." #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285 msgid "Item sharing enabled." -msgstr "" +msgstr "Item-Sharing aktiviert." #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295 msgid "Item sharing disabled." -msgstr "" +msgstr "Item-Sharing deaktiviert." #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305 msgid "Item sharing not possible." -msgstr "" +msgstr "Item-Sharing ist nicht möglich." #: src/net/ea/gui/partytab.cpp:157 msgid "Item sharing unknown." -msgstr "" +msgstr "Item-Sharing unbekannt." #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247 msgid "Experience sharing enabled." @@ -4796,72 +4824,74 @@ msgstr "Kann diesen Gegenstand nicht verwenden." msgid "Unable to equip." msgstr "Kann nicht Ausrüsten." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Account nicht gefunden. Bitte noch einmal anmelden." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Altes Passwort fehlerhaft" -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Das neue Passwort ist zu kurz." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Unbekannter Fehler" -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "Unbekannte ID" -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Falsches Passwort." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "Account abgelaufen." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." -msgstr "" +msgstr "Vom Server abgelehnt." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." -msgstr "" +msgstr "Du wurdest für immer gebannt. Bitte kontaktiere das GM-Team." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Client zu alt" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" +"Du wurdest bis %s gebannt.\n" +"Bitte kontaktiere das GM-Team via der Foren." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." -msgstr "" +msgstr "Server ist voll." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Dieser Benutzername ist bereits in Verwendung" -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." -msgstr "" +msgstr "Benutzername für Immer gelöscht." #: src/net/ea/partyhandler.cpp:80 msgid "Could not create party." -msgstr "" +msgstr "Konnte Party nicht erstellen." #: src/net/ea/partyhandler.cpp:82 msgid "Party successfully created." @@ -4880,7 +4910,7 @@ msgstr "%s is bereits ein Mitglied deiner Party." #: src/net/ea/partyhandler.cpp:179 #, c-format msgid "%s refused your invitation." -msgstr "" +msgstr "%s hat die Einladung abgelehnt." #: src/net/ea/partyhandler.cpp:184 #, c-format @@ -4890,12 +4920,12 @@ msgstr "%s ist nun ein Mitglied deiner Party" #: src/net/ea/partyhandler.cpp:189 #, c-format msgid "%s can't join your party because party is full." -msgstr "" +msgstr "%s kann deiner Party nicht beitreten. Sie ist voll." #: src/net/ea/partyhandler.cpp:194 #, c-format msgid "QQQ Unknown invite response for %s." -msgstr "" +msgstr "QQQ Unbekannte Antwort auf die Einladung für %s." #: src/net/ea/partyhandler.cpp:358 msgid "You have left the party." @@ -4989,7 +5019,7 @@ msgstr "Du bit tot." #: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." -msgstr "" +msgstr "Du bist nicht mehr..." #: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." @@ -5020,12 +5050,14 @@ msgstr "Du bist weg vom Fenster." #: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" +"Du schaust dir die Gänseblümchen\n" +"gerade von unten an." #: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." -msgstr "" +msgstr "\"Übung macht den Meister\", meint das Monster." #: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." @@ -5050,6 +5082,7 @@ msgstr "" #: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" +"Du trägst weniger als die hälfte des Gewichts. Du kannst dich regenerieren." #: src/net/ea/playerhandler.cpp:453 #, c-format @@ -5059,7 +5092,7 @@ msgstr "Du hast %s aufgehoben." #: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." -msgstr "" +msgstr "Du bezahltest %s." #: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" @@ -5091,7 +5124,7 @@ msgstr "Konnte Party nicht beitreten!" #: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" -msgstr "" +msgstr "Du kannst nicht schreien!" #: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" @@ -5099,11 +5132,11 @@ msgstr "Du hast noch ein zu niedriges Level!" #: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" -msgstr "" +msgstr "Unausreichende HP!" #: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" -msgstr "" +msgstr "Unausreichende SP!" #: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" @@ -5143,11 +5176,11 @@ msgstr "Warp fehlgeschlagen..." #: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." -msgstr "" +msgstr "Konnte nichts stehlen..." #: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." -msgstr "" +msgstr "Gift hatte kein Effekt..." #: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128 #, c-format @@ -5178,11 +5211,11 @@ msgstr "Handel mit %s abgebrochen" #: src/net/ea/tradehandler.cpp:172 msgid "Unhandled trade cancel packet." -msgstr "" +msgstr "Unbehandeltes Handel-Fehlschlags-Paket." #: src/net/ea/tradehandler.cpp:237 msgid "Failed adding item. Trade partner is over weighted." -msgstr "" +msgstr "Fehlschlag: Der Handelspartner kann nichts mehr Tragen." #: src/net/ea/tradehandler.cpp:242 msgid "Failed adding item. Trade partner has no free slot." @@ -5511,7 +5544,7 @@ msgstr "Verkauf fehlgeschlagen." #: src/net/tmwa/buysellhandler.cpp:140 msgid "Unable to sell while trading." -msgstr "" +msgstr "Handeln fehlgeschlagen." #: src/net/tmwa/buysellhandler.cpp:143 msgid "Unable to sell unsellable item." @@ -5616,7 +5649,7 @@ msgstr "Angriffs Verzögerung" #: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" -msgstr "" +msgstr "Lauf-Verzögerung:" #: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" diff --git a/po/es.po b/po/es.po index 63a36ccf4..cdbb59b52 100644 --- a/po/es.po +++ b/po/es.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-02 19:32+0000\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:20+0000\n" "Last-Translator: Nelson Martell \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" "manaplus/team/es/)\n" @@ -45,47 +45,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuración" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Rendimiento" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vídeo" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "Temas" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Conectando al servidor" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Accediendo a la cuenta" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Entrando al mundo del juego" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Cargando personajes" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Conectando al servidor del juego" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Cambiando servidores del juego" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,50 +95,50 @@ msgstr "Cambiando servidores del juego" msgid "Error" msgstr "Error" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Solicitando detalles de registro" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Cambio de contraseña" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "¡Contraseña cambiada exitosamente!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Cambio de Email" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "¡Email modificado exitosamente!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Registro cancelado" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Adiós, vuelve cuando quieras..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "¡%s no existe y no puede ser creado! Saliendo." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Servidor de actualización inválido: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "¡Error al crear la carpeta de actualizaciones!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo." @@ -323,43 +323,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "General" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Depurador" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Captura de pantalla guardada como " -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "¡El guardado de la captura de pantalla ha fallado!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "Se ha perdido la conexión con el servidor." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Error de Red" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Ignorando las peticiones de intercambio" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Aceptando las peticiones de intercambio" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "No se pudo cargar el mapa" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Error mientras cargaba %s" @@ -392,20 +392,20 @@ msgstr "Bot Checker" msgid "Name" msgstr "Nombre" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Hablar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Mover" @@ -418,8 +418,8 @@ msgid "Reset" msgstr "Restablecer" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Comprar" @@ -467,8 +467,8 @@ msgstr "Máximo" msgid "Shop" msgstr "Tienda" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -478,18 +478,18 @@ msgstr "Vender" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Cancelar" @@ -525,7 +525,7 @@ msgstr "Los correos ingresados no concuerdan." msgid "Change Password" msgstr "Cambiar contraseña" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Contraseña:" @@ -557,7 +557,7 @@ msgid "New Character" msgstr "Nuevo Personaje" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Nombre:" @@ -593,7 +593,7 @@ msgid "Race:" msgstr "Race:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Crear" @@ -736,7 +736,7 @@ msgid "rainbow 3" msgstr "arco iris 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -767,13 +767,13 @@ msgstr "Sí" msgid "No" msgstr "No" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Ignorar" @@ -913,25 +913,25 @@ msgstr "Recibiendo: %d bytes/s" msgid "Out: %d bytes/s" msgstr "Enviando: %d bytes/s" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "¿Sabías que...?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Cerrar" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Previo" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Siguiente >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Abrir automáticamente esta ventana" @@ -972,12 +972,12 @@ msgstr "Equipamiento" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Quitárselo" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Ayuda" @@ -1015,31 +1015,31 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Tirar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Dividir" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Conjuntos" @@ -1048,17 +1048,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Almacenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Recuperar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Tirar" @@ -1200,43 +1200,43 @@ msgstr "jacko apareciendo" msgid "You have left the guild." msgstr "Has dejado el clan." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normal" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Cerrar automáticamente" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Saltar" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Inicio de sesión" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Servidor:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Host de actualización personalizado" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Recordar nombre de usuario" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Actualizar:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Registrar" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Cambiar de servidor" @@ -1297,7 +1297,7 @@ msgstr "Enviar" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Limpiar" @@ -1332,355 +1332,355 @@ msgstr "Quitárselo antes" msgid "Away outfit" msgstr "Conjunto para modo AFK" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Intercambio" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Susurrar" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Sanar" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Ser amigo" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Desatender" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Lista negra" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Fijar como enemigo" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Borrar" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Des-ignorar" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Imitación" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Invitar a grupo" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Sacar del grupo" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Sacar del clan" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Cambiar posición en el clan" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Invitar al clan" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Sacar jugador" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Eliminar" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Mostrar artículos" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Desvestir" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Agregar comentario" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Vender (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Sacar" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Remover de la lista de ataque" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Añadir a la lista de ataque prioritaria" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Agregar a la lista de ataque" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Agregar a la lista de ignorados" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Agregar nombre al chat" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Jugadores" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Recoger" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Añadir al chat" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Mapa Objeto" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Renombrar" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Quitar" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Deformar" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "Limpiar vestimenta" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Hechizos" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Cargar hechizos antiguos" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Editar hechizo" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Deshabilitar resaltado" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Habilitar resaltado" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "No remover nombre" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Remover nombre" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Habilitar ausencia" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Deshabilitar ausencia" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Dejar" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "Copiar al portapapeles" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Cambiar posición del Clan" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Renombrar señal del mapa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Nombre: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Comentario del jugador " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Comentario: " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Agregar al intercambio" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Agregar 10 al intercambio" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Agregar la mitad al intercambio" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Agregar todo al intercambio" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Almacenar 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Almacenar la mitad" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Almacenar todo" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Tirar todo" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Recuperar 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Recuperar la mitad" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Recuperar todo" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Cargar atajos antiguos de artículos" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Cargar atajos para tirar antiguos" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Restablecer barra amarilla" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copiar al chat" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(predeterminado)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Subir" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Bajar" @@ -2703,6 +2703,14 @@ msgstr "Incrementar" msgid "Skill points available: %d" msgstr "Puntos de habilidades: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "básico" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "Habilidad: básico, Id: 1" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2713,6 +2721,11 @@ msgstr "Habilidades %d" msgid "Skill %d" msgstr "Habilidad %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "Habilidad: %s, Id: %d" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2723,204 +2736,204 @@ msgstr "Nivel: %d" msgid "Lvl: %d (%+d)" msgstr "Nivel: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Clan" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Invita al jugador %s al clan %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Clan %s pidiendo salir." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Miembro invitado al clan." -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "A quién te gustaría invitar al clan %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "¿Dejar el clan?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "¿Estás seguro de dejar el clan %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupo" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Jugador %s invitado al grupo." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Grupo %s requisitado." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Invitación de un miembro al grupo" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "¿A quién te gustaría invitar al grupo %s?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "¿Dejar grupo?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "¿Estás seguro de que quieres dejar el grupo %s?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Navegación" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Ataque" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Criaturas prioritarias" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Criaturas atacadas" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Criaturas ignoradas" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Crear Clan" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Crear grupo" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Invitar" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "J" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "A" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Aceptada la invitación de %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Cancelada la invitación de %s." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Aceptada la invitación al clan de %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Rechazada la invitación al clan de %s." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Creando clan llamado %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Creando grupo llamado %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Nombre del clan" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Escoge el nombre de tu clan." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Recibida petición de creación del clan, pero ya existe." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s te ha invitado al clan %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Aceptar invitación al clan" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Recibida petición de creación del grupo, pero ya existe." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "Fuiste invitado a un grupo." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "Has sido invitado para unirte al grupo %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s te ha invitado a unirte a su grupo." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s te ha invitado para unirte al grupo %s." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Aceptar invitación al grupo" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "No se pudo crear un grupo. Ya estás en uno." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Nombre del grupo" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Escoge el nombre del grupo." @@ -3112,33 +3125,33 @@ msgstr "" msgid "Name: %s" msgstr "Nombre: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Actualizando..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Jugar" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 El proceso de actualización esta incompleto." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 Es altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 lo intentes de nuevo más tarde." -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Completado" @@ -4014,431 +4027,439 @@ msgstr "" "Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego " "puede presentar un comportamiento raro." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "Fuiste eliminado por %s" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Intentaste recoger un objeto inexistente." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "El artículo es muy pesado." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "El artículo está muy lejos." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "El inventario está lleno." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "El agrupamiento es demasiado grande." -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "El artículo pertenece a alguien más." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Problema desconocido al intentar recoger el artículo." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Recogiste un %d [@@%d|%s@@]." msgstr[1] "Recogiste unos %d [@@%d|%s@@]." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "xp" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "trabajo" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) moverse predeterminado" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) moverse invertido" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) moverse con algunos movimientos locos" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) moverse con movimientos locos" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) doble normal + loco" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) movimiento desconocido" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) movimiento loco número %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) maniobra alocada personalizada" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) maniobra loca" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) moverse por defecto hacia el objetivo" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) moverse al objetivo en distancia 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) moverse al objetivo en distancia 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) moverse al objetivo en distancia 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) moverse al objetivo en distancia 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) moverse al objetivo en distancia 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) desplazarse al objetivo en el rango de ataque" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) rango de ataque de arquero" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) mover al objetivo" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) seguimiento predeterminado" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) seguimiento relativo" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) seguimiento tipo espejo" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) seguimiento como mascota" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) seguimiento desconocido" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) atacar" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) ataque predeterminado" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) intercambiar ataque sin escudo" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) intercambiar ataque con escudo" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) ir y atacar" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) ir, atacar, recoger" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) sin atacar automáticamente" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) recoger a 1x1 celdas (pequeño)" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) recoger a 2x1 celdas (predeterminado)" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) recoger interesadamente a 2x3 celda" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) recoger a 3x3 celdas" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) ir y recoger en distancia 4" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) ir y recoger en distancia 8" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) ir y recoger a máxima distancia" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) recoger" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) vista normal del mapa" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) vista depurar del mapa" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) ultra vista del mapa" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) ultra vista del mapa 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) vista vacía del mapa" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) vista del mapa en blanco y negro" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) usar #flar para ataque mágico" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) usar #chiza para ataque mágico" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) usar #ingrav para ataque mágico" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) usar #frillyar para ataque mágico" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) usar #upmarmu para ataque mágico" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) ataque mágico" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) atacar a todos los jugadores" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" -msgstr "(f) atacar a los que no son amigos" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" +msgstr "(f) atacar a todos, excepto a amigos" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) atacar a quienes están en malas relaciones" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) no atacar a los jugadores" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) ataque pvp" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) imitación predeterminada" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) imitación de conjuntos" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) imitación" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Fuera del Teclado" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) en el teclado" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) lejos del teclado" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) afuera" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) modo de cámara de juego" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) modo de cámara libre" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Modificadores del juego están habilitados" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Modificadores del juego están deshabilitados" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "Los modificadores del juego son desconocidos" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Seguir: " -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Imitación: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitación cancelada" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Ves " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opciones] [manaplus-file]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr " usado para establecer parámetros personalizados." -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr " al cliente manaplus." -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Opciones:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Archivo de registro a usar" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Directorio a usar para registro del Chat" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Muestra la versión" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Muestra la ayuda" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Carpeta de Configuración a usar" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Acceder con este nombre de usuario" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : Acceder con la contraseña" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character : Acceder con este jugador" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login server o IP" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Puerto del servidor" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Usar este host de actualización" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Escoje el personaje por defecto y el servidor" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Saltarse las actualizaciones" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Carpeta por donde cargar los datos del juego" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Carpeta para usar los datos locales" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Carpeta donde guardar los screenshots" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Iniciar el juego en modo seguro" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : Comenzar a probar controladores y auto configurar" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Deshabilita OpenGL en esta sesion" @@ -4496,7 +4517,7 @@ msgstr "Falla char-server desconocida." msgid "Failed to create character. Most likely the name is already taken." msgstr "Error al crear personaje. Probablemente ya esté en uso." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Nombre equivocado." @@ -4799,53 +4820,53 @@ msgstr "Fallo al usar el artículo." msgid "Unable to equip." msgstr "Imposible equipar." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Contraseña antigua incorrecta." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Nueva contraseña es muy corta." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Error desconocido." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "ID no registrada." -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Contraseña incorrecta." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "La cuenta expiró." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Rechazado del servidor." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" "Has sido proscrito permanentemente del juego. Por favor contacta con el " "equipo de GM." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Cliente es demasiado antiguo." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4854,15 +4875,15 @@ msgstr "" "Has sido proscrito temporalmente del juego hasta %s.\n" "Por favor contacta al equipo de GM a través de los foros." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Servidor sobrepoblado." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Este nombre de usuario ya está escogido." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Nombre de usuario borrado permanentemente." diff --git a/po/fi.po b/po/fi.po index c015ef94e..c09731088 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-02 16:45+0000\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: LANGUAGE \n" "Language: fi\n" @@ -41,47 +41,47 @@ msgstr "P" msgid "I" msgstr "-" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Asetukset" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Tehokkuus" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Kuva" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "Teemat" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Yhdistän palvelimeen" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Kirjaudun sisään" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Siirryn pelimaailmaan" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Pyydän hahmoja" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Yhdistän pelipalvelimeen" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Vaihdan pelipalvelinta" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -91,50 +91,50 @@ msgstr "Vaihdan pelipalvelinta" msgid "Error" msgstr "Virhe" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Pyydän rekisteröitymisen yksityiskohtia" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Salasanan vaihto" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Salasana vaihdettu onnistuneesti!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Sähköpostin vaihto" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Sähköpostiosoite vaihdettu onnistuneesti!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Tietojen poisto onnistui" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Näkemisiin, tule pian takaisin..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Epäkelpo päivitysosoite: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Päivityshakemistoa luodessa tapahtui virhe!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun." @@ -320,43 +320,43 @@ msgstr "" "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti " "\"true\", \"false\", \"1\" tai \"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Yleiset" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Debug" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Ruutukaappaus tallennettu nimellä " -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Ruutukaappauksen tallentaminen epäonnistui!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "Yhteys palvelimeen katkesi." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Verkkovirhe" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Et huomioi kaupankäyntipyyntöjä" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Hyväksyt kaupankäyntipyynnöt" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Kartan lataaminen epäonnistui" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Kohdetta %s ladattaessa tapahtui virhe." @@ -389,20 +389,20 @@ msgstr "Bottitutka" msgid "Name" msgstr "Nimi" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Hyökkää" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Keskustele" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Liiku" @@ -415,8 +415,8 @@ msgid "Reset" msgstr "Nollaa" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Osta" @@ -464,8 +464,8 @@ msgstr "Max" msgid "Shop" msgstr "Kauppa" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -475,18 +475,18 @@ msgstr "Myy" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Peru" @@ -522,7 +522,7 @@ msgstr "Annetut sähköpostiosoitteet eivät täsmää." msgid "Change Password" msgstr "Vaihda salasana" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Salasana:" @@ -554,7 +554,7 @@ msgid "New Character" msgstr "" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Nimi:" @@ -590,7 +590,7 @@ msgid "Race:" msgstr "Rotu: " #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Luo" @@ -733,7 +733,7 @@ msgid "rainbow 3" msgstr "sateenkaari 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -764,13 +764,13 @@ msgstr "Kyllä" msgid "No" msgstr "Ei" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Ohita" @@ -910,25 +910,25 @@ msgstr "Sisään: %d tavua/s" msgid "Out: %d bytes/s" msgstr "Ulos: %d tavua/s" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Tiesitkö?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Sulje" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Edellinen" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Seuraava >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Avaa tämä ikkuna automaattisesti" @@ -968,12 +968,12 @@ msgstr "Varusteet" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Poista varuste käytöstä" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Apua" @@ -1011,31 +1011,31 @@ msgid "Filter:" msgstr "Suodin:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Ota käyttöön" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Käytä" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Pudota..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Jaa" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Asukokonaisuudet" @@ -1044,17 +1044,17 @@ msgid "Weight:" msgstr "Paino:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Varastoi" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Ota" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Pudota" @@ -1196,43 +1196,43 @@ msgstr "jacko elää!" msgid "You have left the guild." msgstr "Olet eronnut killasta." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Oletus" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Sulje kun valmis" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Ohita" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Kirjaudu sisään" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Palvelin:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Käytä omaa päivityspalvelinta" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Muista käyttäjätunnus" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Päivitys:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Rekisteröidy" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Vaihda palvelinta" @@ -1293,7 +1293,7 @@ msgstr "Lähetä" msgid "NPC" msgstr "Ei-pelaajahahmo (NPC)" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Tyhjennä" @@ -1328,355 +1328,355 @@ msgstr "Riisu ensin" msgid "Away outfit" msgstr "Poissaoloasu" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Tee kaupat" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Kuiskaa" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Paranna" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Ystävysty" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Vaimenna" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Musta lista" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Aseta viholliseksi" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Pyyhi" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Huomioi jälleen" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Jätä täysin huomiotta" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Seuraa" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Matki" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Kutsu ryhmään" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Potki ryhmästä" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Potki killasta" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Muuta kilta-asemaa" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Kutsu kiltaan" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Potki pelaaja" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Pommita" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Näytä tavarat" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Riisu" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Lisää kommentti" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Osta (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Myy (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Potki" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Poista hyökkäyslistasta" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Lisää prioriteettihyökkäyslistalle" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Lisää hyökkäyslistaan" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Lisää ohitettavien listaan" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Lisää nimi keskusteluun" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Pelaajat" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Poimi" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Lisää keskusteluun" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Karttaolio" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Nimeä uudelleen" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Poista" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Warppaa" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "Poista asu" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Loitsut" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Lataa vanhat loitsut" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Muokkaa loitsua" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Estä korostus" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Salli korostus" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "Älä poista nimeä" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Poista nimi" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Ota poissaolo käyttöön" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Poista poissaolo käytöstä" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Eroa" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "Kopioi leikepöydälle" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Muuta asemaa killassa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Muuta merkin nimeä " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Nimi: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Pelaajakommentti " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Kommentti: " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Lisää kauppaan" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Lisää 10 kauppaan" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Lisää puolet kauppaan" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Lisää kaikki kauppaan" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Varastoi 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Varastoi puolet" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Varastoi kaikki" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Pudota kaikki" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Ota 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Ota puolet" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Ota kaikki" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Lataa vanhat tavarapikavalinnat" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Lataa vanhat pudotuspikavalinnat" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Piilota" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Näytä" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Palauta oletusmuokkaimet (keltainen palkki)" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Kopioi keskusteluun" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(oletus)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Siirrä ylös" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Siirrä alas" @@ -2698,6 +2698,14 @@ msgstr "Ylös" msgid "Skill points available: %d" msgstr "%d taitopistettä käyttämättä" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2708,6 +2716,11 @@ msgstr "Taitojoukko %d" msgid "Skill %d" msgstr "Taito %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2718,204 +2731,204 @@ msgstr "Taso: %d" msgid "Lvl: %d (%+d)" msgstr "Taso: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Kilta" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Kutsuit käyttäjän %s kiltaan %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Killasta %s eroa pyydetty." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Jäsenen kutsuminen kiltaan" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Kenet haluaisit kutsua kiltaan %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Eroa killasta?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Haluatko varmasti erota killasta %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Ryhmä" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Käyttäjä %s kutsuttu ryhmään." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Ryhmästä %s eroamista pyydetty." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Jäsenen kutsuminen ryhmään" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Kenet haluaisit kutsua ryhmään %s?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Eroa ryhmästä?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Haluatko varmasti erota ryhmästä %s?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Hyö" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Priorisoidut kohteet" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Hyökkäyskohteet" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Ohitettavat kohteet" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Luo kilta" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Luo ryhmä" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Suhteet" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Kutsu" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Otit vastaan ryhmäkutsun pelaajalta %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Otit vastaan kiltakutsun pelaajalta %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Kieltäydyit pelaajan %s kiltakutsusta." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Luon killan %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Luon ryhmän %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Killan nimi" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Valitse killallesi nimi." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s on kutsunut sinut liittymään kiltaan %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Ota kiltakutsu vastaan" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "Sinut on kutsuttu liittymään ryhmään." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "Sinut on kutsuttu liittymään ryhmään %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s on kutsunut sinut liittymään ryhmäänsä." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Ota ryhmäkutsu vastaan" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Ryhmän nimi" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Anna ryhmällesi nimi." @@ -3105,33 +3118,33 @@ msgstr "Tavaran lisääminen epäonnistui, limittämisongelma." msgid "Name: %s" msgstr "Nimi: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Päivitetään..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Yhdistetään..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Pelaa" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 Päivitysprosessi keskeytyi" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 Suosittelemme vahvasti että" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 yrität myöhemmin uudelleen" -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Valmis" @@ -4008,431 +4021,439 @@ msgstr "" "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; " "ole hyvä ja poista päällekkäisyydet. " -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "Sinut tappoi %s." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Yritit poimia olemattoman tavaran." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Tavara on liian painava." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Tavara on liian kaukana." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "Sinulla on liikaa tavaraa ennestään." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "Kasa on liian suuri." -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Tavara kuuluu jollekulle muulle." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Tuntematon ongelma esti tavaran poimimisen." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu." msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) oletusliikkeet" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) käännetyt liikkeet" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) liikkuu osin villiliikkein" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) liikkuu villiliikkein" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) tuplaa tavallinen + villi" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) tuntematon liikkumistapa" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) villiliike nro %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) oma villiliike" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) villiliike" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) oletussiirtymä kohteen luo" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) siirry kohteen luo etäisyydellä 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) siirry kohteen luo etäisyydellä 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) siirry kohteen luo etäisyydellä 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) siirry kohteen luo etäisyydellä 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) siirry kohteen luo etäisyydellä 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) siirry kohteen luo hyökkäyskantamalla" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) jousiampujan hyökkäyskantama" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) siirry kohteen luo" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) oletusseuraaminen" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) suhteellinen seuraaminen" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) peilikuvaseuraaminen" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) lemmikkiseuraaminen" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) tuntematon seuraaminen" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) hyökkäys" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) oletushyökkäys" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) vaihda hyökkäystä, ei kilpeä" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) vaihda hyökkäystä, kilpi mukana" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) mene ja hyökkää" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) mene, hyökkää, poimi" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) ei automaattista hyökkäystä" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) pieni poiminta 1x1 ruutua" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) oletuspoiminta 2x1 ruutua" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) poiminta edestä 2x3 ruutua" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) poiminta 3x3 ruutua" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) mene ja poimi etäisyydellä 4" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) mene ja poimi etäisyydellä 8" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) mene ja poimi maksimietäisyydellä" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) poiminta" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) normaali karttanäkymä" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) debug-karttanäkymä" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) ultra-karttanäkymä" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) ultra-karttanäkymä 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) tyhjä karttanäkymä" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) mustavalkoinen karttanäkymä" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) #flar taikahyökkäyksenä" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) #chiza taikahyökkäyksenä" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) #ingrav taikahyökkäyksenä" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) #frillyar taikahyökkäyksenä" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) #upmarmu taikahyökkäyksenä" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) taikahyökkäys" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) hyökkää kaikkien pelaajien kimppuun" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" -msgstr "(f) säästä ystävät, listi muut" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" +msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) hyökkää jos huonot suhteet" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) älä hyökkää pelaajien kimppuun" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) pelaajien kanssa taistelu" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) oletusmatkinta" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) asun matkinta" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) matkinta" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Poissa" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) paikalla" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) poissa" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) poissaolo" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) pelin kameratila" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) vapaa kamera" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Pelimuokkaimet käytössä" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Pelimuokkaimet poissa käytöstä" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "Pelimuokkaimet ovat tuntemattomia" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Seuraa: " -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Seuraaminen keskeytetty" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Matki: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Matkiminen keskeytetty" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Näet " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [asetukset] [manaplus-tiedosto]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr " jolla asetetaan erikoisvalitsimia" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr " manaplus-ohjelmalle." -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Asetusvivut:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Käytettävä lokitiedosto" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Käytettävä keskustelulokihakemisto" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Näytä versionumero" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Näytä tämä ohje" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Käytä tätä asetushakemistoa" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Käyttäjätunnus sisäänkirjautumiseen" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : Salasana sisäänkirjautumiseen" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character : Hahmo sisäänkirjautumiseen" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr "" " -s --server : Palvelinnimi tai IP-osoite sisäänkirjautumiseen" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Palvelinportti sisäänkirjautumiseen " -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Käytä tätä päivityspalvelinta" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Aseta oletushahmopalvelin ja -hahmo" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Ohita päivityslataukset" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Lataa pelidata tästä hakemistosta" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Hakemisto paikallisdatan tallennukseen" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Kuvankaappausten tallennushakemisto" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Käynnistä peli vikasietotilassa" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr " -T --tests : Käynnistä ajuritestaus ja automaattiasetukset" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Poista OpenGL käytöstä tämän session ajaksi" @@ -4488,7 +4509,7 @@ msgstr "Tuntematon hahmopalvelinvirhe." msgid "Failed to create character. Most likely the name is already taken." msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Väärä nimi." @@ -4786,52 +4807,52 @@ msgstr "Tavaran käyttö ei onnistunut." msgid "Unable to equip." msgstr "Käyttöönotto ei onnistunut." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Tunnusta ei löytynyt. Yritä uudelleen." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Vanha salsana on väärä." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Uusi salasana on liian lyhyt." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Tuntematon virhe." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "Rekisteröimätön tunniste." -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Väärä salasana." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "Tili vanhentunut." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Palvelin ei kelpuuttanut yhteydenottoasi." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Liian vanha asiakasohjelma." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4840,15 +4861,15 @@ msgstr "" "Pääsysi peliin on väliaikaisesti estetty %s asti.\n" "Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Palvelin on täynnä." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Käyttäjätunnus on jo käytössä." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Käyttäjänimi pysyvästi poistettu." diff --git a/po/fr.po b/po/fr.po index c6a4d63a1..c25cc010e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-04 00:11+0000\n" -"Last-Translator: reid \n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" +"Last-Translator: Andrei Karas \n" "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/" "fr/)\n" "Language: fr\n" @@ -46,47 +46,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuration" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vidéo" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "Thèmes" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Connexion au serveur" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Connexion" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Vous entrez dans un nouveau monde" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Téléchargement des personnages" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Connexion au serveur de jeu" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Changement de serveur de jeu" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -96,50 +96,50 @@ msgstr "Changement de serveur de jeu" msgid "Error" msgstr "Erreur" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Demande des paramètres d'inscription" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Changement de mot de passe" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Le mot de passe a été changé avec succès !" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Changer d'e-mail" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "L'adresse e-mail a été changée avec succès !" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Désinscription réussie" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "A bientôt, revenez quand vous voudrez..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Site de mise à jour invalide : %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Impossible de créer le dossier de mise à jour !" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" @@ -326,44 +326,44 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Général" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Informations" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Capture d'écran sauvegardée sous" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "La sauvegarde de la capture d'écran a échoué !" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "" "La connexion au serveur a été coupée, le programme va maintenant se fermer." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Erreur Réseau" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Ignorer les requêtes d'échanges entrantes" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Accepter les requêtes d'échanges entrantes" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "La carte n'a pu être chargée" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Erreur durant le chargement %s" @@ -396,20 +396,20 @@ msgstr "Testeur de Robot" msgid "Name" msgstr "Nom" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Attaquer" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Parler" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Déplacement" @@ -422,8 +422,8 @@ msgid "Reset" msgstr "Réinitialiser" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Acheter" @@ -471,8 +471,8 @@ msgstr "Max." msgid "Shop" msgstr "Boutique" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -482,18 +482,18 @@ msgstr "Vendre" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Annuler" @@ -529,7 +529,7 @@ msgstr "Les deux adresses e-mail ne correspondent pas." msgid "Change Password" msgstr "Changer le mot de passe" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Mot de passe :" @@ -561,7 +561,7 @@ msgid "New Character" msgstr "Nouveau Personnage" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Nom :" @@ -597,7 +597,7 @@ msgid "Race:" msgstr "Race:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Créer" @@ -740,7 +740,7 @@ msgid "rainbow 3" msgstr "arc en ciel 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -771,13 +771,13 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Ignorer" @@ -917,25 +917,25 @@ msgstr "Entrée : %d bytes/s" msgid "Out: %d bytes/s" msgstr "Sortie : %d bytes/s" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Le saviez-vous ?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Fermer" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Précédent" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Suivant >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Ouverture automatique de cette fenêtre" @@ -975,12 +975,12 @@ msgstr "Équipement" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Retirer" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Aide" @@ -1018,31 +1018,31 @@ msgid "Filter:" msgstr "Filtre :" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Équiper" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Utiliser" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Jeter..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Partager" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Tenues" @@ -1051,17 +1051,17 @@ msgid "Weight:" msgstr "Poids :" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Entreposer" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Récupérer" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Jeter" @@ -1203,43 +1203,43 @@ msgstr "Arrivée de Jack0" msgid "You have left the guild." msgstr "vous avez quitté la guilde." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normal" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Fermeture automatique" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Sauter" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Compte" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Serveur :" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Serveur de mise à jour personnalisé" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Se souvenir du nom d'utilisateur" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Mise à jour : " -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "S'inscrire" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Changer de Serveur" @@ -1300,7 +1300,7 @@ msgstr "Soumettre" msgid "NPC" msgstr "PNJ" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Effacer" @@ -1335,355 +1335,355 @@ msgstr "Retirer d'abord l'équipement" msgid "Away outfit" msgstr "Équipement en absence" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Échange" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Message" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Soigner" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Être ami" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Éviter" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Liste noir" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Définir comme ennemi" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Éliminer" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Ne plus ignorer" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorer complètement" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Suivre" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Imiter" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Inviter dans le groupe" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Sortir du groupe" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Sortir de la guilde" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Changer la position dans la guilde" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Inviter dans la guilde" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Sortir le joueur" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Annihiler" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Montrer les objets" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Déshabiller" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Ajouter commentaire" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Acheter (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Vendre (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Virer" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Enlever de la liste d'attaque" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Ajouter à la liste de priorités d'attaque" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Ajouter à la liste d'attaque" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Ajouter à la liste d'ignorés" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Ajouter le nom dans la boite de dialogue" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Joueurs" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Ramasser" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Ajouter à la conversation" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Objet de carte" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Renommer" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Enlever" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Télétransportation" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "Nettoyer les tenues" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Sortilèges" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Charger les anciens sorts" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Éditer le sortilège" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Désactiver la surbrillance" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Activer la surbrillance" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "Ne pas enlever les noms" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Enlève le nom" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Active la fonction Absence" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Désactive la fonction Absence" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Quitter" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "Copier vers le presse-papier" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Changer la position de la Guilde" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Renommer le panneau de carte" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Nom : " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Le joueur commente " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Commentaire : " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Ajouter à la transaction" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Ajouter 10 dans l'échange" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Ajouter la moitié dans l'échange" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Ajouter tout dans l'échange" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Entreposer 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Entreposer la moitié" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Entreposer tout" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Jeter tout" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Reprendre 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Reprendre la moitié" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Reprendre tout" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Charger les anciens raccourcis d'objets" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Charger les anciens raccourcis de jets d'objets" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Cacher" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Montrer" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Remise aux valeurs de défaut de la barre jaune" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copier dans la conversation" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(défaut)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Aller vers le haut" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Aller vers le bas" @@ -2712,6 +2712,14 @@ msgstr "Augmenter" msgid "Skill points available: %d" msgstr "Points de compétences : %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2722,6 +2730,11 @@ msgstr "Compétence choisie : %d" msgid "Skill %d" msgstr "Compétence %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2732,208 +2745,208 @@ msgstr "Niveau : %d" msgid "Lvl: %d (%+d)" msgstr "Niveau : %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guilde" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Le joueur %s a été invité dans la guilde %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Demande pour quitter la guilde %s effectuée." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Inviter le membre de la guilde" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Qui voudriez-vous inviter dans la guilde %s ?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Quitter la guilde ?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Groupe" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "/party > Inviter l'utilisateur %s dans le groupe." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Vous avez demandé à quitter le groupe %s." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Inviter un joueur dans le groupe" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Qui voudriez vous inviter dans le groupe %s ?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Quitter le groupe ?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Atq" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Monstres prioritaires" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Attaquer les monstres" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Ignorer les monstres" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Créer une Guilde" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Créer un groupe" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Inviter" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "P" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "F" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Invitation dans le groupe acceptée de la part de %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Invitation dans le groupe de la part de %s refusée." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Invitation dans la guilde acceptée de la part de %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Invitation dans la guilde de la part de %s refusée." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "La guilde %s a été créée." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Le groupe %s a été créé." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Nom de la guilde" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Choisissez le nom de la guilde." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "" "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà " "dans une." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s vous a invité à rejoindre la guilde %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Accepter l'invitation dans cette guilde" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "" "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà " "dans un groupe." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "Vous avez été invité à rejoindre un groupe." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "Vous avez été invité à rejoindre le groupe %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s vous a invité à rejoindre son groupe." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s vous a invité à rejoindre le groupe %s." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Accepter l'invitation pour ce groupe" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Nom du groupe" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Choisissez le nom du groupe." @@ -3125,33 +3138,33 @@ msgstr "" msgid "Name: %s" msgstr "Nom : %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Mise à jour en cours..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Connexion..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Jouer" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 Le processus de mise à jour n'est pas achevé" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 Il est fortement recommandé que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 Essayez à nouveau plus tard" -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Terminé" @@ -4031,439 +4044,447 @@ msgstr "" "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des " "touches ou attendez vous à un possible comportement étrange du jeu." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "Tu as été tué par %s" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Vous avez essayé de prendre un item qui n'existe pas." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "L'objet est trop lourd." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "L'objet est trop éloigné" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "L'inventaire est plein" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "La pile est trop grande" -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "L'objet appartient a quelqu'un d'autre" -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Problème inconnu pour ramasser l'objet." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]." msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) Mouvements par défaut" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) Mouvements inversés" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) mouvements un peu fous" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) mouvements complètements fous" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) double normal et fou" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) déplacement inconnue" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) mouvement de fou numerique %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) mouvements fous personnalisés" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) mouvements fous" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) Aller à la cible distante par défaut" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) Aller à la cible en distante de 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) Aller vers la cible jusqu'à 2 de distance" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) Aller à la cible en distante de 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) Aller à la cible en distante de 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) Aller à la cible en distante de 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) Aller à la cible dans le champ d'attaque" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) Portée des attaques des Archéens" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) Aller à la cible" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) Suivre : défaut" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) Suivre: mouvement relatif" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) Suivre effet miroir" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) Suivre comme un toutou" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) Suivre : mode inconnu" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) Attaque" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) Attaque : défaut" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) Attaquer sans protection" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) Attaquer avec protection" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) Se déplacer et attaquer" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) Se déplacer, attaquer et ramasser" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) Sans attaque automatique" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) Ramassage sur 1x1 case" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) Ramassage par défaut sur 2x1 cases" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Ramassage avant sur 2x3 cases" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) Ramassage sur 3x3 cases" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) Aller et ramasser jusqu'à 4 de distance" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) Aller et ramasser jusqu'à 8 de distance" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) Aller et ramasser jusqu'à la distance max" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) Ramassage" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) Vue normale du jeu" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) Vue du jeu mode déverminage" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) Vue du jeu mode Ultra 1" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(u) Vue du jeu mode Ultra 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) Vue de la carte vide" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) Vue de la carte en N&B" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) Utiliser #flar comme sort d'attaque" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) Utiliser #chiza comme sort d'attaque" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) Utiliser #ingrav comme sort d'attaque" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) Utiliser #frillyar comme sort d'attaque" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Utiliser #upmarmu comme sort d'attaque" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) Sorts d'attaque" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) attaque tous les joueurs" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" -msgstr "(f) n'attaque pas des amis" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" +msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) attaque les mauvaises relations" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) Ne pas attaquer les joueurs" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) attaque en PVP" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) Imitation par défaut" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) Imiter les équipements" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) Imitation" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Inactif" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) Présent sur le jeu" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) Absent" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) Absent" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) Mode camera du jeu" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) Mode camera libre" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Modificateurs de mode de jeu activés" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Modificateurs de mode de jeu désactivés" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "Les modificateurs de jeux sont inconnus" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Suivre : " -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Suivi annulé" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Imitation: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitation annulée" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Vous voyez " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [options] [manaplus-file]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[Manaplus-file]: Le fichier manaplus est un fichier XML (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "utilisé pour définir des paramètres personnalisés" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "pour le client manaplus." -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Options :" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : fichier journal à utiliser" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" " -L --chat-log-dir : Dossier a utiliser pour l'enregistrement des " "conversatoins" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Affiche la version" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Montre cette rubrique d'aide" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Répertoire de configuration à utiliser" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Se connecter avec ce nom d'utilisateur" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : Se connecter avec ce mot de passe" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character : Se connecter avec ce personnage" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nom du serveur (ou IP) pour la connexion" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Port de connexion au serveur" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr "" " --update-host : Utilise cette URL pour les fichiers de mises à jour" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Choisir le serveur de personnages et le personnage par " "défaut" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr "" " -u --skip-update : Ne pas effectuer le téléchargement des mises à jour" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Répertoire des données du jeu à charger" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" " -L --localdata-dir : Répertoire à utiliser comme répertoire principal" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Répertoire à utiliser pour les imprime-écrans" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Démarrer le jeu en mode sûr" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : Commencer le test des drivers et la configuration " "automatique" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Désactive l'OpenGL pour cette session" @@ -4521,7 +4542,7 @@ msgstr "" "Impossible de créer ce personnage. Il est probable que ce nom soit déjà " "utilisé." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Mauvais nom." @@ -4823,53 +4844,53 @@ msgstr "Impossible d'utiliser l'objet." msgid "Unable to equip." msgstr "Impossible d'équiper cet objet." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Ancien mot de passe incorrect." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Le nouveau mot de passe est trop court." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Erreur inconnue." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "Id non enregistrée." -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Mauvais mot de passe." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "Le compte a expiré." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Rejeté par le serveur." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en " "contact avec l'équipe des GM." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Client trop ancien." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4878,15 +4899,15 @@ msgstr "" "Vous avez temporairement été banni du jeu jusqu'au %s.\n" "Merci de vous mettre en contact avec l'équipe des GM sur le forum." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Serveur surpeuplé." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Ce nom d'utilisateur est déjà utilisé." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Le nom de l'utilisateur a été éliminé de façon permanente." diff --git a/po/id.po b/po/id.po index a2f435d95..87b86049f 100644 --- a/po/id.po +++ b/po/id.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" "PO-Revision-Date: 2012-02-02 16:45+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/" @@ -43,47 +43,47 @@ msgstr "A" msgid "I" msgstr "l" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Pengaturan" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Terhubung dengan server" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Masuk" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Memasuki arena permainan" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Pemilihan karakter" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "terhubung dengan server" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Pergantian server" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,50 +93,50 @@ msgstr "Pergantian server" msgid "Error" msgstr "Kesalahan" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Meminta detail registrasi" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Ubah sandi" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Perubahan sandi berhasil" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Perubahan email" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Perubahan email berhasil" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Telah tidak terdaftar" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Selamat tinggal, datang kembali setiap saat" -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s tidak ada dan tidak dapat dibuat!keluar." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Gagal mengupdate host: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Gagal membuat direktori update!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar." @@ -316,43 +316,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Umum" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Debug" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Screenshot disimpan sebagai" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Gagal menyimpan screenshot!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "Koneksi ke server terputus" -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Kesalahan jaringan" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Abaikan permohonan transaksi" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Terima permohonan transaksi" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Tidak dapat menampilkan peta" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Error ketika menunggu %s" @@ -385,20 +385,20 @@ msgstr "Pengecek Bot" msgid "Name" msgstr "Nama" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Pukul" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Berbicara" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Jalan" @@ -411,8 +411,8 @@ msgid "Reset" msgstr "Reset" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Beli" @@ -460,8 +460,8 @@ msgstr "Max" msgid "Shop" msgstr "Toko" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -471,18 +471,18 @@ msgstr "Jual" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Batal" @@ -518,7 +518,7 @@ msgstr "Pengisian alamat email tidak cocok" msgid "Change Password" msgstr "Ganti sandi" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Kata Sandi:" @@ -550,7 +550,7 @@ msgid "New Character" msgstr "" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Nama:" @@ -586,7 +586,7 @@ msgid "Race:" msgstr "Ras:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Buat" @@ -729,7 +729,7 @@ msgid "rainbow 3" msgstr "pelangi 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -760,13 +760,13 @@ msgstr "Ya" msgid "No" msgstr "Tidak" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Abaikan" @@ -906,25 +906,25 @@ msgstr "Masuk: %d bytes/det" msgid "Out: %d bytes/s" msgstr "Keluar: %d bytes/det" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Apakah kamu tahu?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Tutup" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "Sebelumnya" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Selanjutnya" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Buka jendela otomatis" @@ -964,12 +964,12 @@ msgstr "Perlengkapan" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Lepaskan" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Bantuan" @@ -1007,31 +1007,31 @@ msgid "Filter:" msgstr "Penyaring:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Pakai" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Gunakan" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Buang..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Pecah" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Setelan" @@ -1040,17 +1040,17 @@ msgid "Weight:" msgstr "Berat" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Simpan" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Kembalikan" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Buang" @@ -1190,43 +1190,43 @@ msgstr "Jacko bertelur" msgid "You have left the guild." msgstr "" -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normal" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Tutup otomatis" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "lanjutkan" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Login" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Server:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Modifikasi sumber update" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Ingat username" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Update:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Mendaftar" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Menganti Server" @@ -1287,7 +1287,7 @@ msgstr "Masukan" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Hapus" @@ -1322,355 +1322,355 @@ msgstr "Copot lebih dahulu" msgid "Away outfit" msgstr "Setelan saat bepergian" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Tukar" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Berbisik" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Menyembuhkan" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Jadikan teman" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 -msgid "Black list" -msgstr "" - #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 -msgid "Set as enemy" +#: src/gui/popupmenu.cpp:717 +msgid "Black list" msgstr "" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:703 +msgid "Set as enemy" +msgstr "" + +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Hapus" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Batalkan pengabaian" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Mengikuti" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Tirukan" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Undang ke kelompok" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Keluarkan dari kelompok" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Keluarkan dari organisasi" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Ubah posisi di organisasi" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Undang ke organisasi" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "keluarkan pemain" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Sembunyikan" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Perlihatkan item" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Tanggalkan pakaian" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Penambahan komentar" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Beli(?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Jual(?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "keluarkan" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Hapus dari daftar menyerang" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Tambahkan prioritas daftar menyerang" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Tambahkan ke daftar menyerang" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Tambahkan ke daftar Abaikan" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Tambahkan nama ke Obrolan" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Pemain" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Ambil" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Ambil ke obrolan" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Daftar barang" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Ganti nama" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Hapus" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Mantra" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Memuat mantra lama" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Edit mantra" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Nonaktifkan sorotan" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Aktifkan sorotan" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "hapus nama" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Ubah posisi Organisasi" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Ubah nama tanda peta" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Nama:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Komentar pemain" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "komentar" -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Tambahkan semua ke Penukaran" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Masukkan 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Masukkan setengah" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Masukkan semua" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Buang semuanya" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Ambil 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Ambil setengah" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Ambil semua" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Muat jalan pintas iItem lama" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Muat jalan pintas Buang yang lama" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Sembunyikan" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Tampilkan" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Atur ulang bar kuning" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Pindahkan ke chat" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(kembalikan)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Bergerak keatas" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Bergerak kebawah" @@ -2688,6 +2688,14 @@ msgstr "Naik" msgid "Skill points available: %d" msgstr "poin Skill yang tersedia: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2698,6 +2706,11 @@ msgstr "" msgid "Skill %d" msgstr "Skill %d" +#: src/gui/skilldialog.cpp:438 +#, fuzzy, c-format +msgid "Skill: %s, Id: %d" +msgstr "Skill %d" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2708,204 +2721,204 @@ msgstr "Level: %d" msgid "Lvl: %d (%+d)" msgstr "Level: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Organisasi" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Pengguna yang diajak %s ke organisasi %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Permintaan %s keluar dari Organisasi " -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Tinggalkan organisasi?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Kelompok" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Pengguna yang diajak %s ke kelompok" -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Mengundang pengguna ke kelompok" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Sedang meninggalkan keyboard" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "mob prioritas" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "serang mob" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Abaikan mobs" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "" -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "" -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "" -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "" -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "" -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "" -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "" -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "" @@ -3095,33 +3108,33 @@ msgstr "" msgid "Name: %s" msgstr "Nama: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Mengupdate..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Menyambung..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Main" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "" -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "" @@ -3991,429 +4004,437 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Mencoba mengambil item yang tidak lagi ada" -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "item terlalu berat" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "barang terlalu jauh" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "Perbekalan sudah penuh" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Barang milik orang lain." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) jalan normal" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) normal ganda + mode gila" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) jalan ke target di jarak 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?)bergerak ke target" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?)serangan" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) pukulan normal" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) ganti pukulan tanpa pelindung" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) pukulan dengan pelindung" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) jalan dan serang" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) jalan, serang, ambil" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) tanpa penyerangan otomatis" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?)mengambil" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) penampilan peta normal" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) penampilan peta kosong" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b)penampilan peta hitam & putih" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) gunakan #flar untuk serangan magic" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) gunakan #chiza untuk serangan magic" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(l) gunakan #ingrav untuk serangan magic" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) gunakan #frillyar untuk serangan magic" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gunakan #upmarmu untuk serangan magic" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) serangan magic" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) pada keyboard" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) pergi" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) pergi" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Perombakan game diperbolehkan" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Perombakan game tidak diperbolehkan" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Ikuti:" -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Batal mengikuti" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Tirukan:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Batal menirukan" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4469,7 +4490,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "" @@ -4762,66 +4783,66 @@ msgstr "" msgid "Unable to equip." msgstr "" -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "" -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "" -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "" -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Versi yang digunakan sudah kadaluarsa." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Server kepenuhan." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Username dihapus permanen." diff --git a/po/ja.po b/po/ja.po index 0bee737f8..cb90a39b0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-03 05:16+0000\n" -"Last-Translator: Candy \n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" +"Last-Translator: Andrei Karas \n" "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/" "ja/)\n" "Language: ja\n" @@ -45,47 +45,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "設定" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "パフォーマンス" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "ビデオ" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "テーマ" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "サーバーに接続しています" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "ログインしています" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "ゲームの世界に移動しています" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "キャラクターを呼び出しています" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "ゲームサーバーに接続しています" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "ゲームサーバーを変更しています" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,50 +95,50 @@ msgstr "ゲームサーバーを変更しています" msgid "Error" msgstr "エラー" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "登録内容を呼び出しています" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "パスワード変更" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "パスワードを変更しました" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "メールアドレス変更" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "メールアドレスを変更しました" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "登録を解除しました" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "さようなら　また会いましょう" -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%sは存在しない為、作成できません" -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "無効なアップデートホスト:%s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "更新フォルダの作成エラー" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "エラー: %s は存在しない為、作成できません" @@ -318,43 +318,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"" -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "一般" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "デバッグ" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr " としてスクリーンショットを保存しました" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "スクリーンショットを保存できませんでした" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "サーバーへの接続が切断されました" -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "ネットワークエラー" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "トレードリクエストを無効にしています" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "トレードリクエストを有効にしました" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "マップの読み込みに失敗しました" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "%sの読み込み中にエラーが起きました" @@ -387,20 +387,20 @@ msgstr "ボットチェッカー" msgid "Name" msgstr "名前" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "攻撃" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "話す" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "動く" @@ -413,8 +413,8 @@ msgid "Reset" msgstr "リセット" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "買う" @@ -462,8 +462,8 @@ msgstr "最大" msgid "Shop" msgstr "店" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -473,18 +473,18 @@ msgstr "売る" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "キャンセル" @@ -520,7 +520,7 @@ msgstr "メールアドレスが一致しません" msgid "Change Password" msgstr "パスワードの変更" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "パスワード:" @@ -552,7 +552,7 @@ msgid "New Character" msgstr "新しいキャラクター" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "名前:" @@ -588,7 +588,7 @@ msgid "Race:" msgstr "人種:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "作成" @@ -731,7 +731,7 @@ msgid "rainbow 3" msgstr "虹 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -762,13 +762,13 @@ msgstr "はい" msgid "No" msgstr "いいえ" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "完全無視" @@ -908,25 +908,25 @@ msgstr "入力: %dバイト/秒" msgid "Out: %d bytes/s" msgstr "出力: %d バイト/秒" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "豆知識" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "閉じる" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< 前へ" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "次へ >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "この窓を自動で開ける" @@ -966,12 +966,12 @@ msgstr "装着品" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "取外す" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "ヘルプ" @@ -1009,31 +1009,31 @@ msgid "Filter:" msgstr "フィルタ:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "装着" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "使用" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "落とす..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "分割" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "服装" @@ -1042,17 +1042,17 @@ msgid "Weight:" msgstr "重量:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "保管" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "取出す" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "落とす" @@ -1192,43 +1192,43 @@ msgstr "JackOが出現中" msgid "You have left the guild." msgstr "ギルドから退会しました" -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "普通" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "自動で閉じる" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "スキップ" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "ログイン" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "サーバー:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "カスタムアップデートホスト" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "ユーザー名を記憶する" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "アップデート:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "登録" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "サーバー変更" @@ -1289,7 +1289,7 @@ msgstr "決定" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "クリア" @@ -1324,355 +1324,355 @@ msgstr "最初に取外す" msgid "Away outfit" msgstr "AFK中の服装" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "交換" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "ささやく" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "HP回復" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "友達になる" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "無視する" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "ブラックリスト" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "敵に設定する" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "消す" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "完全無視解除" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "完全無視" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "フォロー" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "真似" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "パーティへ招待" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "パーティから一時的に追い出す" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "ギルドから一時的に追い出す" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "ギルドでの役割を変更" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "ギルドへ招待" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "プレイヤーを一時的に追い出す" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "消す" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "アイテムを表示する" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "脱ぐ" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "コメントをする" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "買う (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "売る (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "追い出す" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "攻撃リストから削除する" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "攻撃優先リストへ追加する" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "攻撃リストへ追加する" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "完全無視リストへ追加する" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "名前をチャットへ追加する" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "プレイヤー" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "拾う" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "チャットに追加" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "マップアイテム" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "名前を変更する" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "削除" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "ワープ" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "服装を削除する" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "呪文" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "古い呪文を読込む" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "呪文を編集する" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "強調表示を無効" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "強調表示を有効" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "名前を消さない" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "名前を削除する" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "AFKを有効にする" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "AFKを無効にする" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "退会" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "クリップボードにコピー" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "ギルドポジションを変更" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr " マップサインの名前を変更" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "名前: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "プレイヤーコメント " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "コメント: " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "トレードに追加" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "トレードに10追加する" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "トレードに半分追加する" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "トレードに全て追加する" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "10 保存" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "半分保存" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "全部保存" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "全て落とす" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "10 取出す" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "半分取出す" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "全部取出す" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "旧アイテムショートカットを読込む" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "旧ドロップショートカットを読込む" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr " 非表示" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "表示" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "黄色バーをリセットする" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "チャットへコピーする" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(デフォルト)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "上へ移動" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "下へ移動" @@ -2694,6 +2694,14 @@ msgstr "上" msgid "Skill points available: %d" msgstr "スキルポイント: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2704,6 +2712,11 @@ msgstr "スキルセット %d" msgid "Skill %d" msgstr "スキル %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2714,204 +2727,204 @@ msgstr "Lvl: %d" msgid "Lvl: %d (%+d)" msgstr "Lvl: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "ギルド" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "ユーザー %sを、ギルド %sに招待しました" -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "ギルド %sへ退会届を出しました" -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "ギルドへメンバーを招待しました" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "ギルド %sに誰を招待しますか？" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "ギルドから退会しますか？" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "ギルド %sから本当に退会しますか?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "パーティー" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "ユーザー %s をパーティに招待しました" -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "パーティ %sへ退会届を出しました" -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "メンバーをパーティに招待しました" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "パーティ %sに誰を招待しますか?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "パーティーから退会しますか？" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "パーティ %sから本当に退会しますか?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "ナビ" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "攻撃" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "優先される敵" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "敵を攻撃する" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "敵を完全無視する" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "ギルドを作成する" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "パーティを作る" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "ソーシャル" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "招待" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "周囲" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "フレ" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "%sからのパーティ招待を承認しました" -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "%sからのパーティ招待を拒否しました" -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "%sからのギルド招待を承認しました" -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "%sからのギルド招待を拒否しました" -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "ギルド %sを作成しました" -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "パーティ %sを作成しました" -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "ギルド名" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "ギルド名を選んでください" -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "ギルド招待を承認したが既に入会しています" -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%sがギルド %sへ招待しています" -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "ギルド招待を受け入れる" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "パーティ招待を承認したが既に入会しています" -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "パーティに招待されました" -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "パーティ %sに招待されました" -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%sはあなたをパーティに招待しました" -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%sはあなたを%sというパーティに招待しました" -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "パーティ招待を受け入れます" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "パーティーを作成することはできません。もうパーティーに入っています" -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "パーティ名" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "パーティ名を選んでください" @@ -3103,33 +3116,33 @@ msgstr "" msgid "Name: %s" msgstr "名前: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "更新しています..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "接続しています..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "プレイ" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 アップデートは完了していません" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 する事を強く推奨します" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 しばらくたってからもう一度試してください" -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "完了" @@ -4005,432 +4018,440 @@ msgstr "" "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ" "ん。" -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "%sによって殺されました" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "存在しないアイテムは拾えません" -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "アイテムが重過ぎます" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "アイテムが遠すぎます." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "インベントリーが満杯です" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "量が多すぎます" -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "これは他のプレイヤーのアイテムです" -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "不明なエラーの為拾えません" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "%d [@@%d|%s@@]を手に入れました" -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) デフォルトムーブ" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) 逆ムーブ" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) クレイジームーブを含んだムーブ" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) クレイジームーブ" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) ダブルノーマル + クレイジー" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) 不明なムーブ" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) クレイジームーブ %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) カスタムクレイジームーブ" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) クレイジームーブ" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) ターゲットへデフォルト接近" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) 距離1でターゲットへ接近" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) 距離2でターゲットに近付く" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) 距離3でターゲットへ接近" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) 距離5でターゲットに近付く" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) 距離7でターゲットに近付く" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) 攻撃範囲内のターゲットに近付く" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) 弓師攻撃範囲" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) ターゲットに近付く" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) デフォルトフォロー" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) 友達フォロー" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) ミラーフォロー" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) ペットフォロー" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) 不明なフォロー" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) 攻撃" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) デフォルト攻撃" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) 盾なし攻撃" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) 盾あり攻撃" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) 接近、攻撃" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) 接近、攻撃、拾う" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) 自動攻撃なし" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) 小範囲で拾う 1x1セル" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) デフォルト範囲で拾う 2x1セル" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) 広範囲で拾う 2x3セル" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) 3x3セルの範囲で拾う" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) 距離4の範囲で拾う" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) 距離8で拾う" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) 最大範囲で拾う" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) 拾う" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) 通常マップビュー" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) デバッグマップビュー" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) ウルトラマップビュー" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) ウルトラマップビュー2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) 空マップビュー" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) 白黒マップビュー" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) 魔法攻撃は #flarを使う" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) 魔法攻撃は #chizaを使う" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) 魔法攻撃は #ingravを使う" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) 魔法攻撃は #frillyarを使う" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) 魔法攻撃は #upmarmuを使う" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) 魔法攻撃" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) 全てのプレイヤーを攻撃" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" -msgstr "(f) 友達以外を攻撃" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" +msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) 敵を攻撃" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) 他のプレイヤーを攻撃しない" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) PvP攻撃" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) デフォルト真似" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) 服装真似" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) 真似をする" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "アウェイ" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) キーボード" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) アウェイ" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) アウェイ" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) ゲームカメラモード" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) フリーカメラモード" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "ゲームモディファイアは有効になってます" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "ゲームモディファイアは無効になってます" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "不明なゲームモディファイアー" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "フォロー: " -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "フォローを止める" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "真似: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "真似をやめる" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr " が見える" -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [オプション] [manaplus-ファイル]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr " でカスタムパラメーターを設定しました" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr " をmanaplusクライアントへ設定しました" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "オプション:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : 使用するログファイル" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : チャットログ場所" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : バージョンを表示" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : ヘルプメニュー表示" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : 使用する設定ファイル" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : この名前でログインする" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : このパスワードでログインする" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character : このキャラクターでログインする" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : ログインサーバー又はIP" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : ログインサーバーポート" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : このアップデートホストを利用する" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : デフォルトで使用するキャラクターサーバーとキャラク" "ターを選択する" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : アップデートをスキップする" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : ゲームデータを読み込む場所" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : ローカルデータディレクトリの場所" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : スクリーンショットの保存場所" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : セーフモードでゲームを始める" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : ドライバーと自動コンフィグレーションのテストを始める" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --openglエラー : OpenGLを今回のみ無効にする" @@ -4488,7 +4509,7 @@ msgstr "" "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま" "れています" -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "名前が違います" @@ -4785,51 +4806,51 @@ msgstr "アイテム使用に失敗" msgid "Unable to equip." msgstr "装着不可能" -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "アカウントが見つかりませんでした。再度ログインして下さい" -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "変更前のパスワードが間違っています" -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "新しいパスワードは文字数が足りません" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "不明なエラー" -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "未登録なID" -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "入力したパスワードは間違っています" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "アカウントの有効期限が切れました" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "サーバーから拒否されました" -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "アップデートが必要です" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4838,15 +4859,15 @@ msgstr "" "あなたは%sまでゲームから追放されました。\n" "GMにご連絡下さい。" -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "サーバーが混雑しています" -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "ユーザ名は既に使用されています" -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "ユーザーネームは永久に削除されました" diff --git a/po/manaplus.pot b/po/manaplus.pot index 27dddd521..ea9e825db 100644 --- a/po/manaplus.pot +++ b/po/manaplus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,47 +40,47 @@ msgstr "" msgid "I" msgstr "" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -90,50 +90,50 @@ msgstr "" msgid "Error" msgstr "" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "" -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" @@ -315,43 +315,43 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "" -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "" @@ -384,20 +384,20 @@ msgstr "" msgid "Name" msgstr "" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "" @@ -410,8 +410,8 @@ msgid "Reset" msgstr "" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "" @@ -459,8 +459,8 @@ msgstr "" msgid "Shop" msgstr "" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -470,18 +470,18 @@ msgstr "" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "" @@ -517,7 +517,7 @@ msgstr "" msgid "Change Password" msgstr "" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "" @@ -549,7 +549,7 @@ msgid "New Character" msgstr "" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "" @@ -585,7 +585,7 @@ msgid "Race:" msgstr "" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "" @@ -728,7 +728,7 @@ msgid "rainbow 3" msgstr "" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -759,13 +759,13 @@ msgstr "" msgid "No" msgstr "" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "" @@ -905,25 +905,25 @@ msgstr "" msgid "Out: %d bytes/s" msgstr "" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "" @@ -963,12 +963,12 @@ msgstr "" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "" @@ -1006,31 +1006,31 @@ msgid "Filter:" msgstr "" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "" @@ -1039,17 +1039,17 @@ msgid "Weight:" msgstr "" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "" @@ -1191,43 +1191,43 @@ msgstr "" msgid "You have left the guild." msgstr "" -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "" @@ -1288,7 +1288,7 @@ msgstr "" msgid "NPC" msgstr "" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "" @@ -1323,355 +1323,355 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 -msgid "Black list" -msgstr "" - #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 -msgid "Set as enemy" +#: src/gui/popupmenu.cpp:717 +msgid "Black list" msgstr "" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:703 +msgid "Set as enemy" +msgstr "" + +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "" @@ -2689,6 +2689,14 @@ msgstr "" msgid "Skill points available: %d" msgstr "" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2699,6 +2707,11 @@ msgstr "" msgid "Skill %d" msgstr "" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2709,204 +2722,204 @@ msgstr "" msgid "Lvl: %d (%+d)" msgstr "" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "" -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "" -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "" -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "" -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "" -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "" -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "" -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "" -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "" -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "" @@ -3096,33 +3109,33 @@ msgstr "" msgid "Name: %s" msgstr "" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "" -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "" -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "" -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "" @@ -3992,430 +4005,438 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4471,7 +4492,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "" @@ -4764,66 +4785,66 @@ msgstr "" msgid "Unable to equip." msgstr "" -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "" -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "" -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "" -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index b40a90933..b45b9432f 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-02 16:45+0000\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/" "team/nl_BE/)\n" @@ -42,47 +42,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configureren" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Verbinden met server" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Inloggen" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Spelwereld binnenkomen" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Aanvragen personage" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Verbinden met de spelserver" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Wijzigen spelservers" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -92,50 +92,50 @@ msgstr "Wijzigen spelservers" msgid "Error" msgstr "Fout" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Aanvragen registratie details" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Paswoord Wijziging" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Paswoord is gewijzigd!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Email Wijziging" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Email is gewijzigd!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Registratie ongedaan gemaakt!" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Tot ziens..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Ongeldige update host %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Fout bij het creëren van de update map!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen." @@ -320,43 +320,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Algemeen" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Debug" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Scherafdruk opgeslagen als:" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Opslaan van screenshot mislukt!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "De verbinding met de server is verbroken." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Netwerkfout" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Inkomende handelsaanvragen negeren" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Inkomende handelsaanvragen accepteren" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Kon Map Niet Laden" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Fout bij het laden van %s" @@ -389,20 +389,20 @@ msgstr "Bot Controleerder" msgid "Name" msgstr "Naam" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Aanvallen" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Spreken" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Beweeg" @@ -415,8 +415,8 @@ msgid "Reset" msgstr "Reset" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Kopen" @@ -464,8 +464,8 @@ msgstr "Maximum" msgid "Shop" msgstr "Winkel" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -475,18 +475,18 @@ msgstr "Verkopen" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Annuleren" @@ -522,7 +522,7 @@ msgstr "De email adres ingaven zijn niet gelijk." msgid "Change Password" msgstr "Wijzig wachtwoord" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Wachtwoord:" @@ -554,7 +554,7 @@ msgid "New Character" msgstr "" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Naam:" @@ -590,7 +590,7 @@ msgid "Race:" msgstr "Ras:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Aanmaken" @@ -733,7 +733,7 @@ msgid "rainbow 3" msgstr "regenboog 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -764,13 +764,13 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Negeer" @@ -910,25 +910,25 @@ msgstr "Invoer: %d bytes/sec" msgid "Out: %d bytes/s" msgstr "Uitvoer: %d bytes/sec" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Weet u?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Sluiten" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Vorig" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Volgend >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "" @@ -968,12 +968,12 @@ msgstr "Uitrusting" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Afdoen" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Help" @@ -1011,31 +1011,31 @@ msgid "Filter:" msgstr "Filter:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Uitrusten" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Gebruiken" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Neerleggen..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Splitsen" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Kleren" @@ -1044,17 +1044,17 @@ msgid "Weight:" msgstr "Gewicht:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Opslaan" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Afhalen" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Neerleggen" @@ -1196,43 +1196,43 @@ msgstr "" msgid "You have left the guild." msgstr "" -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normaal" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Auto Sluiten" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Overslaan" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Inloggen" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Server:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Manuele update server" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Onthoud gebruikersnaam" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Update:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Aanmelden" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Wijzig Server" @@ -1293,7 +1293,7 @@ msgstr "Indienen" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Wissen" @@ -1328,355 +1328,355 @@ msgstr "Verwijder uitrusting eerst" msgid "Away outfit" msgstr "Kleren om weg te gaan" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handel" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Fluister" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Genees" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Word vriend" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Geen rekening mee houden" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 -msgid "Black list" -msgstr "" - #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 -msgid "Set as enemy" +#: src/gui/popupmenu.cpp:717 +msgid "Black list" msgstr "" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:703 +msgid "Set as enemy" +msgstr "" + +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Wis" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Volledig genegeerd" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Volg" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Imiteer" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Schop speler" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Toon Voorwerpen" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "ontkleed" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Koop (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Verkoop (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Schop" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Spelers" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Raap op" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Aan chat toevoegen" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Plaats voorwerp op de kaart" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Hernoem" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Verwijder" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Spreuken" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Laad oude spreuken" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Wijzig spreuk" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Markering afzetten" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Markering aanzetten" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Verwijder naam" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "away aanzetten" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "away afzetten" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Verlaat" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Wijzig uw guild positie" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Kaart bordje hernoemen " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Naam: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Plaats 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Plaats de helft" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Plaats alles" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Laat alles vallen" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Haal 10 op" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Haal de helft op" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Haal alles op" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Laden van oude voorwerpsnelkoppelingen" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Laden van oude neerleggingsnelkoppeling" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Verberg" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Toon" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Kopieer naar chat" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(standaard)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Beweeg naar boven" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Beweeg naar beneden" @@ -2702,6 +2702,14 @@ msgstr "Omhoog" msgid "Skill points available: %d" msgstr "" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2712,6 +2720,11 @@ msgstr "" msgid "Skill %d" msgstr "" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2722,204 +2735,204 @@ msgstr "Niv: %d" msgid "Lvl: %d (%+d)" msgstr "Niv: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guild" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "gebruiker %s uitgenodigd in guild %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Guild %s verlating aangevraagd." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Wie zou u willen uitnodigen in guild %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Verlaten Guild?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Bent u zeker dat u guild %s wilt verlaten?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Groep" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Gebruiker %s uitgenodigd in groep." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Wie zou u willen uitnodigen in group %s?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Verlaten Groep?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Bent u zeker dat u groep %s wilt verlaten?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Aanv" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Guild aanmaken" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Groep aanmaken" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Sociaal" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Nodig uit" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Uitnodiging voor groep %s aanvaard." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Uitnodiging voor groep %s geweigerd." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Uitnodiging voor guild %s aanvaard." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Uitnodiging voor guild %s geweigerd." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Maken van guild %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Maken van groep %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Guild Naam" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Kies uw guild naam" -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Uitnodiging tot guild ontvangen, maar er is er al één." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s heeft je uitgenodigd om guid %s te vervoegen." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Guild Uitnodiging Aanvaarden" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Uitnodiging tot groep ontvangen, maar er is er al één." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "U bent uitgenodigd om je bij een groep te voegen." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "U bent uitgenodigd om je bij groep %s te voegen." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Groepsuitnodiging aanvaarden" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Kan groep niet aanmaken. Je bent al in een groep." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Groep Naam" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Kies uw groepsnaam." @@ -3111,33 +3124,33 @@ msgstr "" msgid "Name: %s" msgstr "Naam: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Actualiseren..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Verbinden..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Spelen" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 Het updateproces is onvolledig." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 Het is ten sterkste aanbevolen dat" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 probeer later opnieuw." -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Voltooid" @@ -4016,430 +4029,438 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Geprobeerd een nietbestaand voorwerp op te rapen." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Voorwerp is te zwaar." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Voorwerp is te ver weg." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Voorwerp behoort bij iemand anders." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Onbekend probleem bij het oprapen van voorwerp." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "U raapte op %d [@@%d|%s@@]." msgstr[1] "U raapte op %d [@@%d|%s@@]." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) standaard bewegingen" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) geïnverteerde bewegingen" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) bewegingen met enkele vreemde bewegingen" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) bewegingen met vreemde bewegingen" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) dubbel normaal + raar" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) manuele vreemde beweging" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) vreemde beweging" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) standaard bewegingen tot aan doel" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) bewegen tot aan doel in bereik 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) bewegen tot aan doel in bereik 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) bewegen tot aan doel in bereik 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) bewegen tot aan doel in bereik 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) bewegen tot aan doel in bereik 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) beweeg tot aan doel in aanvalsbereik" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) beweeg tot aan doel" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) standaard volgen" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) relatief volgen" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) gespiegeld volgen" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) huisdier volgen" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) onbekend volgen" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) aanval" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) standaard aanval" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) wissel aanval zonder schild" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) wissel aanval met schild" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) ga en val aan" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) ga, val aan, raap op" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) zonder auto aanval" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) klein raap op 1x1 velden" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) standaard raap op 2x1 velden" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) vooruit raap op 2x3 velden" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) raap op 3x3 velden" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) go en raap op met bereik 4" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) ga en raap op met bereik 8" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) ga en raap op zonder bereiklimiet" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) raap op" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) normale map tonen" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) debug map tonen" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) ultra map tonen" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) ultra map tonen 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) lege map tonen" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) zwart & witte map tonen" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) gebruik #flar voor magie aanval" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) gebruik #chiza voor magie aanval" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) gebruik #ingrav voor magie aanval" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) gebruik #frillyar voor magie aanval" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gebruik #upmarmu voor magie aanval" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) magie aanval" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) standaard imitatie" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) kleren imitatie" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) imitatie" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Weg" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) op toetsenbord" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) weg" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) weg" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) spel camera modus" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) vrije camera modus" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Volg: " -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Volgen onderbroken" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Imitatie: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitatie onderbroken" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Opties:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Log bestand te gebruiken" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Chat log bestand te gebruiken" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Toon de versie" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Toon deze help" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Configuratie map te gebruiken" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Login met deze gebruikersnaam" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : Loging met dit wachtwoord" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character : Login met dit karakter" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login servernaam of IP" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Login serverpoort" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Updateserver te gebruiken" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Kies standaard karakterserver en karakter" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : update downloads overslaan" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Map om spelgegevens te laden" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Map te gebruiken als lokale data map" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir: Map te gebruiken om screenshots te bewaren" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Start spel in veilige modus" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Zet OpenGL af voor deze sessie" @@ -4497,7 +4518,7 @@ msgstr "Onbekende char-server fout." msgid "Failed to create character. Most likely the name is already taken." msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Verkeerde naam." @@ -4798,51 +4819,51 @@ msgstr "Kan voorwerp niet gebruiken." msgid "Unable to equip." msgstr "Kan dit niet uitrusten." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Oud wachtwoord is ongeldig." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Nieuw wachtwoord is te kort." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Onbekende fout." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Verkeerd wachtwoord." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Geweigered door de server." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Client is te oud." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4851,15 +4872,15 @@ msgstr "" "Je bent tijdelijk geband van het spel tot %s.\n" "Neem aub contact op met het GM team via de forums." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Deze gebruikersnaam is al genomen." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Gebruikersnaam is compleet verwijderd" diff --git a/po/pl.po b/po/pl.po index 15fd20cf9..3c40b1082 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-02 16:45+0000\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/" "pl/)\n" @@ -43,47 +43,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Konfiguracja" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Wydajność programu" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Obraz" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "Skórki" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Łączenie z serwerem" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Logowanie" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Wchodzenie do świata gry" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Sprawdzanie postaci" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Łączenie się z serwerem gry" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Zmiana serwera" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,50 +93,50 @@ msgstr "Zmiana serwera" msgid "Error" msgstr "Błąd" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Sprawdzanie szczegółów rejestracji" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Zmiana hasła" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Hasło zmienione z powodzeniem!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Zmiana adresu e-mail" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Adres e-mail zmieniony z powodzeniem!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Wyrejestrowano z powodzeniem" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Żegnaj, będziemy czekać na Twój powrót..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s nie istnieje i nie może byś utworzone! Wyjście." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Nieprawidłowy serwer aktualizacji: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Błąd podczas tworzenia katalogu aktualizacji!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście." @@ -324,43 +324,43 @@ msgstr "Osierocone obrazy źródłowe:" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Ogólny" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Debug" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Zrzut ekranu zapisany jako" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Zapisywanie zrzutu ekranu nie powiodło się!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "Połączenie z serwerem zostało zerwane." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Błąd sieci" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Ignorowanie przychodzących próśb o handel" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Akceptowanie przychodzących próśb o handel" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Nie można załadować mapy" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Błąd podczas łądowania %s" @@ -393,20 +393,20 @@ msgstr "Wykrywacz botów" msgid "Name" msgstr "Nazwa" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atak" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Rozmowa" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Podejdź" @@ -419,8 +419,8 @@ msgid "Reset" msgstr "Resetuj" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Kup" @@ -468,8 +468,8 @@ msgstr "Maks." msgid "Shop" msgstr "Sklep" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -479,18 +479,18 @@ msgstr "Sprzedaj" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Anuluj" @@ -526,7 +526,7 @@ msgstr "Pola adresu e-mail się nie zgadzają." msgid "Change Password" msgstr "Zmień hasło" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Hasło:" @@ -558,7 +558,7 @@ msgid "New Character" msgstr "" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Imię:" @@ -594,7 +594,7 @@ msgid "Race:" msgstr "Rasa:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Utwórz" @@ -737,7 +737,7 @@ msgid "rainbow 3" msgstr "tęczowy 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -768,13 +768,13 @@ msgstr "Tak" msgid "No" msgstr "Nie" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Ignoruj" @@ -914,25 +914,25 @@ msgstr "Wejście: %d bajtów" msgid "Out: %d bytes/s" msgstr "Wyjście: %d bajtów" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Cz wiesz że..." -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Zamknij" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Cofnij" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Dalej>" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Otwieraj to okno automatycznie" @@ -972,12 +972,12 @@ msgstr "Ekwipunek" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Zdejmij" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Pomoc" @@ -1015,31 +1015,31 @@ msgid "Filter:" msgstr "Filtr:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Załóż" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Użyj" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Upuść..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Podziel" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Stroje" @@ -1048,17 +1048,17 @@ msgid "Weight:" msgstr "Waga:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Przechowaj" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Pobierz" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Upuść" @@ -1202,43 +1202,43 @@ msgstr "Jack-O spawnuje się" msgid "You have left the guild." msgstr "Opuściłeś/aś gildię." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normalna" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Automatyczne zamykanie" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Omiń" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Zaloguj się" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Serwer:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Zaawansowane ustawienia aktualizacji" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Zapamiętaj login" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Aktualizacja:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Rejestruj" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Zmień serwer" @@ -1299,7 +1299,7 @@ msgstr "Zatwierdź" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Wyczyść" @@ -1334,355 +1334,355 @@ msgstr "Najpierw zdejmij" msgid "Away outfit" msgstr "Strój na afk" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handel" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Szept" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Lecz" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Dodaj do znajomych" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Lekceważ" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Czarna lista" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Ustaw jako wroga" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Usuń" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Odignoruj" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Całkowicie ignoruj" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Podążaj" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Imituj" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Zaproś do grupy" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Wyrzuć z grupy" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Wyrzuć z gildii" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Zmień pozycję w gildii" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Zaproś do gildii" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Wyrzuć gracza" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Wysadź w powietrze" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Pokaż przedmioty" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Rozbierz" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Dodaj komentarz" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Kup (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Sprzedaj (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Wyrzuć" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Usuń z listy ataku" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Dodaj do listy priorytetów" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Dodaj do listy atakowanych" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Dodaj do listy ignorowanych" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Wpisz do czatu" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Gracze" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Podnieś" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Dodaj do czatu" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Portal" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Zmień nazwę" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Usuń" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Teleport" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "Usuń ubiór" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Zaklęcia" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Przywróć stare zaklęcia" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Edytuj zaklęcie" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Wyłącz alarm" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Włącz alarm" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "Nie usuwaj imion" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Usuń imię" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Włącz tryb AFK" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Wyłącz tryb AFK" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Opuść" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "Skopiuj do schowka" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Zmień pozycję gildii" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Zmień nazwę drogowskazu" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Nick:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Komentarz gracza " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Komentarz: " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Dodaj do handlu" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Dodaj 10 do handlu" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Dodaj połowę do handlu" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Dodaj wszystko do handlu" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Przechowaj 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Przechowaj połowę" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Przechowaj wszystko" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Upuść wszystko" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Odbierz 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Odbierz połowę" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Odbierz wszystko" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Przywróć stare skróty przedmiotów" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Przywróć stare skróty upuszczania" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Ukryj" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Pokaż" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Zresetuj żółty pasek" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Skopiuj do czatu" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(domyślne)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "W górę" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "W dół" @@ -2705,6 +2705,14 @@ msgstr "Podwyż" msgid "Skill points available: %d" msgstr "Dostępne punkty umiejętności: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2715,6 +2723,11 @@ msgstr "Zestaw umiejętności %d" msgid "Skill %d" msgstr "Umiejętność %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2725,204 +2738,204 @@ msgstr "Poziom: %d" msgid "Lvl: %d (%+d)" msgstr "Poziom: %d(%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gildia" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Zaproszono gracza %s do gildii %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Poproszono o wyjście z gildii %s." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Zaproszenie do gildii" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Kogo chcesz zaprosić do gildii %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Opuścić gildię?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Na pewno opuścić gildię %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupa" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Gracz %s zaproszony do grupy." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Poproszono o wyjście z grupy %s." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Zaproszenie do grupy" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Kogo chcesz zaprosić do grupy %s?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Opuścić grupę?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Na pewno opuścić grupę %s?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "GPS" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Atk" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Priorytetowe moby" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Atakuj moby" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Ignoruj moby" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Utwórz gildię" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Utwórz grupę" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Społeczność" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Zaproś" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Zaakceptowano zaproszenie do grupy od %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Odrzucono zaproszenie do grupy od %s." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Akceptowano zaproszenie do gildii od %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Odrzucono zaproszenie do gildii od %s." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Tworzenie gildii o nazwie %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Tworzenie grupy o nazwie %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Nazwa gildii" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Wybierz nazwę gildii." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Gildia o tej nazwie już istnieje." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s zaprosił/a Cię do gildii %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Akceptuj zaproszenie do gildii" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Grupa o takiej nazwie już istnieje." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "Zostałeś/aś zaproszony/a do grupy." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "Zostałeś/aś zaproszony/a do grupy %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s zaprosił/a Cię do grupy." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s zaprosił/a Cię do grupy %s ." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Zaakceptuj zaproszenie do grupy" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Nie można utworzyć grupy. Już należysz do grupy." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Nazwa grupy" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Wybierz nazwę grupy." @@ -3114,33 +3127,33 @@ msgstr "" msgid "Name: %s" msgstr "Imię: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Aktualizacja..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Łączenie..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Graj" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 Proces aktualizacji jest niekompletny." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 Jest mocno zalecane abyś" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 Spróbuj ponownie później." -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Zakończono" @@ -4012,42 +4025,42 @@ msgstr "" "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić " "się problemy." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "Zostałeś/aś zabity/a przez %s" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Próbowano podnieść nieistniejący przedmiot." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Przedmiot zbyt ciężki." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Przedmiot za daleko" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "Inwentarz jest pełny." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "Za duży stos." -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Przedmiot należy do kogoś innego." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Nieznany problem podczas próby podniesienia przedmiotu." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4055,388 +4068,396 @@ msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]." msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]." msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) domyślne poruszanie się" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) odwrócone ruchy" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) trochę szalonych ruchów" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) dużo szalonych ruchów" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) podwójne normalne + szalone" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) nieznany sposób poruszania się" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) szalone ruchy numer %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) własne szalone ruchy" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) szalone ruchy" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) domyślne przybliżenie do celu" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) podejdź do 1 pola od celu" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) podejdź do 2 pól od celu" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) podejdź do 3 pól od celu" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) podejdź do 5 pól od celu" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) podejdź do 7 pól od celu" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) podejdź do celu na zasięg ataku" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) zasięg ataku łucznika" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) pól do celu" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) domyślne podążanie" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) relatywne podążanie" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) lustrzane podążanie" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) niewolnicze podążanie" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) nieznane podążanie" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) atak" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) domyślny atak" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) zdejmij tarczę do ataku" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) załóż tarczę do ataku" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) idź, atakuj" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) idź, atakuj, podnieś" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) bez autoataku" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) podnoś w promieniu 1x1" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) podnoś w promieniu 2x1" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) podnoś w promieniu 2x3" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) podnoś w promieniu 3x3" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) podejdź i podnoś do 4 pól" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) podejdź i podnoś do 8 pól" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) podejdź i podnoś w zasięgu wzroku" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) podnoś" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) normalny widok mapy" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) widok debug" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) płaska mapa" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) płaska mapa 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) mapa bez tekstur" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) dwukolorowa mapa" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) użyj #flar jako M.A." -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) użyj #chiza jako M.A." -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) użyj #ingrav jako M.A." -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) użyj #frillyar jako M.A." -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) użyj #upmarmu jako M.A." -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) magiczny atak" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) atakuj wszystkich graczy" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" -msgstr "(f) nie atakuj przyjaciół" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" +msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) atakuj nielubianych" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) nie atakuj nikogo" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) atak PvP" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) domyślna imitacja" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) Imituj strój" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) imitacja" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "AFK" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) przy klawiaturze" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) AFK" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) stan" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) tryb kamery gry" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) wolny tryb kamery" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Modyfikatory gry włączone." -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Modyfikatory gry wyłączone." -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "Modyfikatory gry nieznane" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Podążasz za: " -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Podążanie anulowane." -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Imitujesz: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitacja anulowana" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Widzisz " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opcje] [manaplus-file]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr " używane do wprowadzania własnych parametrów" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr " do klienta manaplus." -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Opcje:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Używany plik logów" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Używany katalog logów" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Pokaż wersję" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Pokaż tą pomoc" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Katalog konfiguracyjny" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Zaloguj się tym loginem" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : Zaloguj się tym hasłem" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character : Zaloguj się tą postacią" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nazwa serwera lub IP" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Port serwera" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Użyj tego serwera aktualizacji" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Wybierz domyślny serwer i postać" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Omiń aktualizację" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Katalog z danymi gry" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Katalog z lokalnymi danymi" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Katalog ze zrzutami ekranu" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Rozpocznij grę w trybie bezpieczeństwa" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr " -T --test :Rozpocznij test sterowników i autokonfigurację" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Wyłącz OpenGL w tej sesji" @@ -4492,7 +4513,7 @@ msgstr "Nieznany błąd serwera postaci." msgid "Failed to create character. Most likely the name is already taken." msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Nieprawidłowe imię." @@ -4799,51 +4820,51 @@ msgstr "Nie można użyć przedmiotu." msgid "Unable to equip." msgstr "Nie można założyć." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Konto nie znalezione. Prosimy się przelogować." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Stare hasło nieprawidłowe." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Nowe hasło jest zbyt krótkie." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Nieznany błąd." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "Niezarejestrowany ID." -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Nieprawidłowe hasło." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "Ważność konta wygasła." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Nie przyjęty przez serwer." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Klient jest zbyt nieaktualny." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4852,15 +4873,15 @@ msgstr "" "Dostałeś/aś tymczasowego bana do %s.\n" "Prosimy o kontakt z drużyną GM-ów przez fora." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Serwer jest przeciążony." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Login jest już w użyciu." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Login pernamentnie usunięty." diff --git a/po/pt.po b/po/pt.po index 017eca473..21ce13a39 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-03 23:57+0000\n" -"Last-Translator: freya \n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" +"Last-Translator: Andrei Karas \n" "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/" "pt/)\n" "Language: pt\n" @@ -43,47 +43,47 @@ msgstr "A" msgid "I" msgstr "l" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configurar" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vídeo" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "Temas" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Conectando ao servidor" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Efetuando login" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Entrando no domínio do jogo" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Requisitando personagens" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,50 +93,50 @@ msgstr "Mudando servidores do jogo" msgid "Error" msgstr "Erro" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s não existe e não pode ser criado! Saindo." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." @@ -229,7 +229,7 @@ msgstr "O jogador não está mais ignorado!" #: src/commandhandler.cpp:586 msgid "Player could not be unignored!" -msgstr "Não foi possível deixar de ignorar o jogador!" +msgstr "Não foi possível deixar de ignorar o jogador(a)!" #: src/commandhandler.cpp:592 msgid "blacklisted" @@ -321,43 +321,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Geral" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Depurador" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Screenshot salva como " -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Falha ao salvar screenshot!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Não foi possível carregar o mapa" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -390,20 +390,20 @@ msgstr "Analizador de bot" msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Mover" @@ -416,8 +416,8 @@ msgid "Reset" msgstr "Resetar" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Comprar" @@ -465,8 +465,8 @@ msgstr "Máximo" msgid "Shop" msgstr "Loja" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -476,18 +476,18 @@ msgstr "Vender" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Cancelar" @@ -523,7 +523,7 @@ msgstr "Os emails informados não são iguais." msgid "Change Password" msgstr "Alterar senha" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Senha:" @@ -555,7 +555,7 @@ msgid "New Character" msgstr "Novo Pesonagem" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Nome:" @@ -591,7 +591,7 @@ msgid "Race:" msgstr "Corrida:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Criar" @@ -734,7 +734,7 @@ msgid "rainbow 3" msgstr "arco-íris 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -765,13 +765,13 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Ignora" @@ -786,7 +786,7 @@ msgstr "Alvo" #: src/gui/debugwindow.cpp:74 msgid "Net" -msgstr "Teia" +msgstr "Rede" #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222 #: src/gui/debugwindow.cpp:251 @@ -911,25 +911,25 @@ msgstr "Entrada: %d bytes/s" msgid "Out: %d bytes/s" msgstr "Saída: %d bytes/s" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Você sabia?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Fechar" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Anterior" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Próximo >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Abrir automaticamente esta janela" @@ -969,12 +969,12 @@ msgstr "Equipamento" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Desequipar" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Ajuda" @@ -1012,31 +1012,31 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Dividir" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Roupas" @@ -1045,17 +1045,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1197,43 +1197,43 @@ msgstr "JackOvai aparecer" msgid "You have left the guild." msgstr "Você saiu da Guilda." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normal" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Fechar" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Passar" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Login" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Servidor:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Atualizações customizadas" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Lembrar usuário" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Atualização:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Registrar" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Trocar servidor" @@ -1294,7 +1294,7 @@ msgstr "Enviar" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Limpar" @@ -1327,357 +1327,357 @@ msgstr "Desequipar antes" #: src/gui/outfitwindow.cpp:94 msgid "Away outfit" -msgstr "Roupas de ocupado" +msgstr "Roupas em modo ausente" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Negócios" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Sussuro" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Curar:" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Ser Amigo" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Ser inimigo" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Lista Negra" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Definir como inimigo." -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Apagar" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Não ignorar" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Imitar" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Convidar para grupo" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Chutar do grupo" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Chutar da Guilda" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Mudar posição da Guilda" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Convidar para Guilda" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Chutar Jogador" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Deixar pelado" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Mostar itens:" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" -msgstr "Deixar sem Roupas" +msgstr "Limpar conjunto de roupas" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Adicionar comentário" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Vender (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Chutar" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Remover da Lista de Ataques" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Adicionar a prioridade na lista de ataques" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Adicionar a lista de ataques" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Adicionar a lista de ignorados" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Adicionar nome ao chat" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Jogadores" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Nome no chat" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Mapa Item" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "A Remover" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Urdidura" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "Limpar equipamento" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Feitiços" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Carregar Antigos Feitiços" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Editar Feitiços" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Desabilitar destaque" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Habilitar destaque" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "Não remova o nome" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Remover nome" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Habilitar longe do teclado" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Desabilitar longe do teclado" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Sair" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "CopiaCopiar para a área de transferência" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Mudar a posição da guilda" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Resetar barra amarela" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copiar para o chat" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Mover a cima" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Mover a baixo" @@ -1999,7 +1999,7 @@ msgstr "Habilitar joystick" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "Use joystick se a janela cliente estiver inativo" +msgstr "Usar joystick se a janela do jogo estiver inativa" #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -2091,11 +2091,11 @@ msgstr "Desenhar atalhos no mapa" #: src/gui/setup_other.cpp:87 msgid "Enable lazy scrolling" -msgstr "Habilitar rolagem preguiçosa" +msgstr "Habilitar rolagem suave" #: src/gui/setup_other.cpp:90 msgid "Scroll laziness" -msgstr "Rolagem preguiçosa" +msgstr "Rolagem suave" #: src/gui/setup_other.cpp:93 msgid "Scroll radius" @@ -2139,7 +2139,7 @@ msgstr "Alvo de jogadores em ciclo" #: src/gui/setup_other.cpp:123 msgid "Show job exp messages" -msgstr "Mostrar menssagens de job exp" +msgstr "Mostrar mensagens de job exp" #: src/gui/setup_other.cpp:126 msgid "Show players popups" @@ -2147,7 +2147,7 @@ msgstr "Mostrar popups de jogadores" #: src/gui/setup_other.cpp:129 msgid "Afk message" -msgstr "Mensagem Ausente" +msgstr "Mensagem em modo Ausente" #: src/gui/setup_other.cpp:132 msgid "Show job" @@ -2179,7 +2179,7 @@ msgstr "Suporte de bots" #: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" -msgstr "Habilitar suporte há bot de leilão" +msgstr "Habilitar suporte ao AuctionBot " #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" @@ -2195,7 +2195,7 @@ msgstr "Habilitar Analisador de bot" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection (do not disable)" -msgstr "Habilitar proteção contra bugs no servidor (não pode ser desabilitado)" +msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)" #: src/gui/setup_other.cpp:178 msgid "Enable debug log" @@ -2227,7 +2227,7 @@ msgstr "Aceleração por HW" #: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" -msgstr "Habilitar cache de opacidade (Software, pode usar muita memória)" +msgstr "Habilitar cache de transparência (Software, pode usar muita memória)" #: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" @@ -2279,7 +2279,7 @@ msgstr "Ativar segmentação prolongada de mouse" #: src/gui/setup_players.cpp:66 msgid "Target dead players" -msgstr "Jogadores mortos como alvo" +msgstr "Jogadores(as) mortos(as) como alvo" #: src/gui/setup_players.cpp:69 msgid "Visible names" @@ -2299,7 +2299,7 @@ msgstr "Ver status" #: src/gui/setup_players.cpp:81 msgid "Show ip addresses on screenshots" -msgstr "Mostrar endereço de ip nas capturas de tela" +msgstr "Mostrar endereço de IP em Capturas de Tela" #: src/gui/setup_players.cpp:84 msgid "Allow self heal with mouse click" @@ -2516,11 +2516,11 @@ msgstr "Bolhas com nomes" #: src/gui/setup_video.cpp:242 msgid "off" -msgstr "off" +msgstr "Desligado" #: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261 msgid "low" -msgstr "baixo" +msgstr "Baixo" #: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265 msgid "high" @@ -2548,7 +2548,7 @@ msgstr "Efeitos de partícula" #: src/gui/setup_video.cpp:295 msgid "Show pickup notification" -msgstr "Mostrar aviso ao pegar algo" +msgstr "Mostrar aviso ao pegar algum item" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:297 @@ -2558,24 +2558,24 @@ msgstr "em chat" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:299 msgid "as particle" -msgstr "como partícula" +msgstr "Como partícula" #: src/gui/setup_video.cpp:301 msgid "Enable resize" -msgstr "Habilitar redirecionamento" +msgstr "Habilitar redirecionamento de janela" #: src/gui/setup_video.cpp:302 msgid "No frame" -msgstr "Sem quadros" +msgstr "Sem moldura de janela" #: src/gui/setup_video.cpp:306 msgid "FPS limit:" -msgstr "Limite FPS:" +msgstr "Limite de FPS:" #: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345 #: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730 msgid "Alt FPS limit: " -msgstr "Limite FPS alt: " +msgstr "Limite de FPS alternativo:" #: src/gui/setup_video.cpp:325 msgid "Overhead text" @@ -2583,7 +2583,7 @@ msgstr "Texto sobrescrito como:" #: src/gui/setup_video.cpp:326 msgid "Gui opacity" -msgstr "Opacidade" +msgstr "Transparência de janelas" #: src/gui/setup_video.cpp:327 msgid "Ambient FX" @@ -2700,6 +2700,14 @@ msgstr "+" msgid "Skill points available: %d" msgstr "Pontos de habilidade disponíveis: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2710,6 +2718,11 @@ msgstr "Habilidade %d" msgid "Skill %d" msgstr "Habilidade %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2720,204 +2733,204 @@ msgstr "Nível: %d" msgid "Lvl: %d (%+d)" msgstr "Nível: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guilda" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Convidou o jogador %s para a guilda %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Saída da Guilda %s requisitada." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Convite de membros para a Guilda." -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Quem você gostaria de convidar para a guilda %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Sair da guilda?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Tem certeza que deseja sair da guilda %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupo" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Convidou usuário %s para o grupo." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Saída do grupo %s requisitada." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Convite de membros para o grupo" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Quem você gostaria de convidar para o grupo %s?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Sair do grupo?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Tem certeza que deseja sair do grupo %s?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Atq" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Mobs Prioritarios" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Atacar Mobs" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" -msgstr "Ignorar mobss" +msgstr "Ignorar mobs" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Criar guilda" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Criar grupo" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Convidar" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "J" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "A" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Aceitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Rejeitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Aceitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Rejeitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Criando guilda chamada %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Criando grupo chamado %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Nome da guilda" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Escolha o nome da sua guilda." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Requisição de guilda recebida, mas já existe uma." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s te convidou para entrar na guilda %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Aceitar convite para a guilda" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Requisição de grupo recebida, mas já existe um." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." -msgstr "Você foi convidado para entrar em um grupo." +msgstr "Você foi convidado(a) para entrar em um grupo." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." -msgstr "Você foi convidado para entrar no grupo %s." +msgstr "Você foi convidado(a) para entrar no grupo %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s te convidou para entrar em seu grupo." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s te convidou para entrar no grupo %s." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Aceitar convite para o grupo" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Não foi possível criar o grupo. Você já faz parte de um." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Nome do grupo" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Escolha o nome do seu grupo." @@ -3108,33 +3121,33 @@ msgstr "" msgid "Name: %s" msgstr "Nome: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Atualizando..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Jogar" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 O processo de update está incompleto." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 É altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Concluído" @@ -3196,7 +3209,7 @@ msgstr "Efeitos de partícula" #: src/gui/userpalette.cpp:132 msgid "Pickup Notification" -msgstr "Aviso ao pegar algo" +msgstr "Aviso ao pegar algum item" #: src/gui/userpalette.cpp:133 msgid "Exp Notification" @@ -3220,7 +3233,7 @@ msgstr "Monstro Acerta Jogador" #: src/gui/userpalette.cpp:140 msgid "Other Player Hits Local Player" -msgstr "Outro jogador ataca você" +msgstr "Outro jogador(a) ataca você" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" @@ -3497,7 +3510,7 @@ msgstr "Quem esta online" #: src/gui/windowmenu.cpp:69 msgid "KS" -msgstr "KS" +msgstr "EST" #: src/gui/windowmenu.cpp:71 msgid "Smilies" @@ -3937,7 +3950,7 @@ msgstr "Mudar contador de descarte" #: src/keyboardconfig.cpp:328 msgid "Quick heal target or self" -msgstr "Curar um alvo ou você mesmo" +msgstr "Curar um alvo ou você mesmo(a)" #: src/keyboardconfig.cpp:330 msgid "Use #itenplz spell" @@ -4008,435 +4021,443 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" -msgstr "Você foi morto por %s" +msgstr "Você foi morto(a) por %s" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Problema desconhecido ao tentar pegar item." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Você pegou %d [@@%d|%s@@]." msgstr[1] "Você pegou %d [@@%d|%s@@]." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) Movimento desconhecido" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) movimento louco numero %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) movimentos loucos" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) Alcance de arqueiros" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) Ataque" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) atacar todos inimigos" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" -msgstr "(f) não atacar amigos" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" +msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) atacar más relações" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) não atacar jogadores" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) Ataque PVP" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) Mímica padrão" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) Mímica de roupas" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) Mímica" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) Ausente" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) Ausente" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo ativados" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "Modificador de jogo desconhecido" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Você vê " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opções] [manaplus-arquivo]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "usado para definir parâmetros customizados" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "para o cliente manaplus. " -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Escolhe um personagem e um servidor de personagem " "padrão" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr "" " -d --data : Pasta de onde os dados do jogo vão ser carregados" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" " -L --localdata-dir : Diretório a ser usado como pasta de dados local" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --testes : Começar a testar drivers para auto configuração" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4492,7 +4513,7 @@ msgstr "Erro desconhecido do char-server." msgid "Failed to create character. Most likely the name is already taken." msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Nome errado." @@ -4641,7 +4662,7 @@ msgstr "Castelo Guilda : %s" #: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." -msgstr "Não foi possível convidar jogador para a guilda." +msgstr "Não foi possível convidar jogador(a) para a guilda." #: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." @@ -4671,7 +4692,7 @@ msgstr "Você foi expulso da guilda." #: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." -msgstr "%s foi expulso da Guilda." +msgstr "%s foi expulso(a) da Guilda." #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" @@ -4792,70 +4813,70 @@ msgstr "Falha ao usar item." msgid "Unable to equip." msgstr "Impossível equipar." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Conta não encontrada. Por favor, tente novamente." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Senha antiga incorreta." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Nova senha é muito curta." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Erro desconhecido." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "ID não registrado." -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Senha incorreta." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "A conta expirou." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Rejeitado pelo servidor." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -"Você foi permanentemente banido do jogo. Por favor entre em contato com " +"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com " "algum GM." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Cliente muito antigo." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" -"Você banido do jogo até %s.\n" +"Você banido(a) do jogo até %s.\n" "Por favor entre em contato com algum GM através do fórum." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Server lotado." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Este nome de usuário já está em uso." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Usuário deletado." @@ -4913,7 +4934,7 @@ msgstr "Um membro desconhecido tentou dizer: %s" #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." -msgstr "Você está morto." +msgstr "Você está morto(a)." #: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." @@ -4921,7 +4942,7 @@ msgstr "Lamentamos informar que seu personagem foi morto em combate." #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." -msgstr "Você não me parece assim tão vivo." +msgstr "Você não me parece assim tão vivo(a)." #: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." @@ -5025,7 +5046,7 @@ msgstr "" #: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." -msgstr "Você é um ex-jogador" +msgstr "Você é um(a) ex-jogador(a)." #: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." @@ -5382,7 +5403,7 @@ msgstr "Convite enviado." #: src/net/manaserv/guildhandler.cpp:207 msgid "Member was promoted successfully." -msgstr "Membro foi promovido com sucesso." +msgstr "Membro foi promovido(a) com sucesso." #: src/net/manaserv/guildhandler.cpp:212 msgid "Failed to promote member." @@ -5570,7 +5591,7 @@ msgstr "Erro de conexão desconhecido." #: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" -msgstr "Você foi desconectado do servidor!" +msgstr "Você foi desconectado(a) do servidor!" #: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" diff --git a/po/pt_BR.po b/po/pt_BR.po index 16e7618a7..92cc956a1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-03 23:57+0000\n" -"Last-Translator: freya \n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:09+0000\n" +"Last-Translator: Andrei Karas \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/" "manaplus/team/pt_BR/)\n" "Language: pt_BR\n" @@ -45,47 +45,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "por peso" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vídeo" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "Temas" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "por quantidade" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "por tipo" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" -msgstr "Habilitar rolagem preguisoça " +msgstr "Habilitar rolagem suave" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" -msgstr "Rolagem preguiçosa" +msgstr "Rolagem suave" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,50 +95,50 @@ msgstr "Mudando servidores do jogo" msgid "Error" msgstr "Erro" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s não existe e não pode ser criado! Saindo." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." @@ -323,43 +323,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Geral" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Depurador" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Screenshot salva como " -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Falha ao salvar screenshot!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Não foi possível carregar o mapa" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -392,20 +392,20 @@ msgstr "Analizador de bot" msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Mover" @@ -418,8 +418,8 @@ msgid "Reset" msgstr "Resetar" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Comprar" @@ -467,8 +467,8 @@ msgstr "Máximo" msgid "Shop" msgstr "Loja" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -478,18 +478,18 @@ msgstr "Vender" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Cancelar" @@ -525,7 +525,7 @@ msgstr "Os emails informados não são iguais." msgid "Change Password" msgstr "Alterar senha" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Senha:" @@ -557,7 +557,7 @@ msgid "New Character" msgstr "Novo Personagem" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Nome:" @@ -593,7 +593,7 @@ msgid "Race:" msgstr "Corrida:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Criar" @@ -736,7 +736,7 @@ msgid "rainbow 3" msgstr "arco-íris 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -767,13 +767,13 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Ignora" @@ -913,25 +913,25 @@ msgstr "Entrada: %d bytes/s" msgid "Out: %d bytes/s" msgstr "Saída: %d bytes/s" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Você Sabia?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Fechar" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Anterior" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Próximo >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Auto abrir esta janela" @@ -971,12 +971,12 @@ msgstr "Equipamento" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Desequipar" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Ajuda" @@ -1014,31 +1014,31 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Dividir" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Roupas" @@ -1047,17 +1047,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1199,43 +1199,43 @@ msgstr "Aparição do JackO" msgid "You have left the guild." msgstr "Você saiu da Guilda." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Normal" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Fechar" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Passar" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Login" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Servidor:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Atualizações customizadas" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Lembrar usuário" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Atualização:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Registrar" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Trocar servidor" @@ -1296,7 +1296,7 @@ msgstr "Enviar" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Limpar" @@ -1329,357 +1329,357 @@ msgstr "Desequipar antes" #: src/gui/outfitwindow.cpp:94 msgid "Away outfit" -msgstr "Roupas de ocupado" +msgstr "Roupas em modo ausente" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Negócios" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Mensagem Privada:" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Cura" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Ser amigo" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Ser inimigo" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Lista Negra" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Definir como inimigo" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Apagar" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Não ignorar" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Imitar" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Convidar para grupo" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Expulsar do grupo" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Expulsar da guilda" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Mudar pos na Guilda" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Convidar pra Guilda" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Chutar Jogador" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Nu" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Mostrar itens:" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Despir" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Add comentário" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "vender (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Chutar" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Remover da lista de ataque" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Adicionar na prioridade da lista de ataques" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Adicionar a lista de ataques" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Adicionar a lista de ignorados" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Adicionar nome ao chat" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Jogadores" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Nome no chat" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Mapa Item" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Remover" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Urdidura" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "Limpar conjunto de roupas" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Feitiços" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Carregar velhos feitiços" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Editar feitiços" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Desabilitar destaque" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Habilitar destaque" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "Não retire o nome" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Remover o nome" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Habilitar modo indisponível" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Desabilitar modo indisponível" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Sair" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "Copiar para a área de transferência" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Mudar a posição da guilda" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "Zerar barra amarela" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copiar para chat" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Mover para cima" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Mover para baixo" @@ -1797,7 +1797,7 @@ msgstr "Habilitar música" #: src/gui/setup_audio.cpp:54 msgid "Enable mumble voice chat" -msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\"" +msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)" #: src/gui/setup_audio.cpp:56 msgid "Download music" @@ -2001,7 +2001,7 @@ msgstr "Habilitar joystick" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "Usar joystick se a janela do cliente estiver inativa" +msgstr "Usar joystick se a janela do jogo estiver inativa" #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -2093,11 +2093,11 @@ msgstr "Desenhar atalhos no mapa" #: src/gui/setup_other.cpp:87 msgid "Enable lazy scrolling" -msgstr "Habilitar rolagem preguiçosa" +msgstr "Habilitar rolagem suave" #: src/gui/setup_other.cpp:90 msgid "Scroll laziness" -msgstr "Rolagem preguiçosa" +msgstr "Rolagem suave" #: src/gui/setup_other.cpp:93 msgid "Scroll radius" @@ -2149,7 +2149,7 @@ msgstr "Mostrar popups de jogadores" #: src/gui/setup_other.cpp:129 msgid "Afk message" -msgstr "Mensagem Ausente" +msgstr "Mensagem em modo Ausente" #: src/gui/setup_other.cpp:132 msgid "Show job" @@ -2181,7 +2181,7 @@ msgstr "Suporte de bots" #: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" -msgstr "Habilitar suporte ao bot de leilão" +msgstr "Habilitar suporte ao AuctionBot " #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" @@ -2229,7 +2229,8 @@ msgstr "Aceleração por HW" #: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" -msgstr "Habilitar cache de opacidade (Software, pode se usar muita memória)" +msgstr "" +"Habilitar cache de transparência (Software, pode se usar muita memória)" #: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" @@ -2281,7 +2282,7 @@ msgstr "Ativar segmentação de mouse prolongado" #: src/gui/setup_players.cpp:66 msgid "Target dead players" -msgstr "Jogadores mortos como alvo" +msgstr "Jogadores(as) mortos(as) como alvo" #: src/gui/setup_players.cpp:69 msgid "Visible names" @@ -2301,7 +2302,7 @@ msgstr "Mostrar status" #: src/gui/setup_players.cpp:81 msgid "Show ip addresses on screenshots" -msgstr "Mostrar endereço de ip nas capturas de tela" +msgstr "Mostrar endereço de IP em Capturas de Tela" #: src/gui/setup_players.cpp:84 msgid "Allow self heal with mouse click" @@ -2473,7 +2474,7 @@ msgstr "Fonte segura" #: src/gui/setup_theme.cpp:200 msgid "Japanese font" -msgstr "Font Japonesa" +msgstr "Fontes japonesas" #: src/gui/setup_theme.cpp:237 msgid "Font size" @@ -2518,7 +2519,7 @@ msgstr "Bolhas com nomes" #: src/gui/setup_video.cpp:242 msgid "off" -msgstr "off" +msgstr "Desligado" #: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261 msgid "low" @@ -2560,24 +2561,24 @@ msgstr "em chat" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:299 msgid "as particle" -msgstr "como partícula" +msgstr "Como partícula" #: src/gui/setup_video.cpp:301 msgid "Enable resize" -msgstr "Habilitar redimensionamento" +msgstr "Habilitar redimensionamento de janela" #: src/gui/setup_video.cpp:302 msgid "No frame" -msgstr "Sem quadros" +msgstr "Sem moldura de janela" #: src/gui/setup_video.cpp:306 msgid "FPS limit:" -msgstr "Limite FPS:" +msgstr "Limite de FPS:" #: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345 #: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730 msgid "Alt FPS limit: " -msgstr "Limite FPS alt: " +msgstr "Limite de FPS alternativo: " #: src/gui/setup_video.cpp:325 msgid "Overhead text" @@ -2585,7 +2586,7 @@ msgstr "Texto sobrescrito como:" #: src/gui/setup_video.cpp:326 msgid "Gui opacity" -msgstr "Opacidade" +msgstr "Transparência de janelas" #: src/gui/setup_video.cpp:327 msgid "Ambient FX" @@ -2702,6 +2703,14 @@ msgstr "+" msgid "Skill points available: %d" msgstr "Pontos de habilidade disponíveis: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2712,6 +2721,11 @@ msgstr "Habilidade %d" msgid "Skill %d" msgstr "Habilidade %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2722,204 +2736,204 @@ msgstr "Nível: %d" msgid "Lvl: %d (%+d)" msgstr "Nível: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guilda" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Convidou o jogador %s para a guilda %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Saída da Guilda %s requisitada." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Convite de membros para a Guilda." -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Quem você gostaria de convidar para a guilda %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Sair da guilda?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Tem certeza que deseja sair da guilda %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupo" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Convidou usuário %s para o grupo." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Saída do grupo %s requisitada." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Convite de membros para o grupo" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Quem você gostaria de convidar para o grupo %s?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Sair do grupo?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Tem certeza que deseja sair do grupo %s?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Ataque" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Mobs prioritarios " -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Atacar mobs" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Ignorar mobs" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Criar guilda" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Criar grupo" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Convidar" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "J" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "A" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Aceitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Rejeitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Aceitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Rejeitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Criando guilda chamada %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Criando grupo chamado %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Nome da guilda" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Escolha o nome da sua guilda." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Requisição de guilda recebida, mas já existe uma." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s te convidou para entrar na guilda %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Aceitar convite para a guilda" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Requisição de grupo recebida, mas já existe um." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." -msgstr "Você foi convidado para entrar em um grupo." +msgstr "Você foi convidado(a) para entrar em um grupo." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." -msgstr "Você foi convidado para entrar no grupo %s." +msgstr "Você foi convidado(a) para entrar no grupo %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s te convidou para entrar em seu grupo." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s te convidou para entrar no grupo %s." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Aceitar convite para o grupo" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Não foi possível criar o grupo. Você já faz parte de um." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Nome do grupo" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Escolha o nome do seu grupo." @@ -3110,33 +3124,33 @@ msgstr "" msgid "Name: %s" msgstr "Nome: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Atualizando..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Jogar" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 O processo de update está incompleto." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 É altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Concluído" @@ -3198,7 +3212,7 @@ msgstr "Efeitos de partícula" #: src/gui/userpalette.cpp:132 msgid "Pickup Notification" -msgstr "Aviso ao pegar algo" +msgstr "Aviso ao pegar algum item" #: src/gui/userpalette.cpp:133 msgid "Exp Notification" @@ -3222,7 +3236,7 @@ msgstr "Monstro Acerta Jogador" #: src/gui/userpalette.cpp:140 msgid "Other Player Hits Local Player" -msgstr "Outro jogador ataca você" +msgstr "Outro jogador(a) ataca você" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" @@ -3499,7 +3513,7 @@ msgstr "Quem esta online" #: src/gui/windowmenu.cpp:69 msgid "KS" -msgstr "KS" +msgstr "EST" #: src/gui/windowmenu.cpp:71 msgid "Smilies" @@ -3939,7 +3953,7 @@ msgstr "Mudar contador de descarte" #: src/keyboardconfig.cpp:328 msgid "Quick heal target or self" -msgstr "Curar um alvo ou você mesmo" +msgstr "Curar um alvo ou você mesmo(a)" #: src/keyboardconfig.cpp:330 msgid "Use #itenplz spell" @@ -4010,434 +4024,442 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" -msgstr "Você foi morto por %s" +msgstr "Você foi morto(a) por %s" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Problema desconhecido ao tentar pegar item." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Você pegou %d [@@%d|%s@@]." msgstr[1] "Você pegou %d [@@%d|%s@@]." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) movimento desconhecido" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) movimento louco número %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) Movimentos loucos" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) Alcance ataque de arqueiro" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) Ataque" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) atacar qualquer jogador" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" -msgstr "(f) não atacar amigos" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" +msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) atacar más relações" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) não atacar jogadores" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) ataque em pvp" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) Mímica padrão" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) Mímica de roupas" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) Mímica" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" -msgstr "(A) Ausente" +msgstr "(A) Modo Ausente" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) Ausente" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "Modificadores são desconhecidos" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Seguindo cancelado" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Você vê " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "Manaplus [opções] [manaplus-arquivo]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "Usado para parâmetros customizados" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "Para o cliente Manaplus." -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Escolhe um personagem e um servidor de personagem " "padrão" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr "" " -d --data : Pasta de onde os dados do jogo vão ser carregados" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" " -L --localdata-dir : Diretório a ser usado como pasta de dados local" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr " -T --testes : Começa a testar drivers e a auto-configurar" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4493,7 +4515,7 @@ msgstr "Erro desconhecido do char-server." msgid "Failed to create character. Most likely the name is already taken." msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Nome errado." @@ -4642,7 +4664,7 @@ msgstr "Castelo Guilda : %s" #: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." -msgstr "Não foi possível convidar jogador para a guilda." +msgstr "Não foi possível convidar jogador(a) para a guilda." #: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." @@ -4672,7 +4694,7 @@ msgstr "Você foi expulso da guilda." #: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." -msgstr "%s foi expulso da Guilda." +msgstr "%s foi expulso(a) da Guilda." #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" @@ -4793,53 +4815,53 @@ msgstr "Falha ao usar item." msgid "Unable to equip." msgstr "Impossível equipar." -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Conta não encontrada. Por favor, tente novamente." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Senha antiga incorreta." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Nova senha é muito curta." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Erro desconhecido." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "ID não registrado." -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Senha incorreta." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "A conta expirou." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Rejeitado pelo servidor." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -"Você foi permanentemente banido do jogo. Por favor entre em contato com " +"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com " "algum GM." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Cliente muito antigo." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4848,15 +4870,15 @@ msgstr "" "Você banido do jogo até %s.\n" "Por favor entre em contato com algum GM através do fórum." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Servidor lotado." -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Este nome de usuário já está em uso." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Usuário apagado permanentemente. " @@ -4918,7 +4940,7 @@ msgstr "Você está morto." #: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." -msgstr "Lamentamos informar que seu personagem foi morto em combate." +msgstr "Lamentamos informar que seu personagem foi morto(a) em combate." #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." @@ -5026,7 +5048,7 @@ msgstr "" #: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." -msgstr "Você é um ex-jogador" +msgstr "Você é um ex-jogador(a)" #: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." @@ -5571,7 +5593,7 @@ msgstr "Erro de conexão desconhecido." #: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" -msgstr "Você foi desconectado do servidor!" +msgstr "Você foi desconectado(a) do servidor!" #: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" diff --git a/po/ru.po b/po/ru.po index f04b59c32..5d32213fe 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" -"PO-Revision-Date: 2012-02-02 16:46+0000\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"PO-Revision-Date: 2012-02-05 23:11+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/" "ru/)\n" @@ -45,47 +45,47 @@ msgstr "О" msgid "I" msgstr "Б" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Настройка" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Производительность" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Видео" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "Темы" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "Идет подключение к серверу..." -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "Авторизация" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "Входим в игровой мир" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "Получение списка персонажей" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "Подключение к игровому серверу" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "Смена игрового сервера" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,50 +95,50 @@ msgstr "Смена игрового сервера" msgid "Error" msgstr "Ошибка" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "Запрос регистрационных данных" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "Изменить Пароль" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "Пароль изменен!" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "Сменить Email" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "Email изменен!" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "Регистрация удалена" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "Хорошо, возвращайтесь в любое время..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s не существует, и не может быть создано! Выход." -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "Некорректный сервер обновлений: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "Ошибка создания директории для обновлений!" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Ошибка: %s не существует, и не может быть создан! Выход." @@ -329,43 +329,43 @@ msgstr "" "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или " "\"0\"." -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "Общие" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "Отладка" -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "Снимок экрана сохранен как " -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "Ошибка при сохранении снимка экрана!" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "Соединение с сервером потеряно." -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "Ошибка сети" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "Игнорировать предложения о торговле" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "Принимать предложения о торговле" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "Не удалось загрузить карту" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "Ошибка во время загрузки %s" @@ -398,20 +398,20 @@ msgstr "Окно детектора ботов" msgid "Name" msgstr "Имя" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Атака" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Разговор" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Движение" @@ -424,8 +424,8 @@ msgid "Reset" msgstr "Сбросить" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "Купить" @@ -473,8 +473,8 @@ msgstr "Макс" msgid "Shop" msgstr "Магазин" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -484,18 +484,18 @@ msgstr "Продать" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "Отмена" @@ -531,7 +531,7 @@ msgstr "Адрес E-mail не совпадает" msgid "Change Password" msgstr "Изменить пароль" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "Пароль:" @@ -563,7 +563,7 @@ msgid "New Character" msgstr "Новый персонаж" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "Имя:" @@ -599,7 +599,7 @@ msgid "Race:" msgstr "Раса:" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "Создать" @@ -742,7 +742,7 @@ msgid "rainbow 3" msgstr "радуга 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -773,13 +773,13 @@ msgstr "Да" msgid "No" msgstr "Нет" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "Игнорировать" @@ -919,25 +919,25 @@ msgstr "Вх.: %d байт/сек." msgid "Out: %d bytes/s" msgstr "Исх.: %d байт/сек." -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "Вы знаете?" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "Закрыть" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "< Предыдущий" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "Следующий >" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "Автоматически открывать это окно" @@ -977,12 +977,12 @@ msgstr "Снаряжение" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "Снять" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "Помощь" @@ -1020,31 +1020,31 @@ msgid "Filter:" msgstr "Фильтр:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "Надеть" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "Использовать" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "Бросить" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "Разделить" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "Наряды" @@ -1053,17 +1053,17 @@ msgid "Weight:" msgstr "Вес:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "Сохранить" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "Получить" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Бросить" @@ -1207,43 +1207,43 @@ msgstr "jacko появляется" msgid "You have left the guild." msgstr "Вы покинули гильдию." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "Нормально" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "Авт. закрыть" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "Пропустить" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "Вход" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Сервер:" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "Польз. сайт обновлений" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "Запомнить логин" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "Обновления:" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "Регистрация" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "Сменить сервер" @@ -1304,7 +1304,7 @@ msgstr "Применить" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "Очистить" @@ -1339,355 +1339,355 @@ msgstr "Сначала снять" msgid "Away outfit" msgstr "наряд отсутствия" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Торговать" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "Приват" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "Лечить" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "Подружиться" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "Пренебречь" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 +#: src/gui/popupmenu.cpp:717 msgid "Black list" msgstr "Черный список" -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 -#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:703 msgid "Set as enemy" msgstr "Сделать врагом" -#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 -#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "Стереть" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "Не игнорировать" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "@@ignore|Полностью игнорировать@@" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "Следовать" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "Имитировать" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "Пригласить в группу" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "Выкинуть из группы" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "Выкинуть из гильдии" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "Сменить позицию в гильдии" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "Пригласить в гильдию" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "Кикнуть игрока" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "Уничтожить" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "Показать предметы" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "Раздеть" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "Добавить коментарий" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "Купить (?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "Продать (?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "Кикнуть" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "Удалить из списка атаки" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "Добавить в приоритетный список" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "Добавить в список атаки" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "Добавить в список игнорирования" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "Добавить имя в чат" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "Игроки" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "Поднять" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "Добавить в чат" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "Элмент карты" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "Переименовать" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "Удалить" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "Прыгнуть" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "Очистить наряд" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Заклинания" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "Загрузить старые заклинания" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "Изменить заклинание" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "Отключить уведомление" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "Включить уведомление" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "Не скрывать имя" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "Скрывать имя" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "Рарешить режим отошел" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "Запретить режим отошел" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "Покинуть" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "Копировать в буфер обмена" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "Сменить позицию в гильдии" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "Переименовать знак на карте" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "Имя: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "Комментарий " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "Комментарий: " -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "Добавить к сделке" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "Добавить к сделке 10" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "Добавить к сделке половину" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "Добавить к торговле все" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "Сохранить 10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "Сохранить половину" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "Сохранить все" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "Бросить все" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "Получить 10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "Получить половину" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "Получить все" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "Загрузить старые горячие клавиши предметов" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "Загрузить старые данные" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "Спрятать" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "Показать" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "сбросить настройки" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Скопировать в чат" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(по умолчанию)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "Передвинуть выше" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "Передвинуть ниже" @@ -2717,6 +2717,14 @@ msgstr "Верх" msgid "Skill points available: %d" msgstr "Очков навыков осталось: %d" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "базовые" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "Умение: базовое, Ид: 1" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2727,6 +2735,11 @@ msgstr "Умение %d" msgid "Skill %d" msgstr "Умение %d" +#: src/gui/skilldialog.cpp:438 +#, c-format +msgid "Skill: %s, Id: %d" +msgstr "Умение: %s, Ид: %d" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2737,204 +2750,204 @@ msgstr "Уровень: %d" msgid "Lvl: %d (%+d)" msgstr "Уровень: %d (%+d)" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Гильдия" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "Пользователь %s приглашен в гильдию %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "Выход из гильдии %s запрошен." -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "Приглашение игрока в Гильдию" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Кого вы хотите пригласить в гильдию %s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "Покинуть Гильдию?" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Вы действительно хотите выйти из гильдии %s?" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Группа" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "Пригласить пользователя %s в группу." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "Запрошен выход из группы %s." -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "Пригласить пользователя в группу" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Кого вы хотите пригласить в группу %s?" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "Покинуть группу?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Вы действительно хотите покинуть группу %s?" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "Нав" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "Атк" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "Приоритетные монстры" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "Атакуемые монстры" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "Игнорируемые монстры" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "Создать Гильдию" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "Создать группу" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Общество" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "Пригласить" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "И" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "Д" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "Принято приглашение в группу от %s." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "Отклонено приглашение в группу от %s." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "Принято приглашение в гильдию от %s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "Отклонено приглашение в гильдию от %s." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "Создание гильдии с именем %s." -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "Создание группы с именем %s." -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "Имя гильдии" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "Выберите имя для гильдии." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "Получено приглашение в гильдию, но оно не первое." -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s приглашает присоединиться к гильдии %s." -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "Принять приглашение в гильдию" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "Получено приглашение в группу, но оно не порвое." -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "Вас приглашают в группу." -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "Вас приглашают присоединиться к группе %s." -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s приглашает Вас к себе в группу." -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s приглашает присоединиться к %s группе." -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "Принять приглашение в группу" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "Не удалось создать группу. Вы уже состоите в другой." -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "Имя группы" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "Выберите имя будущей группы." @@ -3126,33 +3139,33 @@ msgstr "" msgid "Name: %s" msgstr "Имя: %s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "Обновление..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "Соединение..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "Играть" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 Процесс обновления не завершен!" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 Настоятельно рекомендуется" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "##1 попытаться еще раз немного погодя." -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "Завершено" @@ -4027,42 +4040,42 @@ msgstr "" "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно " "вести." -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "Вас убил %s" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "Попытка поднять несуществующий предмет." -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "Предмет слишком тяжелый." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "Предмет слишком далеко" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "Инвентарь переполнен." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "Слишком много предметов." -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "Предмет принадлежит кому-то еще." -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "Неизвестная проблема при поднятии предмета." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4070,390 +4083,398 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]." msgstr[1] "Вы подняли %d [@@%d|%s@@]." msgstr[2] "Вы подняли %d [@@%d|%s@@]." -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +msgid "xp" +msgstr "опыт" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "работа" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "(D) движения по умолчанию" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "(I) обратное движение" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "(c) обычное движение иногда с сумашедшими движениями" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "(C) движение с сумашедшими движениями" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "(d) нормальные и сумашедшие движения" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "(?) неизвестное движение" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) сумасшедшее движение %d" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "(a) пользовательские сумашедшие движения" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "(?) неизвестные сумасшедшие движения" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "(0) обычное движение к цели" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "(1) движение к цели на расстояние 1" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "(2) движение к цели на расстояние 2" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "(3) движение к цели на расстояние 3" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "(5) движение к цели на расстояние 5" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "(7) движение к цели на расстояние 7" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "(A) движение к цели на расстояние атаки" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "(a) атака лучника" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?) неизвестное движение к цели" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "(D) следование по умолчанию" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "(R) относительное следование" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "(M) зеркальное следование" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "(P) следование как животное" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "(?) неизвестное следование" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) неизвестная атака" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "(D) обычная атака" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "(s) переключение атаки без щита" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "(S) переключение атаки со щитом" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) идти и атаковать" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "(A) идти, атаковать, собирать" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "(d) без автоатаки" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "(S) поднятие в области 1x1" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "(D) поднятие из области 2x1" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "(F) поднятие из области спереди 2x3" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "(3) поднятие из области 3x3" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "(g) движение и поднятие на расстоянии 4" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "(g) движение и поднятие на расстоянии 8" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "(A) движение и поднятие на максимальном расстоянии" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?) неизвестный режим поднятия" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "(N) обычный режим карты" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "(D) отладочный режим карты" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "(u) специальный режим карты" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "(U) специальный режим карты 2" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "(e) режим пустой карты" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "(b) черно-белый режим карты" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "(f) использовать #flar для атаки" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "(c) использовать #chiza для атаки" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "(I) использовать #ingrav для атаки" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "(F) использовать #frillyar для атаки" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "(U) использовать #upmarmu для атаки" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "(?) неизвестная магическая атака" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "(a) атаковать всех игроков" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" msgstr "(f) атаковать всех кроме друзей" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "(b) атаковать врагов" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "(d) не атаковать игроков" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "(?) pvp атака" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "(D) имитация по умолчанию" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "(O) имитация нарядов" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "(?) неизвестная имитация" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "Отошел" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "(O) возле компьютера" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "(A) отошел" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "(?) неизвестный режим отошел" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "(G) игровая камера" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "(F) свободная камера" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "Игровые модификаторы включены" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "Игровые модификаторы выключены" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "Игровые модификаторы в неизвестном положении" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "Следование: " -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "Следование отменено" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "Имитация: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "Имитация отменена" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "Вы видите " -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [параметры] [файл-manaplus]" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr " используется для указания дополнительных параметров" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr " в клиенте." -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "Опции:" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Использовать указанный файл как лог" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Использовать указанный каталог для лога" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr " -v --version : Показать версию" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr " -h --help : Показать эту справку" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Использовать указанный каталог конфигурации" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr " -U --username : Войти с указанным логином" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr " -P --password : Войти с указанным паролем" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr " -c --character : Использовать указанный персонаж" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr " -s --server : Имя или IP сервера авторизации" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr " -p --port : Порт сервера авторизации" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr " --update-host : Использовать этот узел обновлений" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Выбрать персонаж и сервер персонажей по умолчанию" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Пропустить обновление" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Загрузить игровые данные из этого каталога" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Каталог для локальных данных" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Сохранять скриншоты в указанном каталоге" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Запуск игры в безопасном режиме" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : Запускает проверку драйверов и автоконфигурацию" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Не использовать OpenGL для этой сессии" @@ -4510,7 +4531,7 @@ msgstr "Неизвестная ошибка сервера персонажей. msgid "Failed to create character. Most likely the name is already taken." msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется." -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "Некорректное имя." @@ -4808,51 +4829,51 @@ msgstr "Не удалось использовать предмет." msgid "Unable to equip." msgstr "Нельзя экипировать!" -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "Учетная запись не найдена. Попробуйте снова." -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "Старый пароль указан неверно." -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "Новый пароль слишком короткий." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "Неизвестная ошибка." -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "Незарегистрированный ID" -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "Неверный пароль" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "Учетная запись просрочена." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "Получен отказ от сервера.." -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "Клиент устарел" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4860,15 +4881,15 @@ msgid "" msgstr "" "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум." -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "Сервер переполнен" -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "Это имя пользователя уже занято." -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "Пользователь удален" diff --git a/po/zh_CN.po b/po/zh_CN.po index ca72c8765..271a4d4ef 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-04 15:55+0300\n" +"POT-Creation-Date: 2012-02-06 02:06+0300\n" "PO-Revision-Date: 2012-02-02 16:45+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/" @@ -43,47 +43,47 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "魔法攻击" -#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "性能" -#: src/client.cpp:965 src/gui/setup_video.cpp:319 +#: src/client.cpp:969 src/gui/setup_video.cpp:319 msgid "Video" msgstr "视频" -#: src/client.cpp:970 +#: src/client.cpp:974 msgid "Themes" msgstr "主题" -#: src/client.cpp:1052 +#: src/client.cpp:1056 msgid "Connecting to server" msgstr "魔法防御" -#: src/client.cpp:1083 +#: src/client.cpp:1088 msgid "Logging in" msgstr "尝试捡起不存在的物品。" -#: src/client.cpp:1116 +#: src/client.cpp:1121 msgid "Entering game world" msgstr "捡起物品发生不存在的物品。" -#: src/client.cpp:1217 +#: src/client.cpp:1222 msgid "Requesting characters" msgstr "请求角色" -#: src/client.cpp:1252 +#: src/client.cpp:1257 msgid "Connecting to the game server" msgstr "连接到游戏服务器" -#: src/client.cpp:1262 +#: src/client.cpp:1267 msgid "Changing game servers" msgstr "更改游戏服务器" -#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446 +#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,50 +93,50 @@ msgstr "更改游戏服务器" msgid "Error" msgstr "错误" -#: src/client.cpp:1321 +#: src/client.cpp:1326 msgid "Requesting registration details" msgstr "请求注册的详细信息" -#: src/client.cpp:1347 +#: src/client.cpp:1352 msgid "Password Change" msgstr "密码更改" -#: src/client.cpp:1348 +#: src/client.cpp:1353 msgid "Password changed successfully!" msgstr "更改密码成功！" -#: src/client.cpp:1367 +#: src/client.cpp:1372 msgid "Email Change" msgstr "更改电子邮件" -#: src/client.cpp:1368 +#: src/client.cpp:1373 msgid "Email changed successfully!" msgstr "更改电子邮件成功！" -#: src/client.cpp:1388 +#: src/client.cpp:1393 msgid "Unregister Successful" msgstr "注销成功" -#: src/client.cpp:1389 +#: src/client.cpp:1394 msgid "Farewell, come back any time..." msgstr "再见，随时欢迎回来... ..." -#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642 -#: src/client.cpp:2074 src/client.cpp:2081 +#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 +#: src/client.cpp:2079 src/client.cpp:2086 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s 不存在，并且无法创建！退出。" -#: src/client.cpp:1780 +#: src/client.cpp:1785 #, c-format msgid "Invalid update host: %s" msgstr "无效的更新主机: %s" -#: src/client.cpp:1814 src/client.cpp:1820 +#: src/client.cpp:1819 src/client.cpp:1825 msgid "Error creating updates directory!" msgstr "创建更新目录错误！" -#: src/client.cpp:1841 +#: src/client.cpp:1846 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "错误：%s 不存在并且无法创建！退出。" @@ -313,43 +313,43 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。" -#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413 +#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413 msgid "General" msgstr "常规" -#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 +#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415 msgid "Debug" msgstr "调试 " -#: src/game.cpp:510 +#: src/game.cpp:512 msgid "Screenshot saved as " msgstr "截图保存为" -#: src/game.cpp:518 +#: src/game.cpp:520 msgid "Saving screenshot failed!" msgstr "保存屏幕快照失败！" -#: src/game.cpp:560 +#: src/game.cpp:562 msgid "The connection to the server was lost." msgstr "服务器的连接丢失。" -#: src/game.cpp:561 +#: src/game.cpp:563 msgid "Network Error" msgstr "网络错误" -#: src/game.cpp:1273 +#: src/game.cpp:1275 msgid "Ignoring incoming trade requests" msgstr "忽略新进的交易请求" -#: src/game.cpp:1283 +#: src/game.cpp:1285 msgid "Accepting incoming trade requests" msgstr "接受传入的交易请求" -#: src/game.cpp:1797 +#: src/game.cpp:1799 msgid "Could Not Load Map" msgstr "不能加载地图" -#: src/game.cpp:1798 +#: src/game.cpp:1800 #, c-format msgid "Error while loading %s" msgstr "加载%s时出现错误" @@ -382,20 +382,20 @@ msgstr "挂机检查" msgid "Name" msgstr "姓名" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 -#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "攻击" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "说话" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481 -#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "移动" @@ -408,8 +408,8 @@ msgid "Reset" msgstr "重置" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 msgid "Buy" msgstr "购买" @@ -457,8 +457,8 @@ msgstr "最大" msgid "Shop" msgstr "商店" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 -#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282 +#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -468,18 +468,18 @@ msgstr "出售" #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58 -#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385 -#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592 -#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841 -#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850 -#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938 -#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022 -#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117 -#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55 -#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198 +#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593 +#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842 +#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851 +#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939 +#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118 +#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55 +#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51 -#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168 +#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169 msgid "Cancel" msgstr "取消" @@ -515,7 +515,7 @@ msgstr "电子邮件地址不匹配。" msgid "Change Password" msgstr "更换密码" -#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96 +#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56 msgid "Password:" msgstr "密码：" @@ -547,7 +547,7 @@ msgid "New Character" msgstr "" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 -#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75 +#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 msgid "Name:" msgstr "姓名" @@ -583,7 +583,7 @@ msgid "Race:" msgstr "" #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483 -#: src/gui/socialwindow.cpp:1260 +#: src/gui/socialwindow.cpp:1261 msgid "Create" msgstr "建立" @@ -726,7 +726,7 @@ msgid "rainbow 3" msgstr "彩虹3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 -#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 @@ -757,13 +757,13 @@ msgstr "是" msgid "No" msgstr "否" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167 -#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 -#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684 -#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701 -#: src/gui/popupmenu.cpp:715 +#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 +#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:716 msgid "Ignore" msgstr "忽略" @@ -903,25 +903,25 @@ msgstr "输入:%d 字节/" msgid "Out: %d bytes/s" msgstr "" -#: src/gui/didyouknowwindow.cpp:47 +#: src/gui/didyouknowwindow.cpp:48 msgid "Did You Know?" msgstr "你知道吗？" -#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 -#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114 +#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114 msgid "Close" msgstr "关闭" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:65 msgid "< Previous" msgstr "<上一页" -#: src/gui/didyouknowwindow.cpp:65 +#: src/gui/didyouknowwindow.cpp:66 msgid "Next >" msgstr "下一页>" -#: src/gui/didyouknowwindow.cpp:66 +#: src/gui/didyouknowwindow.cpp:67 msgid "Auto open this window" msgstr "自动打开这个窗口" @@ -961,12 +961,12 @@ msgstr "装备" #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 -#: src/gui/popupmenu.cpp:1955 +#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 +#: src/gui/popupmenu.cpp:1956 msgid "Unequip" msgstr "卸下装备" -#: src/gui/helpwindow.cpp:43 +#: src/gui/helpwindow.cpp:44 msgid "Help" msgstr "帮助" @@ -1004,31 +1004,31 @@ msgid "Filter:" msgstr "过滤器：" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 -#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815 +#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958 msgid "Equip" msgstr "装备" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914 -#: src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819 +#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915 +#: src/gui/popupmenu.cpp:1962 msgid "Use" msgstr "使用" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 -#: src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop..." msgstr "掉落... ..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976 msgid "Split" msgstr "分离" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:588 +#: src/gui/popupmenu.cpp:589 msgid "Outfits" msgstr "套装" @@ -1037,17 +1037,17 @@ msgid "Weight:" msgstr "重量：" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 -#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73 msgid "Store" msgstr "存储" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840 msgid "Retrieve" msgstr "取回" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "丢弃" @@ -1187,43 +1187,43 @@ msgstr "" msgid "You have left the guild." msgstr "你已经离开工会." -#: src/gui/logindialog.cpp:59 +#: src/gui/logindialog.cpp:60 msgid "Normal" msgstr "正常" -#: src/gui/logindialog.cpp:60 +#: src/gui/logindialog.cpp:61 msgid "Auto Close" msgstr "自动关闭" -#: src/gui/logindialog.cpp:61 +#: src/gui/logindialog.cpp:62 msgid "Skip" msgstr "跳过" -#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124 +#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125 msgid "Login" msgstr "登录" -#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173 +#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "服务器：" -#: src/gui/logindialog.cpp:97 +#: src/gui/logindialog.cpp:98 msgid "Custom update host" msgstr "自定义更新主机" -#: src/gui/logindialog.cpp:111 +#: src/gui/logindialog.cpp:112 msgid "Remember username" msgstr "记住用户名" -#: src/gui/logindialog.cpp:112 +#: src/gui/logindialog.cpp:113 msgid "Update:" msgstr "更新日期：" -#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81 +#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" msgstr "注册" -#: src/gui/logindialog.cpp:123 +#: src/gui/logindialog.cpp:124 msgid "Change Server" msgstr "更改服务器" @@ -1284,7 +1284,7 @@ msgstr "提交" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" msgstr "清除" @@ -1319,355 +1319,355 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "交易" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 +#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" msgstr "密语" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 +#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" msgstr "愈合" -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:683 msgid "Be friend" msgstr "是朋友" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 -#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 -#: src/gui/popupmenu.cpp:727 +#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 +#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430 +#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 +#: src/gui/popupmenu.cpp:728 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 -#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 -#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450 -#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 -#: src/gui/popupmenu.cpp:716 -msgid "Black list" -msgstr "" - #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 -#: src/gui/popupmenu.cpp:702 -msgid "Set as enemy" +#: src/gui/popupmenu.cpp:717 +msgid "Black list" msgstr "" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438 -#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451 +#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432 #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 -#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 -#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:703 +msgid "Set as enemy" +msgstr "" + +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 +#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189 +#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425 +#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439 +#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696 +#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710 +#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442 -#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 +#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708 +#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722 +#: src/gui/popupmenu.cpp:727 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457 -#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728 +#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 +#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 +#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 #: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "完全忽略" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Follow" msgstr "按照" -#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 -#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 +#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467 +#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 -#: src/gui/popupmenu.cpp:774 +#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:775 msgid "Kick from party" msgstr "踢从党" -#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792 msgid "Kick from guild" msgstr "踢从公会" -#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 -#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250 +#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 -#: src/gui/popupmenu.cpp:805 +#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508 +#: src/gui/popupmenu.cpp:806 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:266 msgid "Kick player" msgstr "踢球员" -#: src/gui/popupmenu.cpp:267 +#: src/gui/popupmenu.cpp:268 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 -#: src/gui/popupmenu.cpp:828 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 msgid "Show Items" msgstr "显示项目" -#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 +#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 -#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 -#: src/gui/popupmenu.cpp:830 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302 +#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742 +#: src/gui/popupmenu.cpp:831 msgid "Add comment" msgstr "发表评论" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 -#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Buy (?)" msgstr "购买(?)" -#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 -#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 +#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517 +#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837 msgid "Sell (?)" msgstr "出售(?)" -#: src/gui/popupmenu.cpp:312 +#: src/gui/popupmenu.cpp:313 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:323 +#: src/gui/popupmenu.cpp:324 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:329 msgid "Add to priority attack list" msgstr "优先攻击列表" -#: src/gui/popupmenu.cpp:330 +#: src/gui/popupmenu.cpp:331 msgid "Add to attack list" msgstr "加入攻击清单" -#: src/gui/popupmenu.cpp:332 +#: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48 msgid "Players" msgstr "玩家" -#: src/gui/popupmenu.cpp:546 +#: src/gui/popupmenu.cpp:547 msgid "Pick up" msgstr "拾取" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 -#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 +#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849 +#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980 msgid "Add to chat" msgstr "加入聊天" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:567 msgid "Map Item" msgstr "地图项" -#: src/gui/popupmenu.cpp:567 +#: src/gui/popupmenu.cpp:568 msgid "Rename" msgstr "重命名" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 -#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 +#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096 +#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:573 +#: src/gui/popupmenu.cpp:574 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:589 +#: src/gui/popupmenu.cpp:590 msgid "Clear outfit" msgstr "" -#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "法术" -#: src/gui/popupmenu.cpp:609 +#: src/gui/popupmenu.cpp:610 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:611 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:636 +#: src/gui/popupmenu.cpp:637 msgid "Disable highlight" msgstr "禁用" -#: src/gui/popupmenu.cpp:638 +#: src/gui/popupmenu.cpp:639 msgid "Enable highlight" msgstr "启用突出" -#: src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:641 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:642 +#: src/gui/popupmenu.cpp:643 msgid "Remove name" msgstr "移除姓名" -#: src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:645 msgid "Enable away" msgstr "启用远" -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:647 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 +#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263 msgid "Leave" msgstr "留下" -#: src/gui/popupmenu.cpp:654 +#: src/gui/popupmenu.cpp:655 msgid "Copy to clipboard" msgstr "" -#: src/gui/popupmenu.cpp:849 +#: src/gui/popupmenu.cpp:850 msgid "Change guild position" msgstr "更改公会的立场" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1335 +#: src/gui/popupmenu.cpp:1336 msgid "Rename map sign " msgstr "重命名的地图标志" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1337 +#: src/gui/popupmenu.cpp:1338 msgid "Name: " msgstr "名称：" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1382 +#: src/gui/popupmenu.cpp:1383 msgid "Player comment " msgstr "玩家评论" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1384 +#: src/gui/popupmenu.cpp:1385 msgid "Comment: " msgstr "评论：" -#: src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1787 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1790 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1791 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1793 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1802 +#: src/gui/popupmenu.cpp:1803 msgid "Store 10" msgstr "商店10" -#: src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1804 msgid "Store half" msgstr "商店的一半" -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1805 msgid "Store all" msgstr "商店所有" -#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 -#: src/gui/popupmenu.cpp:1967 +#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921 +#: src/gui/popupmenu.cpp:1968 msgid "Drop all" msgstr "所有" -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve 10" msgstr "拿出10" -#: src/gui/popupmenu.cpp:1844 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve half" msgstr "拿出一半" -#: src/gui/popupmenu.cpp:1845 +#: src/gui/popupmenu.cpp:1846 msgid "Retrieve all" msgstr "检索所有" -#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 +#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1984 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 +#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049 msgid "Hide" msgstr "隐藏" -#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 +#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055 msgid "Show" msgstr "显示" -#: src/gui/popupmenu.cpp:2060 +#: src/gui/popupmenu.cpp:2061 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982 -#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052 +#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983 +#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053 msgid "(default)" msgstr "(默认)" -#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 +#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104 msgid "Move up" msgstr "x" -#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 +#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106 msgid "Move down" msgstr "" @@ -2685,6 +2685,14 @@ msgstr "升级" msgid "Skill points available: %d" msgstr "技能点：%d个" +#: src/gui/skilldialog.cpp:385 +msgid "basic" +msgstr "" + +#: src/gui/skilldialog.cpp:386 +msgid "Skill: basic, Id: 1" +msgstr "" + #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" @@ -2695,6 +2703,11 @@ msgstr "" msgid "Skill %d" msgstr "技能为%d" +#: src/gui/skilldialog.cpp:438 +#, fuzzy, c-format +msgid "Skill: %s, Id: %d" +msgstr "技能为%d" + #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" @@ -2705,204 +2718,204 @@ msgstr "等级: %d" msgid "Lvl: %d (%+d)" msgstr "等级: %d（%+d）" -#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 +#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "帮会" -#: src/gui/socialwindow.cpp:173 +#: src/gui/socialwindow.cpp:174 #, c-format msgid "Invited user %s to guild %s." msgstr "邀请用户%s加入公会%s" -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 #, c-format msgid "Guild %s quit requested." msgstr "退出公会%s的请求。" -#: src/gui/socialwindow.cpp:214 +#: src/gui/socialwindow.cpp:215 msgid "Member Invite to Guild" msgstr "会员邀请到公会" -#: src/gui/socialwindow.cpp:215 +#: src/gui/socialwindow.cpp:216 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "你要邀请谁加入工会%s?" -#: src/gui/socialwindow.cpp:224 +#: src/gui/socialwindow.cpp:225 msgid "Leave Guild?" msgstr "离开公会？" -#: src/gui/socialwindow.cpp:225 +#: src/gui/socialwindow.cpp:226 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "你确定要离开工会%s吗？" -#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "t" -#: src/gui/socialwindow.cpp:373 +#: src/gui/socialwindow.cpp:374 #, c-format msgid "Invited user %s to party." msgstr "邀请用户%s加入团队." -#: src/gui/socialwindow.cpp:387 +#: src/gui/socialwindow.cpp:388 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:414 +#: src/gui/socialwindow.cpp:415 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:415 +#: src/gui/socialwindow.cpp:416 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:424 +#: src/gui/socialwindow.cpp:425 msgid "Leave Party?" msgstr "离开团队?" -#: src/gui/socialwindow.cpp:425 +#: src/gui/socialwindow.cpp:426 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:649 +#: src/gui/socialwindow.cpp:650 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:927 +#: src/gui/socialwindow.cpp:928 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:968 +#: src/gui/socialwindow.cpp:969 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:1000 +#: src/gui/socialwindow.cpp:1001 msgid "Attack mobs" msgstr "攻击暴徒" -#: src/gui/socialwindow.cpp:1035 +#: src/gui/socialwindow.cpp:1036 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1195 +#: src/gui/socialwindow.cpp:1196 msgid "Create Guild" msgstr "创建帮会" -#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 +#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632 msgid "Create Party" msgstr "建立" -#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "" -#: src/gui/socialwindow.cpp:1261 +#: src/gui/socialwindow.cpp:1262 msgid "Invite" msgstr "邀请" #. TRANSLATORS: here P is title for visible players tab in social window -#: src/gui/socialwindow.cpp:1277 +#: src/gui/socialwindow.cpp:1278 msgid "P" msgstr "" #. TRANSLATORS: here F is title for friends tab in social window -#: src/gui/socialwindow.cpp:1281 +#: src/gui/socialwindow.cpp:1282 msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1414 +#: src/gui/socialwindow.cpp:1415 #, c-format msgid "Accepted party invite from %s." msgstr "接受%s团队的邀请." -#: src/gui/socialwindow.cpp:1424 +#: src/gui/socialwindow.cpp:1425 #, c-format msgid "Rejected party invite from %s." msgstr "拒绝%s的团队邀请." -#: src/gui/socialwindow.cpp:1441 +#: src/gui/socialwindow.cpp:1442 #, c-format msgid "Accepted guild invite from %s." msgstr "已接受公会邀请来自%s." -#: src/gui/socialwindow.cpp:1454 +#: src/gui/socialwindow.cpp:1455 #, c-format msgid "Rejected guild invite from %s." msgstr "拒绝%s的公会邀请." -#: src/gui/socialwindow.cpp:1501 +#: src/gui/socialwindow.cpp:1502 #, c-format msgid "Creating guild called %s." msgstr "创建公会的名为%s" -#: src/gui/socialwindow.cpp:1524 +#: src/gui/socialwindow.cpp:1525 #, c-format msgid "Creating party called %s." msgstr "创建团队名字为%s的" -#: src/gui/socialwindow.cpp:1538 +#: src/gui/socialwindow.cpp:1539 msgid "Guild Name" msgstr "公会名称" -#: src/gui/socialwindow.cpp:1539 +#: src/gui/socialwindow.cpp:1540 msgid "Choose your guild's name." msgstr "选择你的公会的名字." -#: src/gui/socialwindow.cpp:1553 +#: src/gui/socialwindow.cpp:1554 msgid "Received guild request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1559 +#: src/gui/socialwindow.cpp:1560 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s邀请你加入公会%s" -#: src/gui/socialwindow.cpp:1565 +#: src/gui/socialwindow.cpp:1566 msgid "Accept Guild Invite" msgstr "接受邀请" -#: src/gui/socialwindow.cpp:1580 +#: src/gui/socialwindow.cpp:1581 msgid "Received party request, but one already exists." msgstr "接受到一个已经存在的帮会邀请。" -#: src/gui/socialwindow.cpp:1591 +#: src/gui/socialwindow.cpp:1592 msgid "You have been invited you to join a party." msgstr "您已被邀请您加入党。" -#: src/gui/socialwindow.cpp:1595 +#: src/gui/socialwindow.cpp:1596 #, c-format msgid "You have been invited to join the %s party." msgstr "您已被邀请加入%s的团队。" -#: src/gui/socialwindow.cpp:1603 +#: src/gui/socialwindow.cpp:1604 #, c-format msgid "%s has invited you to join their party." msgstr "%s已经邀请你加入他们的帮会。" -#: src/gui/socialwindow.cpp:1608 +#: src/gui/socialwindow.cpp:1609 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s已经邀请你加入帮会%s。" -#: src/gui/socialwindow.cpp:1617 +#: src/gui/socialwindow.cpp:1618 msgid "Accept Party Invite" msgstr "接受帮会邀请" -#: src/gui/socialwindow.cpp:1632 +#: src/gui/socialwindow.cpp:1633 msgid "Cannot create party. You are already in a party" msgstr "无法建立团队.您已经在一个队伍中了" -#: src/gui/socialwindow.cpp:1637 +#: src/gui/socialwindow.cpp:1638 msgid "Party Name" msgstr "" -#: src/gui/socialwindow.cpp:1638 +#: src/gui/socialwindow.cpp:1639 msgid "Choose your party's name." msgstr "选择n的名称。" @@ -3092,33 +3105,33 @@ msgstr "添加物品失败。你不能覆盖窗口中的该类物品。" msgid "Name: %s" msgstr "姓名：%s" -#: src/gui/updaterwindow.cpp:139 +#: src/gui/updaterwindow.cpp:140 msgid "Updating..." msgstr "更新..." -#: src/gui/updaterwindow.cpp:166 +#: src/gui/updaterwindow.cpp:167 msgid "Connecting..." msgstr "连接中..." -#: src/gui/updaterwindow.cpp:169 +#: src/gui/updaterwindow.cpp:170 msgid "Play" msgstr "开始" -#: src/gui/updaterwindow.cpp:570 +#: src/gui/updaterwindow.cpp:571 msgid "##1 The update process is incomplete." msgstr "##1 更新过程不完整。" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:572 +#: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" msgstr "##1 强烈建议" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:574 +#: src/gui/updaterwindow.cpp:575 msgid "##1 you try again later." msgstr "" -#: src/gui/updaterwindow.cpp:750 +#: src/gui/updaterwindow.cpp:751 msgid "Completed" msgstr "已完成" @@ -3988,429 +4001,438 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:385 +#: src/localplayer.cpp:386 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1441 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1443 +#: src/localplayer.cpp:1444 msgid "Item is too heavy." msgstr "项目是太重了。" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1447 msgid "Item is too far away." msgstr "物品太远了。" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1450 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1453 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1455 +#: src/localplayer.cpp:1456 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1458 +#: src/localplayer.cpp:1459 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1482 +#: src/localplayer.cpp:1483 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "你拾起%d[@@%d|%s @@]。" -#: src/localplayer.cpp:1902 +#: src/localplayer.cpp:1719 +#, fuzzy +msgid "xp" +msgstr "经验：" + +#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +msgid "job" +msgstr "" + +#: src/localplayer.cpp:1911 msgid "(D) default moves" msgstr "" -#: src/localplayer.cpp:1903 +#: src/localplayer.cpp:1912 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1904 +#: src/localplayer.cpp:1913 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1905 +#: src/localplayer.cpp:1914 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1906 +#: src/localplayer.cpp:1915 msgid "(d) double normal + crazy" msgstr "" -#: src/localplayer.cpp:1907 +#: src/localplayer.cpp:1916 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1929 +#: src/localplayer.cpp:1938 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1934 +#: src/localplayer.cpp:1943 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1947 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1952 +#: src/localplayer.cpp:1961 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1953 +#: src/localplayer.cpp:1962 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1954 +#: src/localplayer.cpp:1963 msgid "(2) moves to target in distance 2" msgstr "" -#: src/localplayer.cpp:1955 +#: src/localplayer.cpp:1964 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1956 +#: src/localplayer.cpp:1965 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1957 +#: src/localplayer.cpp:1966 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1958 +#: src/localplayer.cpp:1967 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1959 +#: src/localplayer.cpp:1968 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1960 +#: src/localplayer.cpp:1969 msgid "(?) move to target" msgstr "(?)移动到目标" -#: src/localplayer.cpp:1979 +#: src/localplayer.cpp:1988 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1980 +#: src/localplayer.cpp:1989 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1981 +#: src/localplayer.cpp:1990 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1982 +#: src/localplayer.cpp:1991 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1983 +#: src/localplayer.cpp:1992 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029 +#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 msgid "(?) attack" msgstr "(?) 攻击" -#: src/localplayer.cpp:2003 src/localplayer.cpp:2025 +#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 msgid "(D) default attack" msgstr "" -#: src/localplayer.cpp:2004 +#: src/localplayer.cpp:2013 msgid "(s) switch attack without shield" msgstr "" -#: src/localplayer.cpp:2005 +#: src/localplayer.cpp:2014 msgid "(S) switch attack with shield" msgstr "" -#: src/localplayer.cpp:2026 +#: src/localplayer.cpp:2035 msgid "(G) go and attack" msgstr "(G) 去攻击" -#: src/localplayer.cpp:2027 +#: src/localplayer.cpp:2036 msgid "(A) go, attack, pickup" msgstr "" -#: src/localplayer.cpp:2028 +#: src/localplayer.cpp:2037 msgid "(d) without auto attack" msgstr "" -#: src/localplayer.cpp:2062 +#: src/localplayer.cpp:2071 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2063 +#: src/localplayer.cpp:2072 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2064 +#: src/localplayer.cpp:2073 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2065 +#: src/localplayer.cpp:2074 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2066 +#: src/localplayer.cpp:2075 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2067 +#: src/localplayer.cpp:2076 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2068 +#: src/localplayer.cpp:2077 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2069 +#: src/localplayer.cpp:2078 msgid "(?) pick up" msgstr "(?)拿起" -#: src/localplayer.cpp:2082 +#: src/localplayer.cpp:2091 msgid "(N) normal map view" msgstr "" -#: src/localplayer.cpp:2083 +#: src/localplayer.cpp:2092 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2084 +#: src/localplayer.cpp:2093 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2085 +#: src/localplayer.cpp:2094 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2086 +#: src/localplayer.cpp:2095 msgid "(e) empty map view" msgstr "" -#: src/localplayer.cpp:2087 +#: src/localplayer.cpp:2096 msgid "(b) black & white map view" msgstr "" -#: src/localplayer.cpp:2106 +#: src/localplayer.cpp:2115 msgid "(f) use #flar for magic attack" msgstr "" -#: src/localplayer.cpp:2107 +#: src/localplayer.cpp:2116 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/localplayer.cpp:2108 +#: src/localplayer.cpp:2117 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/localplayer.cpp:2109 +#: src/localplayer.cpp:2118 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/localplayer.cpp:2110 +#: src/localplayer.cpp:2119 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/localplayer.cpp:2111 +#: src/localplayer.cpp:2120 msgid "(?) magic attack" msgstr "" -#: src/localplayer.cpp:2130 +#: src/localplayer.cpp:2139 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2131 -msgid "(f) attack not friends" +#: src/localplayer.cpp:2140 +msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2132 +#: src/localplayer.cpp:2141 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2133 +#: src/localplayer.cpp:2142 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2134 +#: src/localplayer.cpp:2143 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2153 +#: src/localplayer.cpp:2162 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2154 +#: src/localplayer.cpp:2163 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2155 +#: src/localplayer.cpp:2164 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2183 +#: src/localplayer.cpp:2192 msgid "Away" msgstr "距离" -#: src/localplayer.cpp:2202 +#: src/localplayer.cpp:2211 msgid "(O) on keyboard" msgstr "" -#: src/localplayer.cpp:2203 +#: src/localplayer.cpp:2212 msgid "(A) away" msgstr "" -#: src/localplayer.cpp:2204 src/localplayer.cpp:2219 +#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 msgid "(?) away" msgstr "" -#: src/localplayer.cpp:2217 +#: src/localplayer.cpp:2226 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2218 +#: src/localplayer.cpp:2227 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2243 +#: src/localplayer.cpp:2252 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2244 +#: src/localplayer.cpp:2253 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2245 +#: src/localplayer.cpp:2254 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3763 +#: src/localplayer.cpp:3772 msgid "Follow: " msgstr "跟随:" -#: src/localplayer.cpp:3765 src/localplayer.cpp:3780 +#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3781 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3782 +#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:4130 +#: src/localplayer.cpp:4139 msgid "You see " msgstr "你看" -#: src/main.cpp:50 +#: src/main.cpp:51 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:52 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid "Options:" msgstr "选项：" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -l --log-file : Log file to use" msgstr "-l--log-file 日志文件" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -v --version : Display the version" msgstr "-v --version: 显示版本" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:66 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " --update-host : Use this update host" msgstr "--update-host: 使用此更新主机" -#: src/main.cpp:68 +#: src/main.cpp:69 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:71 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:74 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:76 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:77 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:78 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:80 +#: src/main.cpp:81 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4466,7 +4488,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "创建角色失败。很可能名称已被占用。" -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246 msgid "Wrong name." msgstr "错误的名称。" @@ -4763,51 +4785,51 @@ msgstr "使用物品失败。" msgid "Unable to equip." msgstr "无法装备。" -#: src/net/ea/loginhandler.cpp:131 +#: src/net/ea/loginhandler.cpp:132 msgid "Account was not found. Please re-login." msgstr "帐号不存在。请重新登录。" -#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 +#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." msgstr "旧密码不正确。" -#: src/net/ea/loginhandler.cpp:137 +#: src/net/ea/loginhandler.cpp:138 msgid "New password too short." msgstr "新密码太短。" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 +#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." msgstr "未知的错误。" -#: src/net/ea/loginhandler.cpp:213 +#: src/net/ea/loginhandler.cpp:214 msgid "Unregistered ID." msgstr "未注册的ID。" -#: src/net/ea/loginhandler.cpp:216 +#: src/net/ea/loginhandler.cpp:217 msgid "Wrong password." msgstr "错误的密码。" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:220 msgid "Account expired." msgstr "账户过期失效。" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:223 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:225 +#: src/net/ea/loginhandler.cpp:226 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "您已被永久禁止进入游戏。请联系GM团队。" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:230 msgid "Client too old." msgstr "客户端太旧。" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:233 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4816,15 +4838,15 @@ msgstr "" "你被暂时禁止进入游戏直到%s.\n" "请通过论坛联系GM组" -#: src/net/ea/loginhandler.cpp:239 +#: src/net/ea/loginhandler.cpp:240 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:242 +#: src/net/ea/loginhandler.cpp:243 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:248 +#: src/net/ea/loginhandler.cpp:249 msgid "Username permanently erased." msgstr "" -- cgit v1.2.3-70-g09d2 From 8e6ef0d196a2c9772225f2ac061721e11370d2e9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Feb 2012 02:45:35 +0300 Subject: Fix memory leak on exit. --- src/client.cpp | 2 ++ src/utils/translation/translationmanager.cpp | 6 ++++++ src/utils/translation/translationmanager.h | 2 ++ 3 files changed, 10 insertions(+) diff --git a/src/client.cpp b/src/client.cpp index cb65c3b60..3e8eef6ed 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -798,6 +798,8 @@ void Client::gameClear() //delete logger; //logger = nullptr; + TranslationManager::close(); + mInstance = nullptr; } diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index b4ae0d949..1b68cc91d 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -46,6 +46,12 @@ void TranslationManager::loadCurrentLang() translator = loadLang(getLang()); } +void TranslationManager::close() +{ + delete translator; + translator = nullptr; +} + PoDict *TranslationManager::loadLang(LangVect lang) { std::string name = ""; diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h index de3875b0a..39702f4f4 100644 --- a/src/utils/translation/translationmanager.h +++ b/src/utils/translation/translationmanager.h @@ -33,6 +33,8 @@ class TranslationManager static void init(); + static void close(); + static void loadCurrentLang(); }; -- cgit v1.2.3-70-g09d2 From 538261b13990ee02bbc62d9704233885b15cee04 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Feb 2012 23:56:57 +0300 Subject: Add manaplus copyright to guichan files. --- src/guichan/actionevent.cpp | 1 + src/guichan/basiccontainer.cpp | 1 + src/guichan/cliprectangle.cpp | 1 + src/guichan/color.cpp | 1 + src/guichan/defaultfont.cpp | 1 + src/guichan/event.cpp | 1 + src/guichan/exception.cpp | 1 + src/guichan/focushandler.cpp | 1 + src/guichan/font.cpp | 1 + src/guichan/graphics.cpp | 1 + src/guichan/gui.cpp | 1 + src/guichan/image.cpp | 1 + src/guichan/include/guichan/actionevent.hpp | 1 + src/guichan/include/guichan/actionlistener.hpp | 1 + src/guichan/include/guichan/basiccontainer.hpp | 1 + src/guichan/include/guichan/cliprectangle.hpp | 1 + src/guichan/include/guichan/color.hpp | 1 + src/guichan/include/guichan/deathlistener.hpp | 1 + src/guichan/include/guichan/defaultfont.hpp | 1 + src/guichan/include/guichan/event.hpp | 1 + src/guichan/include/guichan/exception.hpp | 1 + src/guichan/include/guichan/focushandler.hpp | 1 + src/guichan/include/guichan/focuslistener.hpp | 1 + src/guichan/include/guichan/font.hpp | 1 + src/guichan/include/guichan/graphics.hpp | 1 + src/guichan/include/guichan/gui.hpp | 1 + src/guichan/include/guichan/image.hpp | 1 + src/guichan/include/guichan/imageloader.hpp | 1 + src/guichan/include/guichan/input.hpp | 1 + src/guichan/include/guichan/inputevent.hpp | 1 + src/guichan/include/guichan/key.hpp | 1 + src/guichan/include/guichan/keyevent.hpp | 1 + src/guichan/include/guichan/keyinput.hpp | 1 + src/guichan/include/guichan/keylistener.hpp | 1 + src/guichan/include/guichan/listmodel.hpp | 1 + src/guichan/include/guichan/mouseevent.hpp | 1 + src/guichan/include/guichan/mouseinput.hpp | 1 + src/guichan/include/guichan/mouselistener.hpp | 1 + src/guichan/include/guichan/platform.hpp | 1 + src/guichan/include/guichan/rectangle.hpp | 1 + src/guichan/include/guichan/sdl/sdlgraphics.hpp | 1 + src/guichan/include/guichan/sdl/sdlimage.hpp | 1 + src/guichan/include/guichan/sdl/sdlpixel.hpp | 1 + src/guichan/include/guichan/selectionevent.hpp | 1 + src/guichan/include/guichan/selectionlistener.hpp | 1 + src/guichan/include/guichan/widget.hpp | 1 + src/guichan/include/guichan/widgetlistener.hpp | 1 + src/guichan/include/guichan/widgets/button.hpp | 1 + src/guichan/include/guichan/widgets/checkbox.hpp | 1 + src/guichan/include/guichan/widgets/container.hpp | 1 + src/guichan/include/guichan/widgets/dropdown.hpp | 1 + src/guichan/include/guichan/widgets/icon.hpp | 1 + .../include/guichan/widgets/imagebutton.hpp | 247 +++++++++++---------- src/guichan/include/guichan/widgets/label.hpp | 1 + src/guichan/include/guichan/widgets/listbox.hpp | 1 + .../include/guichan/widgets/radiobutton.hpp | 1 + src/guichan/include/guichan/widgets/scrollarea.hpp | 1 + src/guichan/include/guichan/widgets/slider.hpp | 1 + src/guichan/include/guichan/widgets/tab.hpp | 1 + src/guichan/include/guichan/widgets/tabbedarea.hpp | 1 + src/guichan/include/guichan/widgets/textbox.hpp | 1 + src/guichan/include/guichan/widgets/textfield.hpp | 1 + src/guichan/include/guichan/widgets/window.hpp | 1 + src/guichan/inputevent.cpp | 1 + src/guichan/key.cpp | 1 + src/guichan/keyevent.cpp | 1 + src/guichan/keyinput.cpp | 1 + src/guichan/mouseevent.cpp | 1 + src/guichan/mouseinput.cpp | 1 + src/guichan/rectangle.cpp | 1 + src/guichan/sdl/sdlgraphics.cpp | 1 + src/guichan/sdl/sdlimage.cpp | 1 + src/guichan/selectionevent.cpp | 1 + src/guichan/widget.cpp | 1 + src/guichan/widgets/button.cpp | 1 + src/guichan/widgets/checkbox.cpp | 1 + src/guichan/widgets/container.cpp | 1 + src/guichan/widgets/dropdown.cpp | 1 + src/guichan/widgets/icon.cpp | 1 + src/guichan/widgets/imagebutton.cpp | 1 + src/guichan/widgets/label.cpp | 1 + src/guichan/widgets/listbox.cpp | 1 + src/guichan/widgets/radiobutton.cpp | 1 + src/guichan/widgets/scrollarea.cpp | 1 + src/guichan/widgets/slider.cpp | 1 + src/guichan/widgets/tab.cpp | 1 + src/guichan/widgets/tabbedarea.cpp | 1 + src/guichan/widgets/textbox.cpp | 1 + src/guichan/widgets/textfield.cpp | 1 + src/guichan/widgets/window.cpp | 1 + 90 files changed, 213 insertions(+), 123 deletions(-) diff --git a/src/guichan/actionevent.cpp b/src/guichan/actionevent.cpp index 17013ddc9..a91c6dec0 100644 --- a/src/guichan/actionevent.cpp +++ b/src/guichan/actionevent.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/basiccontainer.cpp b/src/guichan/basiccontainer.cpp index a36ab5f9b..76b671cfb 100644 --- a/src/guichan/basiccontainer.cpp +++ b/src/guichan/basiccontainer.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/cliprectangle.cpp b/src/guichan/cliprectangle.cpp index 6effb48c8..42b33f203 100644 --- a/src/guichan/cliprectangle.cpp +++ b/src/guichan/cliprectangle.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp index d8015fa20..d3dc7a738 100644 --- a/src/guichan/color.cpp +++ b/src/guichan/color.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/defaultfont.cpp b/src/guichan/defaultfont.cpp index f67b66495..8871d51de 100644 --- a/src/guichan/defaultfont.cpp +++ b/src/guichan/defaultfont.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/event.cpp b/src/guichan/event.cpp index e8e988b63..691240d11 100644 --- a/src/guichan/event.cpp +++ b/src/guichan/event.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/exception.cpp b/src/guichan/exception.cpp index e32c4f97a..4ea86896e 100644 --- a/src/guichan/exception.cpp +++ b/src/guichan/exception.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp index b1da9e77e..832a201ad 100644 --- a/src/guichan/focushandler.cpp +++ b/src/guichan/focushandler.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/font.cpp b/src/guichan/font.cpp index 83b3727e3..e2485eb0d 100644 --- a/src/guichan/font.cpp +++ b/src/guichan/font.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/graphics.cpp b/src/guichan/graphics.cpp index c57b5d5c0..0e414827c 100644 --- a/src/guichan/graphics.cpp +++ b/src/guichan/graphics.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp index 1ade3f138..5a3e16784 100644 --- a/src/guichan/gui.cpp +++ b/src/guichan/gui.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/image.cpp b/src/guichan/image.cpp index 837840435..1a560217f 100644 --- a/src/guichan/image.cpp +++ b/src/guichan/image.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/guichan/include/guichan/actionevent.hpp index c897e9b4b..96a2d1364 100644 --- a/src/guichan/include/guichan/actionevent.hpp +++ b/src/guichan/include/guichan/actionevent.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/actionlistener.hpp b/src/guichan/include/guichan/actionlistener.hpp index 0f750099c..28373f2df 100644 --- a/src/guichan/include/guichan/actionlistener.hpp +++ b/src/guichan/include/guichan/actionlistener.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp index 6163b6535..361947016 100644 --- a/src/guichan/include/guichan/basiccontainer.hpp +++ b/src/guichan/include/guichan/basiccontainer.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/cliprectangle.hpp b/src/guichan/include/guichan/cliprectangle.hpp index b5aa5e4af..ea44ac680 100644 --- a/src/guichan/include/guichan/cliprectangle.hpp +++ b/src/guichan/include/guichan/cliprectangle.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/color.hpp b/src/guichan/include/guichan/color.hpp index b7e324c07..a051c3569 100644 --- a/src/guichan/include/guichan/color.hpp +++ b/src/guichan/include/guichan/color.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/guichan/include/guichan/deathlistener.hpp index a8e14a7f8..5e983e02d 100644 --- a/src/guichan/include/guichan/deathlistener.hpp +++ b/src/guichan/include/guichan/deathlistener.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/defaultfont.hpp b/src/guichan/include/guichan/defaultfont.hpp index 3f6379cbe..1ff94fc40 100644 --- a/src/guichan/include/guichan/defaultfont.hpp +++ b/src/guichan/include/guichan/defaultfont.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/event.hpp b/src/guichan/include/guichan/event.hpp index 107e34fc2..3a4ad26e2 100644 --- a/src/guichan/include/guichan/event.hpp +++ b/src/guichan/include/guichan/event.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/exception.hpp b/src/guichan/include/guichan/exception.hpp index 3ccf39e20..1b591f2d6 100644 --- a/src/guichan/include/guichan/exception.hpp +++ b/src/guichan/include/guichan/exception.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp index f5ac8f044..4caba6f7b 100644 --- a/src/guichan/include/guichan/focushandler.hpp +++ b/src/guichan/include/guichan/focushandler.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp index 548d05f4d..9ec53b860 100644 --- a/src/guichan/include/guichan/focuslistener.hpp +++ b/src/guichan/include/guichan/focuslistener.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/font.hpp b/src/guichan/include/guichan/font.hpp index cda4028b8..d39630352 100644 --- a/src/guichan/include/guichan/font.hpp +++ b/src/guichan/include/guichan/font.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp index d21eab24b..efefa3d73 100644 --- a/src/guichan/include/guichan/graphics.hpp +++ b/src/guichan/include/guichan/graphics.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp index 17d49c979..d8c9c7555 100644 --- a/src/guichan/include/guichan/gui.hpp +++ b/src/guichan/include/guichan/gui.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/image.hpp b/src/guichan/include/guichan/image.hpp index e3bd27f69..f4de86679 100644 --- a/src/guichan/include/guichan/image.hpp +++ b/src/guichan/include/guichan/image.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/imageloader.hpp b/src/guichan/include/guichan/imageloader.hpp index 7c0adb842..d8fef4f6a 100644 --- a/src/guichan/include/guichan/imageloader.hpp +++ b/src/guichan/include/guichan/imageloader.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/input.hpp b/src/guichan/include/guichan/input.hpp index 7510d3cb2..673140ec0 100644 --- a/src/guichan/include/guichan/input.hpp +++ b/src/guichan/include/guichan/input.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/inputevent.hpp b/src/guichan/include/guichan/inputevent.hpp index f252341cf..1de9d1832 100644 --- a/src/guichan/include/guichan/inputevent.hpp +++ b/src/guichan/include/guichan/inputevent.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/key.hpp b/src/guichan/include/guichan/key.hpp index 0b550dcca..b852638b3 100644 --- a/src/guichan/include/guichan/key.hpp +++ b/src/guichan/include/guichan/key.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/keyevent.hpp b/src/guichan/include/guichan/keyevent.hpp index 5c10238c5..e841f4a62 100644 --- a/src/guichan/include/guichan/keyevent.hpp +++ b/src/guichan/include/guichan/keyevent.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/keyinput.hpp b/src/guichan/include/guichan/keyinput.hpp index 68c58fa0d..06892b660 100644 --- a/src/guichan/include/guichan/keyinput.hpp +++ b/src/guichan/include/guichan/keyinput.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp index 5449f2de4..a6d6f851d 100644 --- a/src/guichan/include/guichan/keylistener.hpp +++ b/src/guichan/include/guichan/keylistener.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/listmodel.hpp b/src/guichan/include/guichan/listmodel.hpp index 1beae317b..612a5d4bd 100644 --- a/src/guichan/include/guichan/listmodel.hpp +++ b/src/guichan/include/guichan/listmodel.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/mouseevent.hpp b/src/guichan/include/guichan/mouseevent.hpp index 6f6dc828c..5b012dc20 100644 --- a/src/guichan/include/guichan/mouseevent.hpp +++ b/src/guichan/include/guichan/mouseevent.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/mouseinput.hpp b/src/guichan/include/guichan/mouseinput.hpp index 3825d5439..35952fde5 100644 --- a/src/guichan/include/guichan/mouseinput.hpp +++ b/src/guichan/include/guichan/mouseinput.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp index 1612cc822..2f12ecdac 100644 --- a/src/guichan/include/guichan/mouselistener.hpp +++ b/src/guichan/include/guichan/mouselistener.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/platform.hpp b/src/guichan/include/guichan/platform.hpp index e2ea89767..9a18191d2 100644 --- a/src/guichan/include/guichan/platform.hpp +++ b/src/guichan/include/guichan/platform.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/rectangle.hpp b/src/guichan/include/guichan/rectangle.hpp index 1d21654df..013fe9b69 100644 --- a/src/guichan/include/guichan/rectangle.hpp +++ b/src/guichan/include/guichan/rectangle.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/sdl/sdlgraphics.hpp b/src/guichan/include/guichan/sdl/sdlgraphics.hpp index 70a234d33..230b75441 100644 --- a/src/guichan/include/guichan/sdl/sdlgraphics.hpp +++ b/src/guichan/include/guichan/sdl/sdlgraphics.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/sdl/sdlimage.hpp b/src/guichan/include/guichan/sdl/sdlimage.hpp index 4d226177e..cd4285346 100644 --- a/src/guichan/include/guichan/sdl/sdlimage.hpp +++ b/src/guichan/include/guichan/sdl/sdlimage.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp index 809ae4649..663c2059d 100644 --- a/src/guichan/include/guichan/sdl/sdlpixel.hpp +++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/selectionevent.hpp b/src/guichan/include/guichan/selectionevent.hpp index 6724fa0d2..331ebe92d 100644 --- a/src/guichan/include/guichan/selectionevent.hpp +++ b/src/guichan/include/guichan/selectionevent.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/guichan/include/guichan/selectionlistener.hpp index 8ea8a579b..657de0292 100644 --- a/src/guichan/include/guichan/selectionlistener.hpp +++ b/src/guichan/include/guichan/selectionlistener.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp index d112022e3..69126e3df 100644 --- a/src/guichan/include/guichan/widget.hpp +++ b/src/guichan/include/guichan/widget.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp index 159549ede..0ede5b871 100644 --- a/src/guichan/include/guichan/widgetlistener.hpp +++ b/src/guichan/include/guichan/widgetlistener.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp index e3b8b98de..a934499d0 100644 --- a/src/guichan/include/guichan/widgets/button.hpp +++ b/src/guichan/include/guichan/widgets/button.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp index e6e630d74..08aba7aac 100644 --- a/src/guichan/include/guichan/widgets/checkbox.hpp +++ b/src/guichan/include/guichan/widgets/checkbox.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/container.hpp b/src/guichan/include/guichan/widgets/container.hpp index 4946b1f74..f69d3db45 100644 --- a/src/guichan/include/guichan/widgets/container.hpp +++ b/src/guichan/include/guichan/widgets/container.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/dropdown.hpp b/src/guichan/include/guichan/widgets/dropdown.hpp index aae596bb0..846918354 100644 --- a/src/guichan/include/guichan/widgets/dropdown.hpp +++ b/src/guichan/include/guichan/widgets/dropdown.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/icon.hpp b/src/guichan/include/guichan/widgets/icon.hpp index f0f9ff566..e25a7a770 100644 --- a/src/guichan/include/guichan/widgets/icon.hpp +++ b/src/guichan/include/guichan/widgets/icon.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/imagebutton.hpp b/src/guichan/include/guichan/widgets/imagebutton.hpp index 1ab285ce9..42b217fbc 100644 --- a/src/guichan/include/guichan/widgets/imagebutton.hpp +++ b/src/guichan/include/guichan/widgets/imagebutton.hpp @@ -1,123 +1,124 @@ -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson - * - * - * Per Larsson a.k.a finalman - * Olof Naessn a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef GCN_IMAGEBUTTON_HPP -#define GCN_IMAGEBUTTON_HPP - -#include "guichan/platform.hpp" -#include "guichan/widgets/button.hpp" - -namespace gcn -{ - class Image; - - /** - * An implementation of a regular clickable button. Unlike a normal button an image - * button is capable of displaying an image instead of a simple text caption. - * Whenever an image button is clicked an action event will be sent to the action - * listener's of the image button. - * - * @see Button - */ - class GCN_CORE_DECLSPEC ImageButton : public gcn::Button - { - public: - /** - * Default constructor. - */ - ImageButton(); - - /** - * Constructor. - * - * @param filename The filename of the image to display. - */ - ImageButton(const std::string& filename); - - /** - * Constructor. - * - * @param image The image to display. - */ - ImageButton(const Image* image); - - /** - * Destructor. - */ - virtual ~ImageButton(); - - /** - * Sets the image to display. Existing Image is freed automatically, - * if it was loaded internally. - * - * @param image The image to display. - */ - void setImage(const Image* image); - - /** - * Gets current image. - * - * @return The current image. - */ - const Image* getImage() const; - - - // Inherited from Widget - - void draw(gcn::Graphics* graphics); - - protected: - /** - * The image to display. - */ - const Image* mImage; - - /** - * True if the image has been loaded internally, false otherwise. - * An image not loaded internally should not be deleted in the - * destructor. - */ - bool mInternalImage; - }; -} -#endif +/* _______ __ __ __ ______ __ __ _______ __ __ + * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ + * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / + * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / + * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / + * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / + * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ + * + * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers + * + * + * Per Larsson a.k.a finalman + * Olof Naessn a.k.a jansem/yakslem + * + * Visit: http://guichan.sourceforge.net + * + * License: (BSD) + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name of Guichan nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef GCN_IMAGEBUTTON_HPP +#define GCN_IMAGEBUTTON_HPP + +#include "guichan/platform.hpp" +#include "guichan/widgets/button.hpp" + +namespace gcn +{ + class Image; + + /** + * An implementation of a regular clickable button. Unlike a normal button an image + * button is capable of displaying an image instead of a simple text caption. + * Whenever an image button is clicked an action event will be sent to the action + * listener's of the image button. + * + * @see Button + */ + class GCN_CORE_DECLSPEC ImageButton : public gcn::Button + { + public: + /** + * Default constructor. + */ + ImageButton(); + + /** + * Constructor. + * + * @param filename The filename of the image to display. + */ + ImageButton(const std::string& filename); + + /** + * Constructor. + * + * @param image The image to display. + */ + ImageButton(const Image* image); + + /** + * Destructor. + */ + virtual ~ImageButton(); + + /** + * Sets the image to display. Existing Image is freed automatically, + * if it was loaded internally. + * + * @param image The image to display. + */ + void setImage(const Image* image); + + /** + * Gets current image. + * + * @return The current image. + */ + const Image* getImage() const; + + + // Inherited from Widget + + void draw(gcn::Graphics* graphics); + + protected: + /** + * The image to display. + */ + const Image* mImage; + + /** + * True if the image has been loaded internally, false otherwise. + * An image not loaded internally should not be deleted in the + * destructor. + */ + bool mInternalImage; + }; +} +#endif diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/guichan/include/guichan/widgets/label.hpp index 4d6ea0006..1f2e7c3c0 100644 --- a/src/guichan/include/guichan/widgets/label.hpp +++ b/src/guichan/include/guichan/widgets/label.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp index b99f84aaa..1e73c2214 100644 --- a/src/guichan/include/guichan/widgets/listbox.hpp +++ b/src/guichan/include/guichan/widgets/listbox.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp index e15bf86b3..06a42b5a5 100644 --- a/src/guichan/include/guichan/widgets/radiobutton.hpp +++ b/src/guichan/include/guichan/widgets/radiobutton.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp index 29f95ad85..4937bcbea 100644 --- a/src/guichan/include/guichan/widgets/scrollarea.hpp +++ b/src/guichan/include/guichan/widgets/scrollarea.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp index ec6b82e1e..77b0b8806 100644 --- a/src/guichan/include/guichan/widgets/slider.hpp +++ b/src/guichan/include/guichan/widgets/slider.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/tab.hpp b/src/guichan/include/guichan/widgets/tab.hpp index 55845c771..e29decb17 100644 --- a/src/guichan/include/guichan/widgets/tab.hpp +++ b/src/guichan/include/guichan/widgets/tab.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/tabbedarea.hpp b/src/guichan/include/guichan/widgets/tabbedarea.hpp index 7be3b91e2..ea378d1d6 100644 --- a/src/guichan/include/guichan/widgets/tabbedarea.hpp +++ b/src/guichan/include/guichan/widgets/tabbedarea.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp index b00dcef20..6393306d8 100644 --- a/src/guichan/include/guichan/widgets/textbox.hpp +++ b/src/guichan/include/guichan/widgets/textbox.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp index 638b6e715..c6f2709dd 100644 --- a/src/guichan/include/guichan/widgets/textfield.hpp +++ b/src/guichan/include/guichan/widgets/textfield.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp index 12e669f9d..cbe2da8e2 100644 --- a/src/guichan/include/guichan/widgets/window.hpp +++ b/src/guichan/include/guichan/widgets/window.hpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/inputevent.cpp b/src/guichan/inputevent.cpp index a135b15b8..53ae91442 100644 --- a/src/guichan/inputevent.cpp +++ b/src/guichan/inputevent.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/key.cpp b/src/guichan/key.cpp index d6c7e2313..d2913837e 100644 --- a/src/guichan/key.cpp +++ b/src/guichan/key.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/keyevent.cpp b/src/guichan/keyevent.cpp index f9c14bb59..2b7064dc7 100644 --- a/src/guichan/keyevent.cpp +++ b/src/guichan/keyevent.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/keyinput.cpp b/src/guichan/keyinput.cpp index 0a40d7c65..3f5ebc124 100644 --- a/src/guichan/keyinput.cpp +++ b/src/guichan/keyinput.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/mouseevent.cpp b/src/guichan/mouseevent.cpp index 5ff544a04..2e5c757c5 100644 --- a/src/guichan/mouseevent.cpp +++ b/src/guichan/mouseevent.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/mouseinput.cpp b/src/guichan/mouseinput.cpp index 5ebcfa475..791c8d7e9 100644 --- a/src/guichan/mouseinput.cpp +++ b/src/guichan/mouseinput.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/rectangle.cpp b/src/guichan/rectangle.cpp index 93e180ae5..76965e430 100644 --- a/src/guichan/rectangle.cpp +++ b/src/guichan/rectangle.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp index 67aa657cd..79c65da9f 100644 --- a/src/guichan/sdl/sdlgraphics.cpp +++ b/src/guichan/sdl/sdlgraphics.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/sdl/sdlimage.cpp b/src/guichan/sdl/sdlimage.cpp index 156b399b3..e4aadc465 100644 --- a/src/guichan/sdl/sdlimage.cpp +++ b/src/guichan/sdl/sdlimage.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/selectionevent.cpp b/src/guichan/selectionevent.cpp index e707cedf8..784252230 100644 --- a/src/guichan/selectionevent.cpp +++ b/src/guichan/selectionevent.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp index 571644aa4..da221b8d5 100644 --- a/src/guichan/widget.cpp +++ b/src/guichan/widget.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp index c27d0c8dd..6ae443705 100644 --- a/src/guichan/widgets/button.cpp +++ b/src/guichan/widgets/button.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp index 89fee153e..ab0b19e00 100644 --- a/src/guichan/widgets/checkbox.cpp +++ b/src/guichan/widgets/checkbox.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/container.cpp b/src/guichan/widgets/container.cpp index 7ab34a93b..b3edc0bcb 100644 --- a/src/guichan/widgets/container.cpp +++ b/src/guichan/widgets/container.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp index 17513931f..40abaf41f 100644 --- a/src/guichan/widgets/dropdown.cpp +++ b/src/guichan/widgets/dropdown.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/icon.cpp b/src/guichan/widgets/icon.cpp index 13a9f1309..c85ada7c3 100644 --- a/src/guichan/widgets/icon.cpp +++ b/src/guichan/widgets/icon.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/imagebutton.cpp b/src/guichan/widgets/imagebutton.cpp index feeed795d..5a0000be2 100644 --- a/src/guichan/widgets/imagebutton.cpp +++ b/src/guichan/widgets/imagebutton.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/label.cpp b/src/guichan/widgets/label.cpp index a5c967e2b..03ca04576 100644 --- a/src/guichan/widgets/label.cpp +++ b/src/guichan/widgets/label.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp index 80989cc72..5760025c2 100644 --- a/src/guichan/widgets/listbox.cpp +++ b/src/guichan/widgets/listbox.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/radiobutton.cpp b/src/guichan/widgets/radiobutton.cpp index 48a690767..7d0391cbe 100644 --- a/src/guichan/widgets/radiobutton.cpp +++ b/src/guichan/widgets/radiobutton.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/scrollarea.cpp b/src/guichan/widgets/scrollarea.cpp index 574308b7c..451288c77 100644 --- a/src/guichan/widgets/scrollarea.cpp +++ b/src/guichan/widgets/scrollarea.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp index f0eabd627..16f7cd8be 100644 --- a/src/guichan/widgets/slider.cpp +++ b/src/guichan/widgets/slider.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/tab.cpp b/src/guichan/widgets/tab.cpp index 768e2c695..96a347607 100644 --- a/src/guichan/widgets/tab.cpp +++ b/src/guichan/widgets/tab.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/tabbedarea.cpp b/src/guichan/widgets/tabbedarea.cpp index 4ee164778..7af00c4c4 100644 --- a/src/guichan/widgets/tabbedarea.cpp +++ b/src/guichan/widgets/tabbedarea.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp index 7b5b03ab8..e78ea91a3 100644 --- a/src/guichan/widgets/textbox.cpp +++ b/src/guichan/widgets/textbox.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/textfield.cpp b/src/guichan/widgets/textfield.cpp index d224e483f..c0e89cf1c 100644 --- a/src/guichan/widgets/textfield.cpp +++ b/src/guichan/widgets/textfield.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp index 1c46b2283..d7c5809e6 100644 --- a/src/guichan/widgets/window.cpp +++ b/src/guichan/widgets/window.cpp @@ -7,6 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessn and Per Larsson + * Copyright (C) 2011-2012 The ManaPlus Developers * * * Per Larsson a.k.a finalman -- cgit v1.2.3-70-g09d2 From ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Feb 2012 00:49:41 +0300 Subject: Fix code style with new tool. --- src/avatar.cpp | 2 +- src/being.cpp | 7 ++-- src/client.cpp | 2 +- src/configuration.cpp | 2 +- src/debug/debug_new.cpp | 16 ++++----- src/defaults.h | 20 +++++------ src/graphics.cpp | 6 ++-- src/gui/botcheckerwindow.cpp | 3 +- src/gui/chatwindow.cpp | 4 +-- src/gui/confirmdialog.cpp | 1 - src/gui/debugwindow.cpp | 2 +- src/gui/itempopup.cpp | 2 +- src/gui/npcpostdialog.cpp | 2 +- src/gui/palette.cpp | 4 ++- src/gui/setup_relations.cpp | 3 +- src/gui/setup_video.cpp | 2 +- src/gui/statuswindow.cpp | 2 +- src/gui/textdialog.cpp | 2 +- src/gui/viewport.h | 4 ++- src/gui/whoisonline.cpp | 2 +- src/gui/widgets/avatarlistbox.cpp | 2 +- src/gui/widgets/battletab.h | 3 -- src/gui/widgets/chattab.cpp | 2 +- src/gui/widgets/container.cpp | 2 +- src/gui/widgets/dropdown.h | 1 - src/gui/widgets/inventoryfilter.cpp | 2 +- src/gui/widgets/layout.h | 4 +-- src/gui/widgets/setupitem.cpp | 1 - src/gui/widgets/setuptab.cpp | 2 +- src/gui/widgets/shoplistbox.cpp | 2 +- src/gui/widgets/slider.cpp | 1 - src/gui/widgets/tablemodel.cpp | 1 - src/gui/widgets/textfield.cpp | 22 ++++++------ src/gui/widgets/tradetab.h | 3 -- src/guichan/actionevent.cpp | 1 - src/guichan/event.cpp | 1 - src/guichan/include/guichan/actionevent.hpp | 1 - src/guichan/include/guichan/color.hpp | 2 +- src/guichan/include/guichan/gui.hpp | 9 +++-- src/guichan/include/guichan/sdl/sdlpixel.hpp | 6 ++-- src/guichan/keyinput.cpp | 1 - src/guichan/sdl/sdlgraphics.cpp | 4 +-- src/guichan/selectionevent.cpp | 1 - src/guichan/widgets/checkbox.cpp | 1 - src/guichan/widgets/dropdown.cpp | 1 - src/guichan/widgets/icon.cpp | 18 +++++----- src/guichan/widgets/tab.cpp | 1 - src/localconsts.h | 2 +- src/localplayer.cpp | 16 ++++----- src/logger.cpp | 2 +- src/map.cpp | 6 ++-- src/maplayer.cpp | 6 ++-- src/mumblemanager.cpp | 4 +-- src/net/ea/beinghandler.cpp | 6 ++++ src/net/ea/gui/partytab.cpp | 1 - src/net/ea/inventoryhandler.cpp | 2 +- src/net/manaserv/chathandler.cpp | 2 +- src/net/manaserv/guildhandler.cpp | 2 +- src/net/manaserv/playerhandler.cpp | 3 +- src/net/net.cpp | 1 - src/net/tmwa/gui/guildtab.cpp | 1 - src/net/tmwa/gui/partytab.cpp | 1 - src/net/tmwa/network.cpp | 4 +-- src/openglgraphics.cpp | 6 ++-- src/playerrelations.cpp | 5 ++- src/resources/image.cpp | 10 +++--- src/resources/mapreader.cpp | 4 +-- src/resources/resourcemanager.cpp | 54 ++++++++++++++-------------- src/resources/specialdb.cpp | 3 +- src/spellmanager.cpp | 3 +- src/textcommand.h | 2 +- src/units.cpp | 10 +++--- src/utils/base64.cpp | 4 +-- src/utils/physfsrwops.h | 1 - src/utils/stringutils.cpp | 8 ++--- src/vector.h | 4 +-- 76 files changed, 172 insertions(+), 184 deletions(-) diff --git a/src/avatar.cpp b/src/avatar.cpp index 9a4831f18..54d7c6e79 100644 --- a/src/avatar.cpp +++ b/src/avatar.cpp @@ -61,4 +61,4 @@ std::string Avatar::getAdditionString() const return " - " + getIp(); else return ""; -} \ No newline at end of file +} diff --git a/src/being.cpp b/src/being.cpp index 9edfaad7b..92d01097b 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -295,9 +295,9 @@ Being::~Being() { config.removeListener("visiblenames", this); - delete[] mSpriteRemap; + delete [] mSpriteRemap; mSpriteRemap = nullptr; - delete[] mSpriteHide; + delete [] mSpriteHide; mSpriteHide = nullptr; delete mSpeechBubble; @@ -993,7 +993,6 @@ void Being::setAction(Action action, int attackType A_UNUSED) case DIRECTION_RIGHT: rotation = 270; break; default: break; } - ; if (particleEngine) { Particle *p = particleEngine->addEffect( @@ -2404,7 +2403,7 @@ void Being::searchSlotValueItr(std::vector::iterator &it, int &idx, // logger->log("searching %d", val); it = slotRemap.begin(); idx = 0; - while(it != slotRemap.end()) + while (it != slotRemap.end()) { // logger->log("testing %d", *it); if (*it == val) diff --git a/src/client.cpp b/src/client.cpp index 3e8eef6ed..54a0b6224 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -502,7 +502,7 @@ void Client::gameInit() GraphicsVertexes::setLoadAsOpenGL(useOpenGL); // Create the graphics context - switch(useOpenGL) + switch (useOpenGL) { case 0: mainGraphics = new Graphics; diff --git a/src/configuration.cpp b/src/configuration.cpp index 39e0c75d4..254a3fea8 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -161,7 +161,7 @@ void Configuration::cleanDefaults() for (DefaultsData::const_iterator iter = mDefaultsData->begin(); iter != mDefaultsData->end(); ++iter) { - delete(iter->second); + delete (iter->second); } mDefaultsData->clear(); delete mDefaultsData; diff --git a/src/debug/debug_new.cpp b/src/debug/debug_new.cpp index 3bc02b3e5..9e30d30d9 100644 --- a/src/debug/debug_new.cpp +++ b/src/debug/debug_new.cpp @@ -533,7 +533,7 @@ static void* alloc_mem(size_t size, const char* file, int line, bool is_array) * @param pointer pointer to delete * @param addr pointer to the caller * @param is_array flag indicating whether it is invoked by a - * delete[] call + * delete [] call */ static void free_pointer(void* pointer, void* addr, bool is_array) { @@ -558,9 +558,9 @@ static void free_pointer(void* pointer, void* addr, bool is_array) { const char* msg; if (is_array) - msg = "delete[] after new"; + msg = "delete [] after new"; else - msg = "delete after new[]"; + msg = "delete after new []"; fast_mutex_autolock lock(new_output_lock); fprintf(new_output_fp, "%s: pointer %p (size %u)\n\tat ", @@ -800,7 +800,7 @@ void operator delete(void* pointer) throw() free_pointer(pointer, _DEBUG_NEW_CALLER_ADDRESS, false); } -void operator delete[](void* pointer) throw() +void operator delete [](void* pointer) throw() { free_pointer(pointer, _DEBUG_NEW_CALLER_ADDRESS, true); } @@ -820,7 +820,7 @@ void operator delete(void* pointer, const char* file, int line) throw() operator delete(pointer); } -void operator delete[](void* pointer, const char* file, int line) throw() +void operator delete [](void* pointer, const char* file, int line) throw() { if (new_verbose_flag) { @@ -831,7 +831,7 @@ void operator delete[](void* pointer, const char* file, int line) throw() print_position(file, line); fprintf(new_output_fp, ")\n"); } - operator delete[](pointer); + operator delete [](pointer); } void operator delete(void* pointer, const std::nothrow_t&) throw() @@ -839,9 +839,9 @@ void operator delete(void* pointer, const std::nothrow_t&) throw() operator delete(pointer, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); } -void operator delete[](void* pointer, const std::nothrow_t&) throw() +void operator delete [](void* pointer, const std::nothrow_t&) throw() { - operator delete[](pointer, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); + operator delete [](pointer, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); } #endif // HAVE_PLACEMENT_DELETE diff --git a/src/defaults.h b/src/defaults.h index 1d979e928..850e15d37 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -26,18 +26,16 @@ #include #include "variabledata.h" -using namespace Mana; - typedef std::map DefaultsData; -VariableData* createData(int defData); -VariableData* createData(double defData); -VariableData* createData(float defData); -VariableData* createData(const std::string &defData); -VariableData* createData(const char* defData); -VariableData* createData(bool defData); -DefaultsData* getConfigDefaults(); -DefaultsData* getBrandingDefaults(); -DefaultsData* getPathsDefaults(); +Mana::VariableData* createData(int defData); +Mana::VariableData* createData(double defData); +Mana::VariableData* createData(float defData); +Mana::VariableData* createData(const std::string &defData); +Mana::VariableData* createData(const char* defData); +Mana::VariableData* createData(bool defData); +Mana::DefaultsData* getConfigDefaults(); +Mana::DefaultsData* getBrandingDefaults(); +Mana::DefaultsData* getPathsDefaults(); #endif diff --git a/src/graphics.cpp b/src/graphics.cpp index 5848d8c14..635cc6ab9 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -719,10 +719,10 @@ int Graphics::SDL_FakeUpperBlit(SDL_Surface *src, SDL_Rect *srcrect, /* Make sure the surfaces aren't locked */ if (!src || !dst) - return(-1); + return -1; if (src->locked || dst->locked) - return(-1); + return -1; /* If the destination rectangle is nullptr, use the entire dest surface */ if (!dstrect) @@ -841,7 +841,7 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle) Uint32 pixel = SDL_MapRGB(mTarget->format, mColor.r, mColor.g, mColor.b); - switch(bpp) + switch (bpp) { case 1: for (y = y1; y < y2; y++) diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index 2043b4fe3..4a092ab55 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -53,7 +53,8 @@ #define TIME_COLUMN 1 #define ROW_HEIGHT 12 -// The following column widths really shouldn't be hardcoded but should scale with the size of the widget... excep +// The following column widths really shouldn't be hardcoded but should +// scale with the size of the widget... excep // that, right now, the widget doesn't exactly scale either. #define NAME_COLUMN_WIDTH 185 #define TIME_COLUMN_WIDTH 70 diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 6831ad5b6..452d2420e 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -594,7 +594,7 @@ void ChatWindow::ignoreAllWhispers() PlayerRelation::IGNORED); } - delete(iter->second); + delete (iter->second); iter->second = nullptr; } } @@ -1122,7 +1122,7 @@ std::string ChatWindow::addColors(std::string &msg) int cMap[] = {1, 4, 5, 2, 3, 6, 7, 9, 0, 8}; // rainbow - switch(mChatColor) + switch (mChatColor) { case 11: msg = removeColors(msg); diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp index cf9d541ad..22acf5116 100644 --- a/src/gui/confirmdialog.cpp +++ b/src/gui/confirmdialog.cpp @@ -112,4 +112,3 @@ void ConfirmDialog::action(const gcn::ActionEvent &event) scheduleDelete(); } } - diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index d13545bea..19db5540a 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -396,4 +396,4 @@ void NetDebugTab::logic() PacketCounters::getInBytes())); mOutPackets1Label->setCaption(strprintf(_("Out: %d bytes/s"), PacketCounters::getOutBytes())); -} \ No newline at end of file +} diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 9a9e5f50d..d96aa564f 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -282,4 +282,4 @@ void ItemPopup::mouseMoved(gcn::MouseEvent &event) setVisible(false); mLastName = ""; mLastColor = 1; -} \ No newline at end of file +} diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index 6bcb62baf..b2ffb312c 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -128,4 +128,4 @@ void NpcPostDialog::closeAll() for (; it != it_end; ++it) (*it)->close(); -} \ No newline at end of file +} diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index fe14cd2d4..3b36fa6ce 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -39,7 +39,8 @@ const gcn::Color Palette::BLACK = gcn::Color(0, 0, 0); Palette::Palettes Palette::mInstances; -const gcn::Color Palette::RAINBOW_COLORS[7] = { +const gcn::Color Palette::RAINBOW_COLORS[7] = +{ gcn::Color(255, 0, 0), gcn::Color(255, 153, 0), gcn::Color(255, 255, 0), @@ -48,6 +49,7 @@ const gcn::Color Palette::RAINBOW_COLORS[7] = { gcn::Color(51, 0, 153), gcn::Color(153, 0, 153) }; + /** Number of Elemets of RAINBOW_COLORS */ const int Palette::RAINBOW_COLOR_COUNT = 7; diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 571856a14..47d53620c 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -50,7 +50,8 @@ #define RELATION_CHOICE_COLUMN 1 #define ROW_HEIGHT 12 -// The following column widths really shouldn't be hardcoded but should scale with the size of the widget... except +// The following column widths really shouldn't be hardcoded +// but should scale with the size of the widget... except // that, right now, the widget doesn't exactly scale either. #define NAME_COLUMN_WIDTH 230 #define RELATION_CHOICE_COLUMN_WIDTH 80 diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 9a5b30ea7..6b3d6d4d3 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -743,4 +743,4 @@ void Setup_Video::action(const gcn::ActionEvent &event) void Setup_Video::externalUpdated() { -} \ No newline at end of file +} diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 86964383a..3fbec4f35 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -286,7 +286,7 @@ void StatusWindow::processEvent(Mana::Channels channel A_UNUSED, if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) { - switch(event.getInt("id")) + switch (event.getInt("id")) { case HP: case MAX_HP: updateHPBar(mHpBar, true); diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp index b30c9eb82..d7d3d5eeb 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/textdialog.cpp @@ -126,4 +126,4 @@ void TextDialog::close() { keyboard.setEnabled(mEnabledKeyboard); scheduleDelete(); -} \ No newline at end of file +} diff --git a/src/gui/viewport.h b/src/gui/viewport.h index f3035b5df..ccb8124ba 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -90,7 +90,9 @@ class Viewport : public WindowContainer, public gcn::MouseListener, void logic(); /** - * Toggles whether the path debug graphics are shown. normal, debug with all images and grid, debug with out big images and with out grid. + * Toggles whether the path debug graphics are shown. normal, + * debug with all images and grid, debug with out big images + * and with out grid. */ void toggleDebugPath(); diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 205a1aae1..104e4d7f1 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -138,7 +138,7 @@ WhoIsOnline::~WhoIsOnline() mMemoryBuffer = nullptr; // Remove possibly leftover temporary download - delete[] mCurlError; + delete []mCurlError; std::set::iterator itd = mOnlinePlayers.begin(); std::set::iterator itd_end = mOnlinePlayers.end(); diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 2e3472515..822e71805 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -403,4 +403,4 @@ void AvatarListBox::optionChanged(const std::string &value) mShowGender = config.getBoolValue("showgender"); else if (value == "showlevel") mShowLevel = config.getBoolValue("showlevel"); -} \ No newline at end of file +} diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h index 8d85e739e..2a034a166 100644 --- a/src/gui/widgets/battletab.h +++ b/src/gui/widgets/battletab.h @@ -43,6 +43,3 @@ class BattleTab : public ChatTab extern BattleTab *battleChatTab; #endif - - - diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 6d5dfc9dd..018e35030 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -467,4 +467,4 @@ void ChatTab::addNewRow(std::string &line) addRow(line); } mScrollArea->logic(); -} \ No newline at end of file +} diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp index 80028a62f..106112956 100644 --- a/src/gui/widgets/container.cpp +++ b/src/gui/widgets/container.cpp @@ -47,4 +47,4 @@ bool Container::safeRemove(gcn::Widget* widget) } } return false; -} \ No newline at end of file +} diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index a769678ca..5896042fa 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -102,4 +102,3 @@ class DropDown : public gcn::DropDown }; #endif // end DROPDOWN_H - diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp index 216c2bea0..515682cb6 100644 --- a/src/gui/widgets/inventoryfilter.cpp +++ b/src/gui/widgets/inventoryfilter.cpp @@ -58,4 +58,4 @@ void InventoryFilter::action(const gcn::ActionEvent &event) { (*iter)->action(event); } -} \ No newline at end of file +} diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 046d09b59..3c42554b6 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -37,8 +37,8 @@ class LayoutCell; class ContainerPlacer { public: - ContainerPlacer(gcn::Container *c = nullptr, LayoutCell *l = nullptr): - mContainer(c), mCell(l) + ContainerPlacer(gcn::Container *c = nullptr, LayoutCell *lc = nullptr): + mContainer(c), mCell(lc) {} /** diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 059b05ba2..56ce0a25a 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -455,7 +455,6 @@ void SetupItemIntTextField::apply(std::string eventName) } - SetupItemLabel::SetupItemLabel(std::string text, std::string description, SetupTabScroll *parent, bool separator) : SetupItem(text, description, "", parent, "", "", true), diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp index b3863c134..d4ae46eb8 100644 --- a/src/gui/widgets/setuptab.cpp +++ b/src/gui/widgets/setuptab.cpp @@ -31,4 +31,4 @@ SetupTab::SetupTab() void SetupTab::externalUpdated() { -} \ No newline at end of file +} diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 71e373d70..ab6400149 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -191,4 +191,4 @@ void ShopListBox::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) return; mItemPopup->hide(); -} \ No newline at end of file +} diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index ed667e194..c6b57858c 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -298,4 +298,3 @@ void Slider::mouseExited(gcn::MouseEvent& event A_UNUSED) { mHasMouse = false; } - diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp index 5216fb89c..bc5d2ead6 100644 --- a/src/gui/widgets/tablemodel.cpp +++ b/src/gui/widgets/tablemodel.cpp @@ -173,4 +173,3 @@ int StaticTableModel::getHeight() const { return mColumns * mHeight; } - diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 4dba2eb57..e207b0613 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -208,29 +208,29 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent) } else if (!mMaximum || mText.size() < mMaximum) { - int l; + int len; if (val < 128) - l = 1; // 0xxxxxxx + len = 1; // 0xxxxxxx else if (val < 0x800) - l = 2; // 110xxxxx 10xxxxxx + len = 2; // 110xxxxx 10xxxxxx else if (val < 0x10000) - l = 3; // 1110xxxx 10xxxxxx 10xxxxxx + len = 3; // 1110xxxx 10xxxxxx 10xxxxxx else - l = 4; // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + len = 4; // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx char buf[4]; - for (int i = 0; i < l; ++i) + for (int i = 0; i < len; ++ i) { - buf[i] = static_cast(val >> (6 * (l - i - 1))); + buf[i] = static_cast(val >> (6 * (len - i - 1))); if (i > 0) buf[i] = static_cast((buf[i] & 63) | 128); } - if (l > 1) - buf[0] |= static_cast(255 << (8 - l)); + if (len > 1) + buf[0] |= static_cast(255 << (8 - len)); - mText.insert(mCaretPosition, std::string(buf, buf + l)); - mCaretPosition += l; + mText.insert(mCaretPosition, std::string(buf, buf + len)); + mCaretPosition += len; } } diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h index 06add3ee0..44922c31a 100644 --- a/src/gui/widgets/tradetab.h +++ b/src/gui/widgets/tradetab.h @@ -46,6 +46,3 @@ class TradeTab : public ChatTab extern TradeTab *tradeChatTab; #endif - - - diff --git a/src/guichan/actionevent.cpp b/src/guichan/actionevent.cpp index a91c6dec0..7348587d7 100644 --- a/src/guichan/actionevent.cpp +++ b/src/guichan/actionevent.cpp @@ -69,4 +69,3 @@ namespace gcn return mId; } } - diff --git a/src/guichan/event.cpp b/src/guichan/event.cpp index 691240d11..5983af7e7 100644 --- a/src/guichan/event.cpp +++ b/src/guichan/event.cpp @@ -68,4 +68,3 @@ namespace gcn return mSource; } } - diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/guichan/include/guichan/actionevent.hpp index 96a2d1364..a6c54f516 100644 --- a/src/guichan/include/guichan/actionevent.hpp +++ b/src/guichan/include/guichan/actionevent.hpp @@ -112,4 +112,3 @@ namespace gcn } #endif // GCN_ACTIONEVENT_HPP - diff --git a/src/guichan/include/guichan/color.hpp b/src/guichan/include/guichan/color.hpp index a051c3569..6f0cfc1ff 100644 --- a/src/guichan/include/guichan/color.hpp +++ b/src/guichan/include/guichan/color.hpp @@ -139,7 +139,7 @@ namespace gcn */ bool operator!=(const Color& color) const; - /** + /** * Output operator for output. * * @param out The stream to output to. diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp index d8c9c7555..b2be75141 100644 --- a/src/guichan/include/guichan/gui.hpp +++ b/src/guichan/include/guichan/gui.hpp @@ -65,10 +65,15 @@ namespace gcn /** * @mainpage * @section Introduction - * This documentation is mostly intended as a reference to the API. If you want to get started with Guichan, we suggest you check out the programs in the examples directory of the Guichan release. + * This documentation is mostly intended as a reference to the API. + * If you want to get started with Guichan, we suggest you check out + * the programs in the examples directory of the Guichan release. * @n * @n - * This documentation is, and will always be, work in progress. If you find any errors, typos or inconsistencies, or if you feel something needs to be explained in more detail - don't hesitate to tell us. + * This documentation is, and will always be, work in progress. + * If you find any errors, typos or inconsistencies, or if you feel + * something needs to be explained in more detail - don't hesitate to + * tell us. */ /** diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp index 663c2059d..a0221ca7c 100644 --- a/src/guichan/include/guichan/sdl/sdlpixel.hpp +++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp @@ -72,7 +72,7 @@ namespace gcn unsigned int color = 0; - switch(bpp) + switch (bpp) { case 1: color = *p; @@ -127,7 +127,7 @@ namespace gcn Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b); - switch(bpp) + switch (bpp) { case 1: *p = pixel; @@ -234,7 +234,7 @@ namespace gcn Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b); - switch(bpp) + switch (bpp) { case 1: *p = pixel; diff --git a/src/guichan/keyinput.cpp b/src/guichan/keyinput.cpp index 3f5ebc124..35e8b6168 100644 --- a/src/guichan/keyinput.cpp +++ b/src/guichan/keyinput.cpp @@ -134,4 +134,3 @@ namespace gcn mNumericPad = numpad; } } - diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp index 79c65da9f..c8cec6370 100644 --- a/src/guichan/sdl/sdlgraphics.cpp +++ b/src/guichan/sdl/sdlgraphics.cpp @@ -289,7 +289,7 @@ namespace gcn mColor.r, mColor.g, mColor.b); - switch(bpp) + switch (bpp) { case 1: for (; x1 <= x2; ++x1) @@ -400,7 +400,7 @@ namespace gcn Uint32 pixel = SDL_MapRGB(mTarget->format, mColor.r, mColor.g, mColor.b); - switch(bpp) + switch (bpp) { case 1: for (; y1 <= y2; ++y1) diff --git a/src/guichan/selectionevent.cpp b/src/guichan/selectionevent.cpp index 784252230..8c8a3f28f 100644 --- a/src/guichan/selectionevent.cpp +++ b/src/guichan/selectionevent.cpp @@ -63,4 +63,3 @@ namespace gcn } } - diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp index ab0b19e00..c7ec3e1e0 100644 --- a/src/guichan/widgets/checkbox.cpp +++ b/src/guichan/widgets/checkbox.cpp @@ -138,4 +138,3 @@ namespace gcn distributeActionEvent(); } } - diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp index 40abaf41f..ead4e7815 100644 --- a/src/guichan/widgets/dropdown.cpp +++ b/src/guichan/widgets/dropdown.cpp @@ -422,4 +422,3 @@ namespace gcn } } } - diff --git a/src/guichan/widgets/icon.cpp b/src/guichan/widgets/icon.cpp index c85ada7c3..dca3400ba 100644 --- a/src/guichan/widgets/icon.cpp +++ b/src/guichan/widgets/icon.cpp @@ -56,16 +56,16 @@ namespace gcn { - Icon::Icon() - : mImage(nullptr) - , mInternalImage(false) + Icon::Icon() : + mImage(nullptr), + mInternalImage(false) { setSize(0, 0); } - Icon::Icon(const std::string& filename) - : mImage(nullptr), - mInternalImage(false) + Icon::Icon(const std::string& filename) : + mImage(nullptr), + mInternalImage(false) { mImage = Image::load(filename); mInternalImage = true; @@ -73,9 +73,9 @@ namespace gcn mImage->getHeight()); } - Icon::Icon(const Image* image) - : mImage(image), - mInternalImage(false) + Icon::Icon(const Image* image) : + mImage(image), + mInternalImage(false) { setSize(mImage->getWidth(), mImage->getHeight()); diff --git a/src/guichan/widgets/tab.cpp b/src/guichan/widgets/tab.cpp index 96a347607..8afc248c5 100644 --- a/src/guichan/widgets/tab.cpp +++ b/src/guichan/widgets/tab.cpp @@ -116,4 +116,3 @@ namespace gcn mHasMouse = false; } } - diff --git a/src/localconsts.h b/src/localconsts.h index 2d0eb5dea..de67c3850 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -30,4 +30,4 @@ #define A_UNUSED __attribute__ ((unused)) #else #define A_UNUSED -#endif \ No newline at end of file +#endif diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 81c988d53..bb0c087d5 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2338,7 +2338,7 @@ void LocalPlayer::crazyMove() { bool oldDisableCrazyMove = mDisableCrazyMove; mDisableCrazyMove = true; - switch(mCrazyMoveType) + switch (mCrazyMoveType) { case 1: crazyMove1(); @@ -2449,7 +2449,7 @@ void LocalPlayer::crazyMove3() if (mAction == MOVE) return; - switch(mCrazyMoveState) + switch (mCrazyMoveState) { case 0: move(1, 1); @@ -2483,7 +2483,7 @@ void LocalPlayer::crazyMove4() if (mAction == MOVE) return; - switch(mCrazyMoveState) + switch (mCrazyMoveState) { case 0: move(7, 0); @@ -2503,7 +2503,7 @@ void LocalPlayer::crazyMove5() if (mAction == MOVE) return; - switch(mCrazyMoveState) + switch (mCrazyMoveState) { case 0: move(0, 7); @@ -2523,7 +2523,7 @@ void LocalPlayer::crazyMove6() if (mAction == MOVE) return; - switch(mCrazyMoveState) + switch (mCrazyMoveState) { case 0: move(3, 0); @@ -2567,7 +2567,7 @@ void LocalPlayer::crazyMove7() if (mAction == MOVE) return; - switch(mCrazyMoveState) + switch (mCrazyMoveState) { case 0: move(1, 1); @@ -3045,7 +3045,7 @@ bool LocalPlayer::pickUpItems(int pickUpType) return status; int x1, y1, x2, y2; - switch(pickUpType) + switch (pickUpType) { case 1: switch (mDirection) @@ -3206,7 +3206,7 @@ void LocalPlayer::magicAttack() if (!Client::limitPackets(PACKET_CHAT)) return; - switch(mMagicAttackType) + switch (mMagicAttackType) { //flar W00 case 0: diff --git a/src/logger.cpp b/src/logger.cpp index a2df9a911..1541616f2 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -186,7 +186,7 @@ void Logger::log(const char *log_text, ...) debugChatTab->chatLog(buf, BY_LOGGER); // Delete temporary buffer - delete[] buf; + delete [] buf; } void Logger::error(const std::string &error_text) diff --git a/src/map.cpp b/src/map.cpp index a9aed4531..3ea9989a4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -181,9 +181,9 @@ Map::~Map() config.removeListener("beingopacity", this); // delete metadata, layers, tilesets and overlays - delete[] mMetaTiles; + delete [] mMetaTiles; for (int i = 0; i < NB_BLOCKTYPES; i++) - delete[] mOccupation[i]; + delete [] mOccupation[i]; mFringeLayer = nullptr; delete_all(mLayers); @@ -1435,7 +1435,7 @@ void Map::clearIndexedTilesets() return; mTilesetsIndexed = false; - delete[] mIndexedTilesets; + delete [] mIndexedTilesets; mIndexedTilesetsSize = 0; } diff --git a/src/maplayer.cpp b/src/maplayer.cpp index 3e9c47968..514a35858 100644 --- a/src/maplayer.cpp +++ b/src/maplayer.cpp @@ -56,7 +56,7 @@ MapLayer::MapLayer(int x, int y, int width, int height, bool fringeLayer): MapLayer::~MapLayer() { config.removeListener("highlightAttackRange", this); - delete[] mTiles; + delete [] mTiles; delete_all(mTempRows); mTempRows.clear(); } @@ -534,7 +534,7 @@ SpecialLayer::~SpecialLayer() delete mTiles[f]; mTiles[f] = nullptr; } - delete[] mTiles; + delete [] mTiles; } MapItem* SpecialLayer::getTile(int x, int y) const @@ -722,7 +722,7 @@ void MapItem::draw(Graphics *graphics, int x, int y, int dx, int dy) if (mImage) graphics->drawImage(mImage, x, y); - switch(mType) + switch (mType) { case ROAD: case CROSS: diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp index 100b600b4..7e857a52b 100644 --- a/src/mumblemanager.cpp +++ b/src/mumblemanager.cpp @@ -182,7 +182,7 @@ void MumbleManager::setAction(int action) if (!mLinkedMem) return; - switch(action) + switch (action) { case 0: /* STAND */ case 1: /* WALK */ @@ -228,7 +228,7 @@ void MumbleManager::setPos(int tileX, int tileY, int direction) // Unit vector pointing out of the avatars eyes // (here Front looks into scene). - switch(direction) + switch (direction) { case 4: /* UP */ mLinkedMemCache.fAvatarFront[0] = 0.0f; diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 84bd03bb1..d9e7e7506 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -511,6 +511,12 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) } break; + case 0x01: // dead + break; + // tmw server can send here garbage? +// if (srcBeing) +// srcBeing->setAction(Being::DEAD); + case 0x02: // Sit if (srcBeing) { diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index cf62af459..d5e344ac2 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -242,4 +242,3 @@ void PartyTab::saveToLogFile(std::string &msg) } } // namespace Ea - diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 4c4fb760c..d870eff38 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -330,7 +330,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) { Item *item = inventory->getItem(index); - if (item && item->getId() == itemId) + if (item && item->getId() == itemId) amount += item->getQuantity(); if (serverVersion < 1 && identified > 1) diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index f0a23127c..12451e6f6 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -293,7 +293,7 @@ void ChatHandler::handleChannelEvent(Net::MessageIn &msg) if (channel) { - switch(eventId) + switch (eventId) { case CHAT_EVENT_NEW_PLAYER: channel->getTab()->chatLog(strprintf(_("%s entered the " diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp index dfd2ed3cf..aa82d6dcd 100644 --- a/src/net/manaserv/guildhandler.cpp +++ b/src/net/manaserv/guildhandler.cpp @@ -153,7 +153,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg) Guild *guild = player_node->getGuild(guildId); if (guild) { - switch(eventId) + switch (eventId) { case GUILD_EVENT_NEW_PLAYER: member = guild->addMember(name); diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index aa79d4d41..b2609cf02 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -151,8 +151,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg) PlayerInfo::setAttribute(CORR_POINTS, msg.readInt16()); Particle* effect = particleEngine->addEffect( paths.getStringValue("particles") - + paths.getStringValue("levelUpEffectFile") - , 0, 0); + + paths.getStringValue("levelUpEffectFile"), 0, 0); player_node->controlParticle(effect); } break; diff --git a/src/net/net.cpp b/src/net/net.cpp index 713b6aa7e..75bc35b72 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -202,4 +202,3 @@ ServerInfo::Type getNetworkType() } } // namespace Net - diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index af90f5c6b..496ba64f5 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -53,4 +53,3 @@ GuildTab::~GuildTab() } } // namespace TmwAthena - diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index d0738e79c..02bcfd54f 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -56,4 +56,3 @@ PartyTab::~PartyTab() } } // namespace TmwAthena - diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 31329eafb..6e9e367c0 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -133,8 +133,8 @@ Network::~Network() mMutex = nullptr; mInstance = nullptr; - delete[] mInBuffer; - delete[] mOutBuffer; + delete []mInBuffer; + delete []mOutBuffer; SDLNet_Quit(); } diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 2c3d914b0..bcf46e18b 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -61,9 +61,9 @@ OpenGLGraphics::OpenGLGraphics(): OpenGLGraphics::~OpenGLGraphics() { - delete[] mFloatTexArray; - delete[] mIntTexArray; - delete[] mIntVertArray; + delete [] mFloatTexArray; + delete [] mIntTexArray; + delete [] mIntVertArray; } void OpenGLGraphics::setSync(bool sync) diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 6b5cb0199..38062c352 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -103,7 +103,8 @@ class PlayerConfSerialiser : static PlayerConfSerialiser player_conf_serialiser; // stateless singleton -const unsigned int PlayerRelation::RELATION_PERMISSIONS[RELATIONS_NR] = { +const unsigned int PlayerRelation::RELATION_PERMISSIONS[RELATIONS_NR] = +{ /* NEUTRAL */ 0, // we always fall back to the defaults anyway /* FRIEND */ EMOTE | SPEECH_FLOAT | SPEECH_LOG | WHISPER | TRADE, /* DISREGARDED*/ EMOTE | SPEECH_FLOAT, @@ -531,8 +532,6 @@ public: Uint8 mEmotion; }; - - std::vector * PlayerRelationsManager::getPlayerIgnoreStrategies() { diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 6f9042029..0ac11f114 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -250,14 +250,14 @@ Image *Image::createTextSurface(SDL_Surface *tmpImage, float alpha) // We also delete the alpha channel since // it's not used. - delete[] alphaChannel; + delete [] alphaChannel; alphaChannel = nullptr; } if (!image) { logger->log1("Error: Image convert failed."); - delete[] alphaChannel; + delete [] alphaChannel; return nullptr; } @@ -295,7 +295,7 @@ void Image::unload() SDL_FreeSurface(mSDLSurface); mSDLSurface = nullptr; - delete[] mAlphaChannel; + delete [] mAlphaChannel; mAlphaChannel = nullptr; } @@ -689,14 +689,14 @@ Image *Image::_SDLload(SDL_Surface *tmpImage) // We also delete the alpha channel since // it's not used. - delete[] alphaChannel; + delete [] alphaChannel; alphaChannel = nullptr; } if (!image) { logger->log1("Error: Image convert failed."); - delete[] alphaChannel; + delete [] alphaChannel; return nullptr; } diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 1ddb74f20..eec14685d 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -503,7 +503,7 @@ void MapReader::readLayer(XmlNodePtr node, Map *map) const char *charStart = reinterpret_cast(xmlChars); if (!charStart) { - delete[] charData; + delete [] charData; return; } @@ -526,7 +526,7 @@ void MapReader::readLayer(XmlNodePtr node, Map *map) static_cast(strlen(reinterpret_cast( charData))), &binLen); - delete[] charData; + delete [] charData; xmlFree(xmlChars); if (binData) diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index c26526b97..7adeaa268 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -404,19 +404,19 @@ struct ResourceLoader { if (!v) return nullptr; - ResourceLoader *l = static_cast< ResourceLoader * >(v); - SDL_RWops *rw = PHYSFSRWOPS_openRead(l->path.c_str()); + ResourceLoader *rl = static_cast< ResourceLoader * >(v); + SDL_RWops *rw = PHYSFSRWOPS_openRead(rl->path.c_str()); if (!rw) return nullptr; - Resource *res = l->fun(rw); + Resource *res = rl->fun(rw); return res; } }; Resource *ResourceManager::load(const std::string &path, loader fun) { - ResourceLoader l = { this, path, fun }; - return get(path, ResourceLoader::load, &l); + ResourceLoader rl = { this, path, fun }; + return get(path, ResourceLoader::load, &rl); } Music *ResourceManager::getMusic(const std::string &idPath) @@ -438,11 +438,11 @@ struct DyedImageLoader if (!v) return nullptr; - DyedImageLoader *l = static_cast< DyedImageLoader * >(v); - if (!l->manager) + DyedImageLoader *rl = static_cast< DyedImageLoader * >(v); + if (!rl->manager) return nullptr; - std::string path = l->path; + std::string path = rl->path; std::string::size_type p = path.find('|'); Dye *d = nullptr; if (p != std::string::npos) @@ -465,8 +465,8 @@ struct DyedImageLoader Image *ResourceManager::getImage(const std::string &idPath) { - DyedImageLoader l = { this, idPath }; - return static_cast(get(idPath, DyedImageLoader::load, &l)); + DyedImageLoader rl = { this, idPath }; + return static_cast(get(idPath, DyedImageLoader::load, &rl)); } /* @@ -475,8 +475,8 @@ Image *ResourceManager::getSkinImage(const std::string &idPath) if (mSelectedSkin.empty()) return getImage(idPath); - DyedImageLoader l = { this, mSelectedSkin + idPath }; - void *ptr = get(idPath, DyedImageLoader::load, &l); + DyedImageLoader rl = { this, mSelectedSkin + idPath }; + void *ptr = get(idPath, DyedImageLoader::load, &rl); if (ptr) return static_cast(ptr); else @@ -494,14 +494,14 @@ struct ImageSetLoader if (!v) return nullptr; - ImageSetLoader *l = static_cast< ImageSetLoader * >(v); - if (!l->manager) + ImageSetLoader *rl = static_cast< ImageSetLoader * >(v); + if (!rl->manager) return nullptr; - Image *img = l->manager->getImage(l->path); + Image *img = rl->manager->getImage(rl->path); if (!img) return nullptr; - ImageSet *res = new ImageSet(img, l->w, l->h); + ImageSet *res = new ImageSet(img, rl->w, rl->h); img->decRef(); return res; } @@ -510,10 +510,10 @@ struct ImageSetLoader ImageSet *ResourceManager::getImageSet(const std::string &imagePath, int w, int h) { - ImageSetLoader l = { this, imagePath, w, h }; + ImageSetLoader rl = { this, imagePath, w, h }; std::stringstream ss; ss << imagePath << "[" << w << "x" << h << "]"; - return static_cast(get(ss.str(), ImageSetLoader::load, &l)); + return static_cast(get(ss.str(), ImageSetLoader::load, &rl)); } struct SpriteDefLoader @@ -525,17 +525,17 @@ struct SpriteDefLoader if (!v) return nullptr; - SpriteDefLoader *l = static_cast< SpriteDefLoader * >(v); - return SpriteDef::load(l->path, l->variant); + SpriteDefLoader *rl = static_cast< SpriteDefLoader * >(v); + return SpriteDef::load(rl->path, rl->variant); } }; SpriteDef *ResourceManager::getSprite(const std::string &path, int variant) { - SpriteDefLoader l = { path, variant }; + SpriteDefLoader rl = { path, variant }; std::stringstream ss; ss << path << "[" << variant << "]"; - return static_cast(get(ss.str(), SpriteDefLoader::load, &l)); + return static_cast(get(ss.str(), SpriteDefLoader::load, &rl)); } void ResourceManager::release(Resource *res) @@ -723,10 +723,10 @@ struct RescaledLoader { if (!v) return nullptr; - RescaledLoader *l = static_cast< RescaledLoader * >(v); - if (!l->manager) + RescaledLoader *rl = static_cast< RescaledLoader * >(v); + if (!rl->manager || !rl->image) return nullptr; - Image *rescaled = l->image->SDLgetScaledImage(l->width, l->height); + Image *rescaled = rl->image->SDLgetScaledImage(rl->width, rl->height); if (!rescaled) return nullptr; return rescaled; @@ -740,7 +740,7 @@ Image *ResourceManager::getRescaled(Image *image, int width, int height) std::string idPath = image->getIdPath() + strprintf( "_rescaled%dx%d", width, height); - RescaledLoader l = { this, image, width, height }; - Image *img = static_cast(get(idPath, RescaledLoader::load, &l)); + RescaledLoader rl = { this, image, width, height }; + Image *img = static_cast(get(idPath, RescaledLoader::load, &rl)); return img; } diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp index b1a3a9c4d..664d2c73d 100644 --- a/src/resources/specialdb.cpp +++ b/src/resources/specialdb.cpp @@ -36,7 +36,7 @@ namespace SpecialInfo::TargetMode SpecialDB::targetModeFromString(const std::string& str) { - if (str == "self") return SpecialInfo::TARGET_SELF; + if (str == "self") return SpecialInfo::TARGET_SELF; else if (str == "friend") return SpecialInfo::TARGET_FRIEND; else if (str == "enemy") return SpecialInfo::TARGET_ENEMY; else if (str == "being") return SpecialInfo::TARGET_BEING; @@ -131,4 +131,3 @@ SpecialInfo *SpecialDB::get(int id) return i->second; return nullptr; } - diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index 7c4c444f0..ebdff6382 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -66,7 +66,8 @@ TextCommand* SpellManager::getSpellByItem(int itemId) void SpellManager::fillSpells() { -//id, std::string name, std::string symbol, ST type, int basicLvl, MagicSchool school, int schoolLvl, int mana) +//id, std::string name, std::string symbol, ST type, int basicLvl, +// MagicSchool school, int schoolLvl, int mana) addSpell(new TextCommand(0, "lum", "#lum", "heal with lifestones", ALLOWTARGET, "", 1, SKILL_MAGIC_LIFE, 0, 6)); diff --git a/src/textcommand.h b/src/textcommand.h index 27b44cc7a..6677b97e9 100644 --- a/src/textcommand.h +++ b/src/textcommand.h @@ -153,7 +153,7 @@ class TextCommand { mCommandType = commandType; } bool isEmpty() const - { return mCommand == "" && mSymbol == "" ; } + { return mCommand == "" && mSymbol == ""; } Image *getImage() const { return mImage; } diff --git a/src/units.cpp b/src/units.cpp index 804512dbd..1440cff9f 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -150,12 +150,12 @@ void Units::loadUnits() } // Add one more level for saftey - struct UnitLevel ll; - ll.symbol = ""; - ll.count = INT_MAX; - ll.round = 0; + struct UnitLevel lev; + lev.symbol = ""; + lev.count = INT_MAX; + lev.round = 0; - ud.levels.push_back(ll); + ud.levels.push_back(lev); if (type == "weight") units[UNIT_WEIGHT] = ud; diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index 24a3a58e3..cd7d59cdb 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -125,7 +125,7 @@ unsigned char *php3_base64_decode(const unsigned char *string, continue; ch = static_cast(chp - base64_table); - switch(i % 4) + switch (i % 4) { case 0: result[j] = ch << 2; @@ -151,7 +151,7 @@ unsigned char *php3_base64_decode(const unsigned char *string, /* mop things up if we ended on a boundary */ if (ch == base64_pad) { - switch(i % 4) + switch (i % 4) { case 0: case 1: diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h index efa004ac6..1f52f40aa 100644 --- a/src/utils/physfsrwops.h +++ b/src/utils/physfsrwops.h @@ -79,4 +79,3 @@ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); #endif /* include-once blocker */ /* end of physfsrwops.h ... */ - diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index becb2124d..5e7bf19a0 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -405,7 +405,7 @@ std::set splitToIntSet(const std::string &text, char separator) std::set tokens; std::stringstream ss(text); std::string item; - while(std::getline(ss, item, separator)) + while (std::getline(ss, item, separator)) tokens.insert(atoi(item.c_str())); return tokens; @@ -416,7 +416,7 @@ std::list splitToIntList(const std::string &text, char separator) std::list tokens; std::stringstream ss(text); std::string item; - while(std::getline(ss, item, separator)) + while (std::getline(ss, item, separator)) tokens.push_back(atoi(item.c_str())); return tokens; @@ -429,7 +429,7 @@ std::list splitToStringList(const std::string &text, std::list tokens; std::stringstream ss(text); std::string item; - while(std::getline(ss, item, separator)) + while (std::getline(ss, item, separator)) tokens.push_back(item); return tokens; @@ -440,7 +440,7 @@ void splitToStringVector(std::vector &tokens, { std::stringstream ss(text); std::string item; - while(std::getline(ss, item, separator)) + while (std::getline(ss, item, separator)) { item = trim(item); if (!item.empty()) diff --git a/src/vector.h b/src/vector.h index 744b235c0..2caf48418 100644 --- a/src/vector.h +++ b/src/vector.h @@ -185,8 +185,8 @@ class Vector */ Vector normalized() const { - const float l = length(); - return Vector(x / l, y / l, z / l); + const float len = length(); + return Vector(x / len, y / len, z / len); } float x, y, z; -- cgit v1.2.3-70-g09d2 From da44888ee2de9ae1e5c006126e84b36fcc95d4e5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Feb 2012 00:50:20 +0300 Subject: Add makecheck5 tool. --- build/makecheck5 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 build/makecheck5 diff --git a/build/makecheck5 b/build/makecheck5 new file mode 100755 index 000000000..e20b58729 --- /dev/null +++ b/build/makecheck5 @@ -0,0 +1,5 @@ +#!/bin/bash + +find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>makecheck_err.txt +find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt +find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt -- cgit v1.2.3-70-g09d2 From 178f4811e8602ba7dacb1a0513baa546088d517d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Feb 2012 02:13:16 +0300 Subject: Fix compilation errors and more style. --- src/client.cpp | 8 +- src/configuration.cpp | 48 +++++----- src/debug/debug_new.cpp | 182 ++++++++++++++++++------------------ src/debug/debug_new.h | 12 +-- src/defaults.cpp | 2 - src/defaults.h | 20 ++-- src/event.cpp | 5 - src/event.h | 10 +- src/game.cpp | 20 ++-- src/gui/chatwindow.cpp | 14 +-- src/gui/chatwindow.h | 4 +- src/gui/inventorywindow.cpp | 8 +- src/gui/inventorywindow.h | 4 +- src/gui/killstats.cpp | 8 +- src/gui/killstats.h | 6 +- src/gui/ministatuswindow.cpp | 10 +- src/gui/ministatuswindow.h | 4 +- src/gui/statuswindow.cpp | 10 +- src/gui/statuswindow.h | 4 +- src/listener.cpp | 5 - src/listener.h | 5 - src/localplayer.cpp | 12 +-- src/localplayer.h | 4 +- src/net/ea/gamehandler.cpp | 12 +-- src/net/ea/gamehandler.h | 6 +- src/net/manaserv/generalhandler.cpp | 14 +-- src/net/manaserv/generalhandler.h | 4 +- src/net/tmwa/generalhandler.cpp | 10 +- src/net/tmwa/generalhandler.h | 4 +- src/playerinfo.cpp | 28 +++--- src/resources/emotedb.cpp | 6 +- src/variabledata.h | 5 - 32 files changed, 234 insertions(+), 260 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 54a0b6224..023eb5353 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -988,10 +988,10 @@ int Client::gameExec() if (mState != mOldState) { - Mana::Event evt(EVENT_STATECHANGE); + Event evt(EVENT_STATECHANGE); evt.setInt("oldState", mOldState); evt.setInt("newState", mState); - Mana::Event::trigger(CHANNEL_CLIENT, evt); + Event::trigger(CHANNEL_CLIENT, evt); if (mOldState == STATE_GAME) { @@ -1191,10 +1191,10 @@ int Client::gameExec() if (!BeingInfo::unknown) BeingInfo::unknown = new BeingInfo; - Mana::Event evt2(EVENT_STATECHANGE); + Event evt2(EVENT_STATECHANGE); evt2.setInt("newState", STATE_LOAD_DATA); evt2.setInt("oldState", mOldState); - Mana::Event::trigger(CHANNEL_CLIENT, evt2); + Event::trigger(CHANNEL_CLIENT, evt2); // Load XML databases CharDB::load(); diff --git a/src/configuration.cpp b/src/configuration.cpp index 254a3fea8..c4f1cc360 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -193,21 +193,21 @@ int Configuration::getIntValue(const std::string &key) const if (itdef != mDefaultsData->end() && itdef->second) { - if (itdef->second->getType() == Mana::VariableData::DATA_INT) + if (itdef->second->getType() == VariableData::DATA_INT) { - defaultValue = (static_cast( + defaultValue = (static_cast( itdef->second))->getData(); } else if (itdef->second->getType() - == Mana::VariableData::DATA_STRING) + == VariableData::DATA_STRING) { - defaultValue = atoi((static_cast( + defaultValue = atoi((static_cast( itdef->second))->getData().c_str()); } else if (itdef->second->getType() - == Mana::VariableData::DATA_BOOL) + == VariableData::DATA_BOOL) { - if ((static_cast( + if ((static_cast( itdef->second))->getData()) { defaultValue = 1; @@ -241,9 +241,9 @@ int Configuration::resetIntValue(const std::string &key) DefaultsData::const_iterator itdef = mDefaultsData->find(key); if (itdef != mDefaultsData->end() && itdef->second - && itdef->second->getType() == Mana::VariableData::DATA_INT) + && itdef->second->getType() == VariableData::DATA_INT) { - defaultValue = (static_cast( + defaultValue = (static_cast( itdef->second))->getData(); } else @@ -270,15 +270,15 @@ std::string Configuration::getStringValue(const std::string &key) const if (itdef != mDefaultsData->end() && itdef->second) { if (itdef->second->getType() - == Mana::VariableData::DATA_STRING) + == VariableData::DATA_STRING) { - defaultValue = (static_cast( + defaultValue = (static_cast( itdef->second))->getData(); } else if (itdef->second->getType() - == Mana::VariableData::DATA_BOOL) + == VariableData::DATA_BOOL) { - if ((static_cast( + if ((static_cast( itdef->second))->getData()) { defaultValue = "1"; @@ -289,9 +289,9 @@ std::string Configuration::getStringValue(const std::string &key) const } } else if (itdef->second->getType() - == Mana::VariableData::DATA_INT) + == VariableData::DATA_INT) { - defaultValue = toString((static_cast( + defaultValue = toString((static_cast( itdef->second))->getData()); } } @@ -322,10 +322,10 @@ float Configuration::getFloatValue(const std::string &key) const DefaultsData::const_iterator itdef = mDefaultsData->find(key); if (itdef != mDefaultsData->end() && itdef->second - && itdef->second->getType() == Mana::VariableData::DATA_FLOAT) + && itdef->second->getType() == VariableData::DATA_FLOAT) { defaultValue = static_cast( - (static_cast(itdef->second))->getData()); + (static_cast(itdef->second))->getData()); } else { @@ -354,15 +354,15 @@ bool Configuration::getBoolValue(const std::string &key) const if (itdef != mDefaultsData->end() && itdef->second) { - if (itdef->second->getType() == Mana::VariableData::DATA_BOOL) + if (itdef->second->getType() == VariableData::DATA_BOOL) { - defaultValue = (static_cast( + defaultValue = (static_cast( itdef->second))->getData(); } else if (itdef->second->getType() - == Mana::VariableData::DATA_INT) + == VariableData::DATA_INT) { - if ((static_cast( + if ((static_cast( itdef->second))->getData() != 0) { defaultValue = true; @@ -373,9 +373,9 @@ bool Configuration::getBoolValue(const std::string &key) const } } else if (itdef->second->getType() - == Mana::VariableData::DATA_STRING) + == VariableData::DATA_STRING) { - if ((static_cast( + if ((static_cast( itdef->second))->getData() != "0") { defaultValue = true; @@ -410,9 +410,9 @@ bool Configuration::resetBoolValue(const std::string &key) DefaultsData::const_iterator itdef = mDefaultsData->find(key); if (itdef != mDefaultsData->end() && itdef->second - && itdef->second->getType() == Mana::VariableData::DATA_BOOL) + && itdef->second->getType() == VariableData::DATA_BOOL) { - defaultValue = (static_cast( + defaultValue = (static_cast( itdef->second))->getData(); } else diff --git a/src/debug/debug_new.cpp b/src/debug/debug_new.cpp index 9e30d30d9..fb83cab4a 100644 --- a/src/debug/debug_new.cpp +++ b/src/debug/debug_new.cpp @@ -62,49 +62,49 @@ #endif /** - * @def _DEBUG_NEW_ALIGNMENT + * @def M_DEBUG_NEW_ALIGNMENT * * The alignment requirement of allocated memory blocks. It must be a * power of two. */ -#ifndef _DEBUG_NEW_ALIGNMENT -#define _DEBUG_NEW_ALIGNMENT 16 +#ifndef M_DEBUG_NEW_ALIGNMENT +#define M_DEBUG_NEW_ALIGNMENT 16 #endif /** - * @def _DEBUG_NEW_CALLER_ADDRESS + * @def M_DEBUG_NEW_CALLER_ADDRESS * * The expression to return the caller address. #print_position will * later on use this address to print the position information of memory * operation points. */ -#ifndef _DEBUG_NEW_CALLER_ADDRESS +#ifndef M_DEBUG_NEW_CALLER_ADDRESS #ifdef __GNUC__ -#define _DEBUG_NEW_CALLER_ADDRESS __builtin_return_address(0) +#define M_DEBUG_NEW_CALLER_ADDRESS __builtin_return_address(0) #else -#define _DEBUG_NEW_CALLER_ADDRESS NULL +#define M_DEBUG_NEW_CALLER_ADDRESS NULL #endif #endif /** - * @def _DEBUG_NEW_ERROR_ACTION + * @def M_DEBUG_NEW_ERROR_ACTION * * The action to take when an error occurs. The default behaviour is to - * call \e abort, unless \c _DEBUG_NEW_ERROR_CRASH is defined, in which + * call \e abort, unless \c M_DEBUG_NEW_ERROR_CRASH is defined, in which * case a segmentation fault will be triggered instead (which can be * useful on platforms like Windows that do not generate a core dump * when \e abort is called). */ -#ifndef _DEBUG_NEW_ERROR_ACTION -#ifndef _DEBUG_NEW_ERROR_CRASH -#define _DEBUG_NEW_ERROR_ACTION abort() +#ifndef M_DEBUG_NEW_ERROR_ACTION +#ifndef M_DEBUG_NEW_ERROR_CRASH +#define M_DEBUG_NEW_ERROR_ACTION abort() #else -#define _DEBUG_NEW_ERROR_ACTION do { *((char*)0) = 0; abort(); } while (0) +#define M_DEBUG_NEW_ERROR_ACTION do { *((char*)0) = 0; abort(); } while (0) #endif #endif /** - * @def _DEBUG_NEW_FILENAME_LEN + * @def M_DEBUG_NEW_FILENAME_LEN * * The length of file name stored if greater than zero. If it is zero, * only a const char pointer will be stored. Currently the default @@ -114,70 +114,70 @@ * name in a shared library after a \c SIGINT). The current default * value makes the size of new_ptr_list_t 64 on 32-bit platforms. */ -#ifndef _DEBUG_NEW_FILENAME_LEN -#define _DEBUG_NEW_FILENAME_LEN 100 +#ifndef M_DEBUG_NEW_FILENAME_LEN +#define M_DEBUG_NEW_FILENAME_LEN 100 #endif /** - * @def _DEBUG_NEW_PROGNAME + * @def M_DEBUG_NEW_PROGNAME * * The program (executable) name to be set at compile time. It is * better to assign the full program path to #new_progname in \e main * (at run time) than to use this (compile-time) macro, but this macro * serves well as a quick hack. Note also that double quotation marks * need to be used around the program name, i.e., one should specify a - * command-line option like -D_DEBUG_NEW_PROGNAME=\"a.out\" - * in \e bash, or -D_DEBUG_NEW_PROGNAME=\"a.exe\" in the + * command-line option like -DM_DEBUG_NEW_PROGNAME=\"a.out\" + * in \e bash, or -DM_DEBUG_NEW_PROGNAME=\"a.exe\" in the * Windows command prompt. */ -#ifndef _DEBUG_NEW_PROGNAME -#define _DEBUG_NEW_PROGNAME NULL +#ifndef M_DEBUG_NEW_PROGNAME +#define M_DEBUG_NEW_PROGNAME NULL #endif /** - * @def _DEBUG_NEW_STD_OPER_NEW + * @def M_DEBUG_NEW_STD_OPER_NEW * * Macro to indicate whether the standard-conformant behaviour of * operator new is wanted. It is on by default now, but * the user may set it to \c 0 to revert to the old behaviour. */ -#ifndef _DEBUG_NEW_STD_OPER_NEW -#define _DEBUG_NEW_STD_OPER_NEW 1 +#ifndef M_DEBUG_NEW_STD_OPER_NEW +#define M_DEBUG_NEW_STD_OPER_NEW 1 #endif /** - * @def _DEBUG_NEW_TAILCHECK + * @def M_DEBUG_NEW_TAILCHECK * * Macro to indicate whether a writing-past-end check will be performed. * Define it to a positive integer as the number of padding bytes at the * end of a memory block for checking. */ -#ifndef _DEBUG_NEW_TAILCHECK -#define _DEBUG_NEW_TAILCHECK 0 +#ifndef M_DEBUG_NEW_TAILCHECK +#define M_DEBUG_NEW_TAILCHECK 0 #endif /** - * @def _DEBUG_NEW_TAILCHECK_CHAR + * @def M_DEBUG_NEW_TAILCHECK_CHAR * * Value of the padding bytes at the end of a memory block. */ -#ifndef _DEBUG_NEW_TAILCHECK_CHAR -#define _DEBUG_NEW_TAILCHECK_CHAR 0xCC +#ifndef M_DEBUG_NEW_TAILCHECK_CHAR +#define M_DEBUG_NEW_TAILCHECK_CHAR 0xCC #endif /** - * @def _DEBUG_NEW_USE_ADDR2LINE + * @def M_DEBUG_NEW_USE_ADDR2LINE * * Whether to use \e addr2line to convert a caller address to file/line * information. Defining it to a non-zero value will enable the * conversion (automatically done if GCC is detected). Defining it to * zero will disable the conversion. */ -#ifndef _DEBUG_NEW_USE_ADDR2LINE +#ifndef M_DEBUG_NEW_USE_ADDR2LINE #ifdef __GNUC__ -#define _DEBUG_NEW_USE_ADDR2LINE 1 +#define M_DEBUG_NEW_USE_ADDR2LINE 1 #else -#define _DEBUG_NEW_USE_ADDR2LINE 0 +#define M_DEBUG_NEW_USE_ADDR2LINE 0 #endif #endif @@ -187,20 +187,20 @@ #pragma init_seg(lib) #endif -#undef _DEBUG_NEW_EMULATE_MALLOC -#undef _DEBUG_NEW_REDEFINE_NEW +#undef M_DEBUG_NEW_EMULATE_MALLOC +#undef M_DEBUG_NEW_REDEFINE_NEW /** * Macro to indicate whether redefinition of \c new is wanted. Here it * is defined to \c 0 to disable the redefinition of \c new. */ -#define _DEBUG_NEW_REDEFINE_NEW 0 +#define M_DEBUG_NEW_REDEFINE_NEW 0 #include "debug_new.h" /** * Gets the aligned value of memory block size. */ #define align(s) \ - (((s) + _DEBUG_NEW_ALIGNMENT - 1) & ~(_DEBUG_NEW_ALIGNMENT - 1)) + (((s) + M_DEBUG_NEW_ALIGNMENT - 1) & ~(M_DEBUG_NEW_ALIGNMENT - 1)) /** * Structure to store the position information where \c new occurs. @@ -212,10 +212,10 @@ struct new_ptr_list_t size_t size; union { -#if _DEBUG_NEW_FILENAME_LEN == 0 +#if M_DEBUG_NEW_FILENAME_LEN == 0 const char* file; #else - char file[_DEBUG_NEW_FILENAME_LEN]; + char file[M_DEBUG_NEW_FILENAME_LEN]; #endif void* addr; }; @@ -244,7 +244,7 @@ static new_ptr_list_t new_ptr_list = &new_ptr_list, 0, { -#if _DEBUG_NEW_FILENAME_LEN == 0 +#if M_DEBUG_NEW_FILENAME_LEN == 0 NULL #else "" @@ -291,15 +291,15 @@ FILE* new_output_fp = stderr; /** * Pointer to the program name. Its initial value is the macro - * #_DEBUG_NEW_PROGNAME. You should try to assign the program path to + * #M_DEBUG_NEW_PROGNAME. You should try to assign the program path to * it early in your application. Assigning argv[0] to it * in \e main is one way. If you use \e bash or \e ksh (or similar), * the following statement is probably what you want: * `new_progname = getenv("_");'. */ -const char* new_progname = _DEBUG_NEW_PROGNAME; +const char* new_progname = M_DEBUG_NEW_PROGNAME; -#if _DEBUG_NEW_USE_ADDR2LINE +#if M_DEBUG_NEW_USE_ADDR2LINE /** * Tries printing the position information from an instruction address. * This is the version that uses \e addr2line. @@ -397,11 +397,11 @@ static bool print_position_from_addr(const void*) { return false; } -#endif // _DEBUG_NEW_USE_ADDR2LINE +#endif // M_DEBUG_NEW_USE_ADDR2LINE /** * Prints the position information of a memory operation point. When \c - * _DEBUG_NEW_USE_ADDR2LINE is defined to a non-zero value, this + * M_DEBUG_NEW_USE_ADDR2LINE is defined to a non-zero value, this * function will try to convert a given caller address to file/line * information with \e addr2line. * @@ -427,7 +427,7 @@ static void print_position(const void* ptr, int line) } } -#if _DEBUG_NEW_TAILCHECK +#if M_DEBUG_NEW_TAILCHECK /** * Checks whether the padding bytes at the end of a memory block is * tampered with. @@ -440,9 +440,9 @@ static bool check_tail(new_ptr_list_t* ptr) { const unsigned char* const pointer = (unsigned char*)ptr + ALIGNED_LIST_ITEM_SIZE + ptr->size; - for (int i = 0; i < _DEBUG_NEW_TAILCHECK; ++i) + for (int i = 0; i < M_DEBUG_NEW_TAILCHECK; ++i) { - if (pointer[i] != _DEBUG_NEW_TAILCHECK_CHAR) + if (pointer[i] != M_DEBUG_NEW_TAILCHECK_CHAR) return false; } return true; @@ -462,14 +462,14 @@ static bool check_tail(new_ptr_list_t* ptr) static void* alloc_mem(size_t size, const char* file, int line, bool is_array) { assert(line >= 0); - STATIC_ASSERT((_DEBUG_NEW_ALIGNMENT & (_DEBUG_NEW_ALIGNMENT - 1)) == 0, + STATIC_ASSERT((M_DEBUG_NEW_ALIGNMENT & (M_DEBUG_NEW_ALIGNMENT - 1)) == 0, Alignment_must_be_power_of_two); - STATIC_ASSERT(_DEBUG_NEW_TAILCHECK >= 0, Invalid_tail_check_length); - size_t s = size + ALIGNED_LIST_ITEM_SIZE + _DEBUG_NEW_TAILCHECK; + STATIC_ASSERT(M_DEBUG_NEW_TAILCHECK >= 0, Invalid_tail_check_length); + size_t s = size + ALIGNED_LIST_ITEM_SIZE + M_DEBUG_NEW_TAILCHECK; new_ptr_list_t* ptr = (new_ptr_list_t*)malloc(s); if (ptr == NULL) { -#if _DEBUG_NEW_STD_OPER_NEW +#if M_DEBUG_NEW_STD_OPER_NEW return NULL; #else fast_mutex_autolock lock(new_output_lock); @@ -477,17 +477,17 @@ static void* alloc_mem(size_t size, const char* file, int line, bool is_array) "Out of memory when allocating %u bytes\n", size); fflush(new_output_fp); - _DEBUG_NEW_ERROR_ACTION; + M_DEBUG_NEW_ERROR_ACTION; #endif } void* pointer = (char*)ptr + ALIGNED_LIST_ITEM_SIZE; -#if _DEBUG_NEW_FILENAME_LEN == 0 +#if M_DEBUG_NEW_FILENAME_LEN == 0 ptr->file = file; #else if (line) { - strncpy(ptr->file, file, _DEBUG_NEW_FILENAME_LEN - 1) - [_DEBUG_NEW_FILENAME_LEN - 1] = '\0'; + strncpy(ptr->file, file, M_DEBUG_NEW_FILENAME_LEN - 1) + [M_DEBUG_NEW_FILENAME_LEN - 1] = '\0'; } else { @@ -506,9 +506,9 @@ static void* alloc_mem(size_t size, const char* file, int line, bool is_array) new_ptr_list.prev = ptr; } ptr->dumped = 0; -#if _DEBUG_NEW_TAILCHECK - memset((char*)pointer + size, _DEBUG_NEW_TAILCHECK_CHAR, - _DEBUG_NEW_TAILCHECK); +#if M_DEBUG_NEW_TAILCHECK + memset((char*)pointer + size, M_DEBUG_NEW_TAILCHECK_CHAR, + M_DEBUG_NEW_TAILCHECK); #endif if (new_verbose_flag) { @@ -552,7 +552,7 @@ static void free_pointer(void* pointer, void* addr, bool is_array) } check_mem_corruption(); fflush(new_output_fp); - _DEBUG_NEW_ERROR_ACTION; + M_DEBUG_NEW_ERROR_ACTION; } if (is_array != ptr->is_array) { @@ -575,14 +575,14 @@ static void free_pointer(void* pointer, void* addr, bool is_array) print_position(ptr->addr, ptr->line); fprintf(new_output_fp, "\n"); fflush(new_output_fp); - _DEBUG_NEW_ERROR_ACTION; + M_DEBUG_NEW_ERROR_ACTION; } -#if _DEBUG_NEW_TAILCHECK +#if M_DEBUG_NEW_TAILCHECK if (!check_tail(ptr)) { check_mem_corruption(); fflush(new_output_fp); - _DEBUG_NEW_ERROR_ACTION; + M_DEBUG_NEW_ERROR_ACTION; } #endif { @@ -630,7 +630,7 @@ int check_leaks() "warning: heap data corrupt near %p\n", pointer); } -#if _DEBUG_NEW_TAILCHECK +#if M_DEBUG_NEW_TAILCHECK if (!check_tail(ptr)) { fprintf(new_output_fp, @@ -687,14 +687,14 @@ int check_mem_corruption() { const char* const pointer = (char*)ptr + ALIGNED_LIST_ITEM_SIZE; if (ptr->magic == MAGIC -#if _DEBUG_NEW_TAILCHECK +#if M_DEBUG_NEW_TAILCHECK && check_tail(ptr) #endif ) { continue; } -#if _DEBUG_NEW_TAILCHECK +#if M_DEBUG_NEW_TAILCHECK if (ptr->magic != MAGIC) { #endif @@ -702,7 +702,7 @@ int check_mem_corruption() "Heap data corrupt near %p (size %u, ", pointer, (unsigned)ptr->size); -#if _DEBUG_NEW_TAILCHECK +#if M_DEBUG_NEW_TAILCHECK } else { @@ -738,19 +738,19 @@ void __debug_new_recorder::_M_process(void* pointer) _M_file, _M_line); return; } -#if _DEBUG_NEW_FILENAME_LEN == 0 +#if M_DEBUG_NEW_FILENAME_LEN == 0 ptr->file = _M_file; #else - strncpy(ptr->file, _M_file, _DEBUG_NEW_FILENAME_LEN - 1) - [_DEBUG_NEW_FILENAME_LEN - 1] = '\0'; + strncpy(ptr->file, _M_file, M_DEBUG_NEW_FILENAME_LEN - 1) + [M_DEBUG_NEW_FILENAME_LEN - 1] = '\0'; #endif ptr->line = _M_line; } -void* operator new(size_t size, const char* file, int line) +void* operator new (size_t size, const char* file, int line) { void* ptr = alloc_mem(size, file, line, false); -#if _DEBUG_NEW_STD_OPER_NEW +#if M_DEBUG_NEW_STD_OPER_NEW if (ptr) return ptr; else @@ -760,10 +760,10 @@ void* operator new(size_t size, const char* file, int line) #endif } -void* operator new[](size_t size, const char* file, int line) +void* operator new [](size_t size, const char* file, int line) { void* ptr = alloc_mem(size, file, line, true); -#if _DEBUG_NEW_STD_OPER_NEW +#if M_DEBUG_NEW_STD_OPER_NEW if (ptr) return ptr; else @@ -773,40 +773,40 @@ void* operator new[](size_t size, const char* file, int line) #endif } -void* operator new(size_t size) throw(std::bad_alloc) +void* operator new (size_t size) throw(std::bad_alloc) { - return operator new(size, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); + return operator new (size, (char*)M_DEBUG_NEW_CALLER_ADDRESS, 0); } -void* operator new[](size_t size) throw(std::bad_alloc) +void* operator new [](size_t size) throw(std::bad_alloc) { - return operator new[](size, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); + return operator new [](size, (char*)M_DEBUG_NEW_CALLER_ADDRESS, 0); } #if !defined(__BORLANDC__) || __BORLANDC__ > 0x551 -void* operator new(size_t size, const std::nothrow_t&) throw() +void* operator new (size_t size, const std::nothrow_t&) throw() { - return alloc_mem(size, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0, false); + return alloc_mem(size, (char*)M_DEBUG_NEW_CALLER_ADDRESS, 0, false); } -void* operator new[](size_t size, const std::nothrow_t&) throw() +void* operator new [](size_t size, const std::nothrow_t&) throw() { - return alloc_mem(size, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0, true); + return alloc_mem(size, (char*)M_DEBUG_NEW_CALLER_ADDRESS, 0, true); } #endif -void operator delete(void* pointer) throw() +void operator delete (void* pointer) throw() { - free_pointer(pointer, _DEBUG_NEW_CALLER_ADDRESS, false); + free_pointer(pointer, M_DEBUG_NEW_CALLER_ADDRESS, false); } void operator delete [](void* pointer) throw() { - free_pointer(pointer, _DEBUG_NEW_CALLER_ADDRESS, true); + free_pointer(pointer, M_DEBUG_NEW_CALLER_ADDRESS, true); } #if HAVE_PLACEMENT_DELETE -void operator delete(void* pointer, const char* file, int line) throw() +void operator delete (void* pointer, const char* file, int line) throw() { if (new_verbose_flag) { @@ -817,7 +817,7 @@ void operator delete(void* pointer, const char* file, int line) throw() print_position(file, line); fprintf(new_output_fp, ")\n"); } - operator delete(pointer); + operator delete (pointer); } void operator delete [](void* pointer, const char* file, int line) throw() @@ -834,14 +834,14 @@ void operator delete [](void* pointer, const char* file, int line) throw() operator delete [](pointer); } -void operator delete(void* pointer, const std::nothrow_t&) throw() +void operator delete (void* pointer, const std::nothrow_t&) throw() { - operator delete(pointer, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); + operator delete (pointer, (char*)M_DEBUG_NEW_CALLER_ADDRESS, 0); } void operator delete [](void* pointer, const std::nothrow_t&) throw() { - operator delete [](pointer, (char*)_DEBUG_NEW_CALLER_ADDRESS, 0); + operator delete [](pointer, (char*)M_DEBUG_NEW_CALLER_ADDRESS, 0); } #endif // HAVE_PLACEMENT_DELETE diff --git a/src/debug/debug_new.h b/src/debug/debug_new.h index 0e99b96a7..157f2648a 100644 --- a/src/debug/debug_new.h +++ b/src/debug/debug_new.h @@ -61,7 +61,7 @@ #endif /** - * @def _DEBUG_NEW_REDEFINE_NEW + * @def M_DEBUG_NEW_REDEFINE_NEW * * Macro to indicate whether redefinition of \c new is wanted. If one * wants to define one's own operator new, to call @@ -84,8 +84,8 @@ * # endif * @endcode */ -#ifndef _DEBUG_NEW_REDEFINE_NEW -#define _DEBUG_NEW_REDEFINE_NEW 1 +#ifndef M_DEBUG_NEW_REDEFINE_NEW +#define M_DEBUG_NEW_REDEFINE_NEW 1 #endif /* Prototypes */ @@ -114,16 +114,16 @@ extern const char* new_progname; // default to NULL; should be assigned argv[0] * @def DEBUG_NEW * * Macro to catch file/line information on allocation. If - * #_DEBUG_NEW_REDEFINE_NEW is \c 0, one can use this macro directly; + * #M_DEBUG_NEW_REDEFINE_NEW is \c 0, one can use this macro directly; * otherwise \c new will be defined to it, and one must use \c new * instead. */ #define DEBUG_NEW __debug_new_recorder(__FILE__, __LINE__) ->* new -# if _DEBUG_NEW_REDEFINE_NEW +# if M_DEBUG_NEW_REDEFINE_NEW # define new DEBUG_NEW # endif -# ifdef _DEBUG_NEW_EMULATE_MALLOC +# ifdef M_DEBUG_NEW_EMULATE_MALLOC # include # ifdef new # define malloc(s) ((void*)(new char[s])) diff --git a/src/defaults.cpp b/src/defaults.cpp index 1bce806ff..18b00dfb7 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -31,8 +31,6 @@ #include "debug.h" -using namespace Mana; - VariableData* createData(int defData) { return new IntData(defData); diff --git a/src/defaults.h b/src/defaults.h index 850e15d37..fc74f76c8 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -26,16 +26,16 @@ #include #include "variabledata.h" -typedef std::map DefaultsData; +typedef std::map DefaultsData; -Mana::VariableData* createData(int defData); -Mana::VariableData* createData(double defData); -Mana::VariableData* createData(float defData); -Mana::VariableData* createData(const std::string &defData); -Mana::VariableData* createData(const char* defData); -Mana::VariableData* createData(bool defData); -Mana::DefaultsData* getConfigDefaults(); -Mana::DefaultsData* getBrandingDefaults(); -Mana::DefaultsData* getPathsDefaults(); +VariableData* createData(int defData); +VariableData* createData(double defData); +VariableData* createData(float defData); +VariableData* createData(const std::string &defData); +VariableData* createData(const char* defData); +VariableData* createData(bool defData); +DefaultsData* getConfigDefaults(); +DefaultsData* getBrandingDefaults(); +DefaultsData* getPathsDefaults(); #endif diff --git a/src/event.cpp b/src/event.cpp index 4f77967bc..a536bcaea 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -26,9 +26,6 @@ #include "debug.h" -namespace Mana -{ - ListenMap Event::mBindings; Event::~Event() @@ -142,5 +139,3 @@ void Event::unbind(Listener *listener, Channels channel) { mBindings[channel].erase(listener); } - -} diff --git a/src/event.h b/src/event.h index 61bf31e14..7dffaad21 100644 --- a/src/event.h +++ b/src/event.h @@ -26,10 +26,6 @@ #include #include - -namespace Mana -{ - enum Channels { CHANNEL_ACTORSPRITE = 0, @@ -115,9 +111,9 @@ typedef std::set ListenerSet; typedef std::map ListenMap; #define SERVER_NOTICE(message) { \ -Mana::Event event(Mana::EVENT_SERVERNOTICE); \ +Event event(EVENT_SERVERNOTICE); \ event.setString("message", message); \ -Mana::Event::trigger(Mana::CHANNEL_NOTICES, event); } +Event::trigger(CHANNEL_NOTICES, event); } class Event { @@ -172,6 +168,4 @@ class Event VariableMap mData; }; -} // namespace Mana - #endif diff --git a/src/game.cpp b/src/game.cpp index cd54f9c98..6adf62f12 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -175,7 +175,7 @@ const unsigned adjustDelay = 10; */ static void initEngines() { - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_ENGINESINITALIZING)); + Event::trigger(CHANNEL_GAME, Event(EVENT_ENGINESINITALIZING)); actorSpriteManager = new ActorSpriteManager; commandHandler = new CommandHandler; @@ -187,7 +187,7 @@ static void initEngines() particleEngine = new Particle(nullptr); particleEngine->setupEngine(); - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_ENGINESINITALIZED)); + Event::trigger(CHANNEL_GAME, Event(EVENT_ENGINESINITALIZED)); } /** @@ -195,7 +195,7 @@ static void initEngines() */ static void createGuiWindows() { - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_GUIWINDOWSLOADING)); + Event::trigger(CHANNEL_GAME, Event(EVENT_GUIWINDOWSLOADING)); if (setupWindow) setupWindow->clearWindowsForReset(); @@ -292,7 +292,7 @@ static void createGuiWindows() if (player_node) player_node->updateStatus(); - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_GUIWINDOWSLOADED)); + Event::trigger(CHANNEL_GAME, Event(EVENT_GUIWINDOWSLOADED)); } #define del_0(X) { delete X; X = nullptr; } @@ -302,7 +302,7 @@ static void createGuiWindows() */ static void destroyGuiWindows() { - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_GUIWINDOWSUNLOADING)); + Event::trigger(CHANNEL_GAME, Event(EVENT_GUIWINDOWSUNLOADING)); logger->setChatWindow(nullptr); if (whoIsOnline) @@ -345,7 +345,7 @@ static void destroyGuiWindows() del_0(killStats); del_0(didYouKnowWindow); - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_GUIWINDOWSUNLOADED)); + Event::trigger(CHANNEL_GAME, Event(EVENT_GUIWINDOWSUNLOADED)); if (auctionManager && AuctionManager::getEnableAuctionBot()) auctionManager->reload(); @@ -416,7 +416,7 @@ Game::Game(): if (guildManager && GuildManager::getEnableGuildBot()) guildManager->requestGuildInfo(); - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_CONSTRUCTED)); + Event::trigger(CHANNEL_GAME, Event(EVENT_CONSTRUCTED)); } Game::~Game() @@ -450,7 +450,7 @@ Game::~Game() mInstance = nullptr; - Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_DESTRUCTED)); + Event::trigger(CHANNEL_GAME, Event(EVENT_DESTRUCTED)); } static bool saveScreenshot() @@ -1843,9 +1843,9 @@ void Game::changeMap(const std::string &mapPath) if (mumbleManager) mumbleManager->setMap(mapPath); - Mana::Event event(EVENT_MAPLOADED); + Event event(EVENT_MAPLOADED); event.setString("mapPath", mapPath); - Mana::Event::trigger(CHANNEL_GAME, event); + Event::trigger(CHANNEL_GAME, event); } void Game::updateHistory(SDL_Event &event) diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 452d2420e..4fa608f35 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -159,7 +159,7 @@ ChatWindow::ChatWindow(): mGMLoaded(false) { listen(CHANNEL_NOTICES); - listen(Mana::CHANNEL_ATTRIBUTES); + listen(CHANNEL_ATTRIBUTES); setWindowName("Chat"); @@ -866,19 +866,19 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event) addInputText(Temp, false); } -void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event) +void ChatWindow::processEvent(Channels channel, const Event &event) { - if (channel == Mana::CHANNEL_NOTICES) + if (channel == CHANNEL_NOTICES) { - if (event.getName() == Mana::EVENT_SERVERNOTICE && localChatTab) + if (event.getName() == EVENT_SERVERNOTICE && localChatTab) localChatTab->chatLog(event.getString("message"), BY_SERVER); } - else if (channel == Mana::CHANNEL_ATTRIBUTES) + else if (channel == CHANNEL_ATTRIBUTES) { if (!config.getBoolValue("showBattleEvents")) return; - if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) + if (event.getName() == EVENT_UPDATEATTRIBUTE) { switch (event.getInt("id")) { @@ -902,7 +902,7 @@ void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event) break; }; } - else if (event.getName() == Mana::EVENT_UPDATESTAT) + else if (event.getName() == EVENT_UPDATESTAT) { if (!config.getBoolValue("showJobExp")) return; diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 82e3d31f2..b3dce33fc 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -80,7 +80,7 @@ struct CHATLOG class ChatWindow : public Window, public gcn::ActionListener, public gcn::KeyListener, - public Mana::Listener + public Listener { public: /** @@ -190,7 +190,7 @@ class ChatWindow : public Window, */ void mousePressed(gcn::MouseEvent &event); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); /** * Scrolls the chat window diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 23f1e6fcf..8c59d10eb 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -113,7 +113,7 @@ InventoryWindow::InventoryWindow(Inventory *inventory): setWindowName("Inventory"); } - listen(Mana::CHANNEL_ATTRIBUTES); + listen(CHANNEL_ATTRIBUTES); if (setupWindow) setupWindow->registerWindowForReset(this); @@ -585,10 +585,10 @@ void InventoryWindow::close() } } -void InventoryWindow::processEvent(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void InventoryWindow::processEvent(Channels channel A_UNUSED, + const Event &event) { - if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) + if (event.getName() == EVENT_UPDATEATTRIBUTE) { int id = event.getInt("id"); if (id == TOTAL_WEIGHT || id == MAX_WEIGHT) diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 9d4be5afc..08456ba29 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -54,7 +54,7 @@ class InventoryWindow : public Window, public gcn::KeyListener, public gcn::SelectionListener, public InventoryListener, - public Mana::Listener + public Listener { public: /** @@ -126,7 +126,7 @@ class InventoryWindow : public Window, void updateDropButton(); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); void updateButtons(Item *item = nullptr); diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index 972c660ec..357a016f2 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -60,7 +60,7 @@ KillStats::KillStats(): setStickyButtonLock(true); setDefaultSize(250, 250, 350, 300); - listen(Mana::CHANNEL_ATTRIBUTES); + listen(CHANNEL_ATTRIBUTES); int xp(PlayerInfo::getAttribute(EXP)); int xpNextLevel(PlayerInfo::getAttribute(EXP_NEEDED)); @@ -438,10 +438,10 @@ void KillStats::validateJacko() } } -void KillStats::processEvent(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void KillStats::processEvent(Channels channel A_UNUSED, + const Event &event) { - if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) + if (event.getName() == EVENT_UPDATEATTRIBUTE) { int id = event.getInt("id"); if (id == EXP || id == EXP_NEEDED) diff --git a/src/gui/killstats.h b/src/gui/killstats.h index 8562e67a4..9773190de 100644 --- a/src/gui/killstats.h +++ b/src/gui/killstats.h @@ -33,7 +33,7 @@ class Label; class Button; -class KillStats : public Window, gcn::ActionListener, public Mana::Listener +class KillStats : public Window, gcn::ActionListener, public Listener { public: /** @@ -78,8 +78,8 @@ class KillStats : public Window, gcn::ActionListener, public Mana::Listener void addLog(std::string str); - void processEvent(Mana::Channels channel A_UNUSED, - const Mana::Event &event); + void processEvent(Channels channel A_UNUSED, + const Event &event); private: void validateJacko(); diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index 00df97813..aaccd36c8 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -54,7 +54,7 @@ extern volatile int tick_time; MiniStatusWindow::MiniStatusWindow(): Popup("MiniStatus", "ministatus.xml") { - listen(Mana::CHANNEL_ATTRIBUTES); + listen(CHANNEL_ATTRIBUTES); mHpBar = createBar(0, 100, 20, Theme::PROG_HP, "hp bar", _("health bar")); StatusWindow::updateHPBar(mHpBar); @@ -218,10 +218,10 @@ void MiniStatusWindow::drawIcons(Graphics *graphics) } } -void MiniStatusWindow::processEvent(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void MiniStatusWindow::processEvent(Channels channel A_UNUSED, + const Event &event) { - if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) + if (event.getName() == EVENT_UPDATEATTRIBUTE) { int id = event.getInt("id"); if (id == HP || id == MAX_HP) @@ -235,7 +235,7 @@ void MiniStatusWindow::processEvent(Mana::Channels channel A_UNUSED, else if (id == MONEY) StatusWindow::updateMoneyBar(mMoneyBar); } - else if (event.getName() == Mana::EVENT_UPDATESTAT) + else if (event.getName() == EVENT_UPDATESTAT) { StatusWindow::updateMPBar(mMpBar); StatusWindow::updateJobBar(mJobBar); diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index ca18e1b92..ba2cf7b2d 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -44,7 +44,7 @@ class TextPopup; */ class MiniStatusWindow : public Popup, public InventoryListener, - public Mana::Listener + public Listener { public: MiniStatusWindow(); @@ -60,7 +60,7 @@ class MiniStatusWindow : public Popup, void drawIcons(Graphics *graphics); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); void updateStatus(); diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 3fbec4f35..25403e544 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -126,7 +126,7 @@ StatusWindow::StatusWindow(): Window(player_node ? player_node->getName() : "?", false, nullptr, "status.xml") { - listen(Mana::CHANNEL_ATTRIBUTES); + listen(CHANNEL_ATTRIBUTES); setWindowName("Status"); setupWindow->registerWindowForReset(this); @@ -277,14 +277,14 @@ StatusWindow::StatusWindow(): mLvlLabel->adjustSize(); } -void StatusWindow::processEvent(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void StatusWindow::processEvent(Channels channel A_UNUSED, + const Event &event) { static bool blocked = false; if (blocked) return; - if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) + if (event.getName() == EVENT_UPDATEATTRIBUTE) { switch (event.getInt("id")) { @@ -343,7 +343,7 @@ void StatusWindow::processEvent(Mana::Channels channel A_UNUSED, break; } } - else if (event.getName() == Mana::EVENT_UPDATESTAT) + else if (event.getName() == EVENT_UPDATESTAT) { int id = event.getInt("id"); if (id == Net::getPlayerHandler()->getJobLocation()) diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 8e110a354..7f6bd2d18 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -44,7 +44,7 @@ class VertContainer; */ class StatusWindow : public Window, public gcn::ActionListener, - public Mana::Listener + public Listener { public: /** @@ -52,7 +52,7 @@ class StatusWindow : public Window, */ StatusWindow(); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); void setPointsNeeded(int id, int needed); diff --git a/src/listener.cpp b/src/listener.cpp index ea125013f..fd04c9f00 100644 --- a/src/listener.cpp +++ b/src/listener.cpp @@ -25,9 +25,6 @@ #include "debug.h" -namespace Mana -{ - Listener::~Listener() { Event::remove(this); @@ -42,5 +39,3 @@ void Listener::ignore(Channels channel) { Event::unbind(this, channel); } - -} // namespace Mana diff --git a/src/listener.h b/src/listener.h index dc968672a..bb6e3d4b4 100644 --- a/src/listener.h +++ b/src/listener.h @@ -26,9 +26,6 @@ #include -namespace Mana -{ - class Listener { public: @@ -41,6 +38,4 @@ class Listener virtual void processEvent(Channels channel, const Event &event) = 0; }; -} // namespace Mana - #endif diff --git a/src/localplayer.cpp b/src/localplayer.cpp index bb0c087d5..3225bac8d 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -139,7 +139,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): mAttackRange = 0; - listen(Mana::CHANNEL_ATTRIBUTES); + listen(CHANNEL_ATTRIBUTES); mLevel = 1; mAdvanced = true; @@ -1664,12 +1664,12 @@ void LocalPlayer::optionChanged(const std::string &value) mTargetOnlyReachable = config.getBoolValue("targetOnlyReachable"); } -void LocalPlayer::processEvent(Mana::Channels channel, - const Mana::Event &event) +void LocalPlayer::processEvent(Channels channel, + const Event &event) { - if (channel == Mana::CHANNEL_ATTRIBUTES) + if (channel == CHANNEL_ATTRIBUTES) { - if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) + if (event.getName() == EVENT_UPDATEATTRIBUTE) { switch (event.getInt("id")) { @@ -1692,7 +1692,7 @@ void LocalPlayer::processEvent(Mana::Channels channel, break; }; } - else if (event.getName() == Mana::EVENT_UPDATESTAT) + else if (event.getName() == EVENT_UPDATESTAT) { if (!mShowJobExp) return; diff --git a/src/localplayer.h b/src/localplayer.h index a7ce3dd7f..bf65096b5 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -69,7 +69,7 @@ enum * The local player character. */ class LocalPlayer : public Being, public ActorSpriteListener, - public Mana::Listener + public Listener { public: /** @@ -387,7 +387,7 @@ class LocalPlayer : public Being, public ActorSpriteListener, */ void optionChanged(const std::string &value); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); /** * set a following player. diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index b7566e271..6d021d6a9 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -43,20 +43,20 @@ GameHandler::GameHandler() { mCharID = 0; - listen(Mana::CHANNEL_GAME); + listen(CHANNEL_GAME); } -void GameHandler::processEvent(Mana::Channels channel, - const Mana::Event &event) +void GameHandler::processEvent(Channels channel, + const Event &event) { - if (channel == Mana::CHANNEL_GAME) + if (channel == CHANNEL_GAME) { - if (event.getName() == Mana::EVENT_ENGINESINITALIZED) + if (event.getName() == EVENT_ENGINESINITALIZED) { if (mMap != "") Game::instance()->changeMap(mMap); } - else if (event.getName() == Mana::EVENT_MAPLOADED) + else if (event.getName() == EVENT_MAPLOADED) { mapLoadedEvent(); } diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 248175617..59cb148c4 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -32,13 +32,13 @@ namespace Ea { -class GameHandler : public Net::GameHandler, public Mana::Listener +class GameHandler : public Net::GameHandler, public Listener { public: GameHandler(); - virtual void processEvent(Mana::Channels channel, - const Mana::Event &event); + virtual void processEvent(Channels channel, + const Event &event); virtual void who(); diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index 584faa368..d95c98d23 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -93,8 +93,8 @@ GeneralHandler::GeneralHandler(): generalHandler = this; - listen(Mana::CHANNEL_CLIENT); - listen(Mana::CHANNEL_GAME); + listen(CHANNEL_CLIENT); + listen(CHANNEL_GAME); } void GeneralHandler::load() @@ -176,10 +176,10 @@ void GeneralHandler::clearHandlers() clearNetworkHandlers(); } -void GeneralHandler::processEvent(Mana::Channels channel, - const Mana::Event &event) +void GeneralHandler::processEvent(Channels channel, + const Event &event) { - if (channel == Mana::CHANNEL_CLIENT) + if (channel == CHANNEL_CLIENT) { int newState = event.getInt("newState"); @@ -195,9 +195,9 @@ void GeneralHandler::processEvent(Mana::Channels channel, Attributes::informItemDB(); } } - else if (channel == Mana::CHANNEL_GAME) + else if (channel == CHANNEL_GAME) { - if (event.getName() == Mana::EVENT_GUIWINDOWSLOADED) + if (event.getName() == EVENT_GUIWINDOWSLOADED) { inventoryWindow->setSplitAllowed(true); skillDialog->loadSkills("mana-skills.xml"); diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h index fcb28c846..6ea5c7845 100644 --- a/src/net/manaserv/generalhandler.h +++ b/src/net/manaserv/generalhandler.h @@ -33,7 +33,7 @@ namespace ManaServ { -class GeneralHandler : public Net::GeneralHandler, public Mana::Listener +class GeneralHandler : public Net::GeneralHandler, public Listener { public: GeneralHandler(); @@ -50,7 +50,7 @@ class GeneralHandler : public Net::GeneralHandler, public Mana::Listener void clearHandlers(); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); protected: MessageHandlerPtr mBeingHandler; diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index a666fa5f4..77c91e1dd 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -244,12 +244,12 @@ void GeneralHandler::clearHandlers() mNetwork->clearHandlers(); } -void GeneralHandler::processEvent(Mana::Channels channel, - const Mana::Event &event) +void GeneralHandler::processEvent(Channels channel, + const Event &event) { - if (channel == Mana::CHANNEL_GAME) + if (channel == CHANNEL_GAME) { - if (event.getName() == Mana::EVENT_GUIWINDOWSLOADED) + if (event.getName() == EVENT_GUIWINDOWSLOADED) { if (inventoryWindow) inventoryWindow->setSplitAllowed(false); @@ -288,7 +288,7 @@ void GeneralHandler::processEvent(Mana::Channels channel, statusWindow->addAttribute(ATTACK_SPEED, _("Damage per sec."), false, ""); } - else if (event.getName() == Mana::EVENT_GUIWINDOWSUNLOADING) + else if (event.getName() == EVENT_GUIWINDOWSUNLOADING) { if (socialWindow) { diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index b250ddfd4..73f7a0e1b 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -34,7 +34,7 @@ namespace TmwAthena { class GeneralHandler : public MessageHandler, public Net::GeneralHandler, - public Mana::Listener + public Listener { public: GeneralHandler(); @@ -53,7 +53,7 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler, void clearHandlers(); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); void reloadPartially(); diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp index 0b9d16de2..6dd7bdc06 100644 --- a/src/playerinfo.cpp +++ b/src/playerinfo.cpp @@ -59,11 +59,11 @@ int mLevelProgress = 0; void triggerAttr(int id, int old) { - Mana::Event event(Mana::EVENT_UPDATEATTRIBUTE); + Event event(EVENT_UPDATEATTRIBUTE); event.setInt("id", id); event.setInt("oldValue", old); event.setInt("newValue", mData.mAttributes.find(id)->second); - Mana::Event::trigger(Mana::CHANNEL_ATTRIBUTES, event); + Event::trigger(CHANNEL_ATTRIBUTES, event); } void triggerStat(int id, const std::string &changed, int old1, int old2) @@ -72,7 +72,7 @@ void triggerStat(int id, const std::string &changed, int old1, int old2) if (it == mData.mStats.end()) return; - Mana::Event event(Mana::EVENT_UPDATESTAT); + Event event(EVENT_UPDATESTAT); event.setInt("id", id); event.setInt("base", it->second.base); event.setInt("mod", it->second.mod); @@ -81,7 +81,7 @@ void triggerStat(int id, const std::string &changed, int old1, int old2) event.setString("changed", changed); event.setInt("oldValue1", old1); event.setInt("oldValue2", old2); - Mana::Event::trigger(Mana::CHANNEL_ATTRIBUTES, event); + Event::trigger(CHANNEL_ATTRIBUTES, event); } // --- Attributes ------------------------------------------------------------- @@ -280,9 +280,9 @@ void setTrading(bool trading) if (notify) { - Mana::Event event(Mana::EVENT_TRADING); + Event event(EVENT_TRADING); event.setInt("trading", trading); - Mana::Event::trigger(Mana::CHANNEL_STATUS, event); + Event::trigger(CHANNEL_STATUS, event); } } @@ -303,20 +303,20 @@ void updateAttrs() } } -class PlayerInfoListener : Mana::Listener +class PlayerInfoListener : Listener { public: PlayerInfoListener() { - listen(Mana::CHANNEL_CLIENT); - listen(Mana::CHANNEL_GAME); + listen(CHANNEL_CLIENT); + listen(CHANNEL_GAME); } - void processEvent(Mana::Channels channel, const Mana::Event &event) + void processEvent(Channels channel, const Event &event) { - if (channel == Mana::CHANNEL_CLIENT) + if (channel == CHANNEL_CLIENT) { - if (event.getName() == Mana::EVENT_STATECHANGE) + if (event.getName() == EVENT_STATECHANGE) { int newState = event.getInt("newState"); @@ -330,9 +330,9 @@ public: } } } - else if (channel == Mana::CHANNEL_GAME) + else if (channel == CHANNEL_GAME) { - if (event.getName() == Mana::EVENT_DESTRUCTED) + if (event.getName() == EVENT_DESTRUCTED) { delete mInventory; mInventory = nullptr; diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index aba020261..d6c01af6d 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -93,7 +93,8 @@ void EmoteDB::load() spriteNode->xmlChildrenNode->content); currentSprite->sprite = AnimatedSprite::load(file, XML::getProperty(spriteNode, "variant", 0)); - currentSprite->name = XML::langProperty(spriteNode, "name", ""); + currentSprite->name = XML::langProperty( + spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } else if (xmlNameEqual(spriteNode, "particlefx")) @@ -147,7 +148,8 @@ void EmoteDB::load() spriteNode->xmlChildrenNode->content); currentSprite->sprite = AnimatedSprite::load(file, XML::getProperty(spriteNode, "variant", 0)); - currentSprite->name = XML::langProperty(spriteNode, "name", ""); + currentSprite->name = XML::langProperty( + spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } else if (xmlNameEqual(spriteNode, "particlefx")) diff --git a/src/variabledata.h b/src/variabledata.h index e5516bd9f..c306d43ed 100644 --- a/src/variabledata.h +++ b/src/variabledata.h @@ -24,9 +24,6 @@ #include -namespace Mana -{ - class VariableData { public: @@ -109,6 +106,4 @@ class BoolData : public VariableData bool mData; }; -} // namespace Mana - #endif -- cgit v1.2.3-70-g09d2 From 2f34575b834e2c70583af83a17da59750978f15e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Feb 2012 04:15:13 +0300 Subject: Increased drop counter max value from 9 to 30. --- src/localplayer.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 3225bac8d..6dd55dace 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2044,7 +2044,7 @@ std::string LocalPlayer::getAttackTypeString() mAttackType, attackTypeSize)); } -const unsigned quickDropCounterSize = 10; +const unsigned quickDropCounterSize = 31; void LocalPlayer::changeQuickDropCounter() { @@ -2054,8 +2054,17 @@ void LocalPlayer::changeQuickDropCounter() std::string LocalPlayer::getQuickDropCounterString() { - return strprintf("(%d) drop counter %d", - mQuickDropCounter, mQuickDropCounter); + std::string str; + if (mQuickDropCounter > 9) + { + return strprintf("(%c) drop counter %d", + 'a' + mQuickDropCounter - 10, mQuickDropCounter); + } + else + { + return strprintf("(%d) drop counter %d", + mQuickDropCounter, mQuickDropCounter); + } } const unsigned pickUpTypeSize = 7; -- cgit v1.2.3-70-g09d2 From 30b2f0350767d4d0e78d27b9a1fd33e2095171b9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Feb 2012 04:54:13 +0300 Subject: Add chat command /setdrop N to set change drop counter. --- src/commandhandler.cpp | 9 +++++++++ src/commandhandler.h | 2 ++ src/gui/chatwindow.cpp | 1 + src/localplayer.cpp | 10 ++++++++++ src/localplayer.h | 2 ++ 5 files changed, 24 insertions(+) diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 4022d8d58..9f832c021 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -201,6 +201,8 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab) handleServerIgnoreAll(args, tab); else if (type == "serverunignoreall") handleServerUnIgnoreAll(args, tab); + else if (type == "setdrop") + handleSetDrop(args, tab); else if (type == "dumpg") handleDumpGraphics(args, tab); else if (type == "dumpt") @@ -1187,6 +1189,13 @@ void CommandHandler::outStringNormal(ChatTab *tab, const std::string &str, } } +void CommandHandler::handleSetDrop(const std::string &args, + ChatTab *tab A_UNUSED) +{ + if (player_node) + player_node->setQuickDropCounter(atoi(args.c_str())); +} + #ifdef DEBUG_DUMP_LEAKS void showRes(std::string str, ResourceManager::Resources *res); diff --git a/src/commandhandler.h b/src/commandhandler.h index 16e5e94ce..cd25c234a 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -295,6 +295,8 @@ class CommandHandler void handleServerUnIgnoreAll(const std::string &args, ChatTab *tab); + void handleSetDrop(const std::string &args, ChatTab *tab); + void handleDump(const std::string &args, ChatTab *tab); void handleDumpGraphics(const std::string &args, ChatTab *tab); diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 4fa608f35..69e4d703f 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -311,6 +311,7 @@ void ChatWindow::fillCommands() mCommands.push_back(""); mCommands.push_back(""); mCommands.push_back(""); + mCommands.push_back("/setdrop "); } void ChatWindow::loadGMCommands() diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 6dd55dace..01e8c1ae8 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2067,6 +2067,16 @@ std::string LocalPlayer::getQuickDropCounterString() } } +void LocalPlayer::setQuickDropCounter(int n) +{ + if (n < 1 || n >= (signed)quickDropCounterSize) + return; + mQuickDropCounter = n; + config.setValue("quickDropCounter", mQuickDropCounter); + if (miniStatusWindow) + miniStatusWindow->updateStatus(); +} + const unsigned pickUpTypeSize = 7; void LocalPlayer::changePickUpType() diff --git a/src/localplayer.h b/src/localplayer.h index bf65096b5..03b3a2538 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -256,6 +256,8 @@ class LocalPlayer : public Being, public ActorSpriteListener, int getQuickDropCounter() const { return mQuickDropCounter; } + void setQuickDropCounter(int n); + void changeQuickDropCounter(); int getMoveState() const -- cgit v1.2.3-70-g09d2 From d061339a3cccf6c3e0d6b70d5cafb0da30ea16c2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Feb 2012 04:57:33 +0300 Subject: Add /setdrop command to help files. --- data/help/chatcommands.txt | 1 + data/help/es/chatcommands.txt | 1 + data/help/ru/chatcommands.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/data/help/chatcommands.txt b/data/help/chatcommands.txt index c62a9c2ed..8b55df827 100644 --- a/data/help/chatcommands.txt +++ b/data/help/chatcommands.txt @@ -35,6 +35,7 @@ /addpriorityattack NAME - add monster to priority attack list. /removeattack NAME - remove monster from attack list. /addignoreattack NAME - add monster to ignore attack list. + /setdrop N - set drop counter to requested value. ##PTrade ##2 diff --git a/data/help/es/chatcommands.txt b/data/help/es/chatcommands.txt index edf83709a..7f4fdeb1b 100644 --- a/data/help/es/chatcommands.txt +++ b/data/help/es/chatcommands.txt @@ -35,6 +35,7 @@ /addpriorityattack NOMBRE - Agregar al monstruo especificado en NOMBRE a la lista de ataque prioritario. /removeattack NOMBRE - Remover al monstruo especificado de la lista de ataque. /addignoreattack NOMBRE - Agregar al monstruo especificado a la lista de criaturas ignorados. + /setdrop N - ##PIntercambio ##2 diff --git a/data/help/ru/chatcommands.txt b/data/help/ru/chatcommands.txt index 5a89b23f3..121940a6b 100644 --- a/data/help/ru/chatcommands.txt +++ b/data/help/ru/chatcommands.txt @@ -35,6 +35,7 @@ /addpriorityattack NAME - добавить монстра в список приоритетной атаки. /removeattack NAME - удалить монстра из всех списков атаки. /addignoreattack NAME - добавить монстра в с список игнорирования атаки. + /setdrop N - устанавливает количество бросаемых объектов в указанное значение. ##PТорговля ##2 -- cgit v1.2.3-70-g09d2 From 59302a2460ad879ea662fec0b808dfe5e6dd36c0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 9 Feb 2012 00:38:26 +0300 Subject: Add Hidden layer property. If it set to 1 then client will ignore this layer. Add Version layer property. It show minimal client version supported by this layer. --- src/resources/mapreader.cpp | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index eec14685d..35a472125 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -22,6 +22,7 @@ #include "resources/mapreader.h" +#include "client.h" #include "configuration.h" #include "logger.h" #include "map.h" @@ -460,12 +461,6 @@ void MapReader::readLayer(XmlNodePtr node, Map *map) MapLayer *layer = nullptr; - if (!isCollisionLayer) - { - layer = new MapLayer(offsetX, offsetY, w, h, isFringeLayer); - map->addLayer(layer); - } - logger->log("- Loading layer \"%s\"", name.c_str()); int x = 0; int y = 0; @@ -473,9 +468,31 @@ void MapReader::readLayer(XmlNodePtr node, Map *map) // Load the tile data for_each_xml_child_node(childNode, node) { + if (serverVersion > 0 && xmlNameEqual(childNode, "properties")) + { + for_each_xml_child_node(prop, childNode) + { + if (!xmlNameEqual(prop, "property")) + continue; + const std::string pname = XML::getProperty(prop, "name", ""); + const std::string value = XML::getProperty(prop, "value", ""); + // ignoring any layer if property Hidden is 1 + if (pname == "Hidden" && value == "1") + return; + if (pname == "Version" && value > CHECK_VERSION) + return; + } + } + if (!xmlNameEqual(childNode, "data")) continue; + if (!isCollisionLayer) + { + layer = new MapLayer(offsetX, offsetY, w, h, isFringeLayer); + map->addLayer(layer); + } + const std::string encoding = XML::getProperty(childNode, "encoding", ""); const std::string compression = -- cgit v1.2.3-70-g09d2 From ff96948d57cacd580c23d892e099304476df8a2e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 9 Feb 2012 01:57:44 +0300 Subject: Add NotVersion map layer property. Client load this layer if client version less than property value. --- src/resources/mapreader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 35a472125..19f9ab3f2 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -481,6 +481,8 @@ void MapReader::readLayer(XmlNodePtr node, Map *map) return; if (pname == "Version" && value > CHECK_VERSION) return; + if (pname == "NotVersion" && value <= CHECK_VERSION) + return; } } -- cgit v1.2.3-70-g09d2 From 7e19d626711ecf70035b32ee99098fc7fc3419fe Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 10 Feb 2012 04:03:03 +0300 Subject: Show gms in online list with green color (evol server). --- src/being.h | 1 + src/gui/whoisonline.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/being.h b/src/being.h index 8b3db1919..a52963746 100644 --- a/src/being.h +++ b/src/being.h @@ -102,6 +102,7 @@ class Being : public ActorSprite, public ConfigListener FLAG_SHOP = 1, FLAG_AWAY = 2, FLAG_INACTIVE = 4, + FLAG_GM = 64, FLAG_GENDER = 128, FLAG_SPECIAL = 128 + 64 }; diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 104e4d7f1..7c620bdf1 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -720,8 +720,7 @@ void WhoIsOnline::optionChanged(const std::string &name) void OnlinePlayer::setText(std::string color) { - mText = strprintf("@@%s|##%s%s ", mNick.c_str(), - color.c_str(), mNick.c_str()); + mText = ""; if (mStatus != 255 && actorSpriteManager) { @@ -753,10 +752,13 @@ void OnlinePlayer::setText(std::string color) // TRANSLATORS: this inactive status writed in player nick mText += _("I"); } + if (mStatus & Being::FLAG_GM && color == "0") + color = "2"; } if (mVersion > 0) mText += strprintf(" - %d", mVersion); - mText += strprintf("@@"); + mText = strprintf("@@%s|##%s%s %s@@", mNick.c_str(), + color.c_str(), mNick.c_str(), mText.c_str()); } -- cgit v1.2.3-70-g09d2 From c14086d6a08fb2ea644eec9fafa0374604c98991 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Feb 2012 14:58:14 +0300 Subject: Add relative pixel based position to item drops (floor items). --- src/actorspritemanager.cpp | 5 +++-- src/actorspritemanager.h | 3 ++- src/flooritem.cpp | 21 ++++----------------- src/flooritem.h | 12 +++++------- src/net/ea/itemhandler.cpp | 37 ++++++++++++++++++++++++------------- src/net/ea/itemhandler.h | 4 +++- src/net/tmwa/itemhandler.cpp | 7 +++++-- 7 files changed, 46 insertions(+), 43 deletions(-) diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index fa6d49d38..89a592005 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -240,10 +240,11 @@ Being *ActorSpriteManager::createBeing(int id, ActorSprite::Type type, } FloorItem *ActorSpriteManager::createItem(int id, int itemId, int x, int y, - int amount, unsigned char color) + int amount, unsigned char color, + int subX, int subY) { FloorItem *floorItem = new FloorItem(id, itemId, x, y, - mMap, amount, color); + mMap, amount, color, subX, subY); mActors.insert(floorItem); return floorItem; diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index a78e3ad49..d30bad426 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -63,7 +63,8 @@ class ActorSpriteManager: public ConfigListener * Create a FloorItem and add it to the list of ActorSprites. */ FloorItem *createItem(int id, int itemId, int x, int y, - int amount, unsigned char color); + int amount, unsigned char color, + int subX, int subY); /** * Destroys the given ActorSprite at the end of diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 6e4926f2e..111019546 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -38,13 +38,8 @@ #include "debug.h" -FloorItem::FloorItem(int id, - int itemId, - int x, - int y, - Map *map, - int amount, - unsigned char color): +FloorItem::FloorItem(int id, int itemId, int x, int y, Map *map, int amount, + unsigned char color, int subX, int subY): ActorSprite(id), mItemId(itemId), mX(x), @@ -60,16 +55,8 @@ FloorItem::FloorItem(int id, setMap(map); if (map) { - // TODO: Eventually, we probably should fix all sprite offsets so that - // these translations aren't necessary anymore. The sprites know - // best where their base point should be. - mPos.x = static_cast(x * map->getTileWidth() + 16); -#ifdef MANASERV_SUPPORT - mPos.y = static_cast(y * map->getTileHeight() + - ((Net::getNetworkType() == ServerInfo::MANASERV) ? 15 : 32)); -#else - mPos.y = static_cast(y * map->getTileHeight() + 32); -#endif + mPos.x = static_cast(x * map->getTileWidth() + subX); + mPos.y = static_cast(y * map->getTileHeight() + subY); } else { diff --git a/src/flooritem.h b/src/flooritem.h index 95427c252..1f3126078 100644 --- a/src/flooritem.h +++ b/src/flooritem.h @@ -42,14 +42,12 @@ class FloorItem : public ActorSprite * @param y the y position in tiles * @param map the map this item is on * @param amount the item amount + * @param color the item color + * @param subX the x pixel relative position + * @param subY the y pixel relative position */ - FloorItem(int id, - int itemId, - int x, - int y, - Map *map, - int amount, - unsigned char color); + FloorItem(int id, int itemId, int x, int y, Map *map, int amount, + unsigned char color, int subX, int subY); Type getType() const { return FLOOR_ITEM; } diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index e08fe2cd1..7a6ee2743 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -35,28 +35,39 @@ ItemHandler::ItemHandler() { } -void ItemHandler::processItemVisible(Net::MessageIn &msg, bool isDrop) +void ItemHandler::processItemVisible(Net::MessageIn &msg) { int id = msg.readInt32(); int itemId = msg.readInt16(); unsigned char identify = msg.readInt8(); // identify flag int x = msg.readInt16(); int y = msg.readInt16(); - int amount1 = msg.readInt16(); - int amount2 = msg.readInt16(); + int amount = msg.readInt16(); + int subX = msg.readInt8() + 16 - 8; + int subY = msg.readInt8() + 32 - 8; if (actorSpriteManager) { - if (!isDrop) - { - actorSpriteManager->createItem(id, itemId, - x, y, amount1, identify); - } - else - { - actorSpriteManager->createItem(id, itemId, - x, y, amount2, identify); - } + actorSpriteManager->createItem(id, itemId, + x, y, amount, identify, subX, subY); + } +} + +void ItemHandler::processItemDropped(Net::MessageIn &msg) +{ + int id = msg.readInt32(); + int itemId = msg.readInt16(); + unsigned char identify = msg.readInt8(); // identify flag + int x = msg.readInt16(); + int y = msg.readInt16(); + int subX = msg.readInt8() + 16 - 8; + int subY = msg.readInt8() + 32 - 8; + int amount = msg.readInt16(); + + if (actorSpriteManager) + { + actorSpriteManager->createItem(id, itemId, + x, y, amount, identify, subX, subY); } } diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index 1d0747c61..d5c268d2e 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -34,9 +34,11 @@ class ItemHandler public: ItemHandler(); - void processItemVisible(Net::MessageIn &msg, bool isDrop); + void processItemVisible(Net::MessageIn &msg); void processItemRemove(Net::MessageIn &msg); + + void processItemDropped(Net::MessageIn &msg); }; } // namespace Ea diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp index ce03044c7..d84d2f38d 100644 --- a/src/net/tmwa/itemhandler.cpp +++ b/src/net/tmwa/itemhandler.cpp @@ -48,9 +48,12 @@ void ItemHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_ITEM_VISIBLE: + processItemVisible(msg); + break; + case SMSG_ITEM_DROPPED: - processItemVisible(msg, msg.getId() == SMSG_ITEM_DROPPED); - break; + processItemDropped(msg); + break; case SMSG_ITEM_REMOVE: processItemRemove(msg); -- cgit v1.2.3-70-g09d2 From 1e255ec19ececda196874f751a81682169cf64c3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Feb 2012 18:32:53 +0300 Subject: Add support for gtest framework. --- build/bmaketests | 79 +++++++++++++++++++++++++++++ build/buildtest | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ build/maketest.sh | 149 ------------------------------------------------------ configure.ac | 13 +++++ src/Makefile.am | 4 ++ src/main.cpp | 17 +++++++ 6 files changed, 262 insertions(+), 149 deletions(-) create mode 100755 build/bmaketests create mode 100755 build/buildtest delete mode 100755 build/maketest.sh diff --git a/build/bmaketests b/build/bmaketests new file mode 100755 index 000000000..e1d980a98 --- /dev/null +++ b/build/bmaketests @@ -0,0 +1,79 @@ +#!/bin/sh + +cd .. + +dir=`pwd` + +export CC=gcc-4.5 +export CXX=g++-4.5 + +export LANG=C +export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ +-Wabi -Wdisabled-optimization -Wuninitialized \ +-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ +-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ +-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ +-Wctor-dtor-privacy -Wstrict-null-sentinel \ +-Wunused-parameter -Wlogical-op \ +-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ +-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ +-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked -Wshadow -Wunused -Wsynth \ +-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ +-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ +-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2" + +autoreconf -i 2>../build/make.log + +result=$? +if [ "$result" != 0 ]; then + echo autoreconf error + exit 1 +fi + +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=yes \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-unittests=yes + +result=$? +if [ "$result" != 0 ]; then + echo configure error + exit 1 +fi + +cd po +#make -j5 update-po 2>../make1.log +make -j5 update-gmo 2>../build/make1.log + +result=$? +if [ "$result" != 0 ]; then + echo update-gmo error + exit 1 +fi + +cd .. +make -j5 2>build/make2.log + +result=$? +if [ "$result" != 0 ]; then + echo make error + exit 1 +fi + +make install + +result=$? +if [ "$result" != 0 ]; then + echo make install error + exit 1 +fi + +cd run +export GLIBCXX_FORCE_NEW=1 +./bin/manaplus diff --git a/build/buildtest b/build/buildtest new file mode 100755 index 000000000..61b20f0fe --- /dev/null +++ b/build/buildtest @@ -0,0 +1,149 @@ +#!/bin/sh + +dir=`pwd` +export LANG=C + +cd .. +#--enable-applebuild=yes +#--without-librt + +echo start >build/make.log + +autoreconf -i +echo opengl+debug+guichan >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=yes \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+guichan >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no +make -j5 2>>build/make.log + +autoreconf -i +echo opengl >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=no \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=no \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+guichan+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes +make -j5 2>>build/make.log + +autoreconf -i +echo guichan >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--without-opengl +make -j5 2>>build/make.log + +autoreconf -i +echo "-" >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=no \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--without-opengl +make -j5 2>>build/make.log + +autoreconf -i +echo guichan+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes \ +--without-opengl +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+debug+guichan+portable >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=yes \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-portable=yes +make -j5 2>>build/make.log + +autoreconf -i +echo opengl+guichan+portable+manaserv >>build/make.log +make clean 2>>build/make.log +./configure --prefix=$dir/run \ +--datadir=$dir/run/share/games \ +--bindir=$dir/run/bin \ +--mandir=$dir/run/share/man \ +--enable-memdebug=no \ +--with-internalguichan=yes \ +--enable-tcmalloc=no \ +--enable-googleprofiler=no \ +--enable-manaserv=yes \ +--enable-portable=yes +make -j5 2>>build/make.log diff --git a/build/maketest.sh b/build/maketest.sh deleted file mode 100755 index 61b20f0fe..000000000 --- a/build/maketest.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/sh - -dir=`pwd` -export LANG=C - -cd .. -#--enable-applebuild=yes -#--without-librt - -echo start >build/make.log - -autoreconf -i -echo opengl+debug+guichan >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=yes \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no -make -j5 2>>build/make.log - -autoreconf -i -echo opengl+guichan >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no -make -j5 2>>build/make.log - -autoreconf -i -echo opengl >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=no \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no -make -j5 2>>build/make.log - -autoreconf -i -echo opengl+manaserv >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=no \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes -make -j5 2>>build/make.log - -autoreconf -i -echo opengl+guichan+manaserv >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes -make -j5 2>>build/make.log - -autoreconf -i -echo guichan >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---without-opengl -make -j5 2>>build/make.log - -autoreconf -i -echo "-" >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=no \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---without-opengl -make -j5 2>>build/make.log - -autoreconf -i -echo guichan+manaserv >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes \ ---without-opengl -make -j5 2>>build/make.log - -autoreconf -i -echo opengl+debug+guichan+portable >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=yes \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-portable=yes -make -j5 2>>build/make.log - -autoreconf -i -echo opengl+guichan+portable+manaserv >>build/make.log -make clean 2>>build/make.log -./configure --prefix=$dir/run \ ---datadir=$dir/run/share/games \ ---bindir=$dir/run/bin \ ---mandir=$dir/run/share/man \ ---enable-memdebug=no \ ---with-internalguichan=yes \ ---enable-tcmalloc=no \ ---enable-googleprofiler=no \ ---enable-manaserv=yes \ ---enable-portable=yes -make -j5 2>>build/make.log diff --git a/configure.ac b/configure.ac index ef92317d6..996ad3f3c 100755 --- a/configure.ac +++ b/configure.ac @@ -209,6 +209,19 @@ esac],[memdebug_enabled=false]) AM_CONDITIONAL(ENABLE_MEM_DEBUG, test x$memdebug_enabled = xtrue) +# Enable unit tests +AC_ARG_ENABLE(unittests, +[ --enable-unittests Turn on unit tests], +[case "${enableval}" in + yes) unittests_enabled=true +LIBS="$LIBS -lgtest" + ;; + no) unittests_enabled=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-tests) ;; +esac],[unittests_enabled=false]) + +AM_CONDITIONAL(ENABLE_UNITTESTS, test x$unittests_enabled = xtrue) + # Enable tcmalloc AC_ARG_ENABLE(tcmalloc, [ --enable-tcmalloc Turn on tcmalloc], diff --git a/src/Makefile.am b/src/Makefile.am index 204c21bfc..62b762af6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,6 +21,10 @@ else manaplus_SOURCES = endif +if ENABLE_UNITTESTS +manaplus_CXXFLAGS += -DUNITTESTS +endif + if USE_INTERNALGUICHAN manaplus_CXXFLAGS += -DUSE_INTERNALGUICHAN manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ diff --git a/src/main.cpp b/src/main.cpp index dc87ca9e0..f30e7bc62 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,6 +35,10 @@ #include "utils/stringutils.h" #include "utils/xml.h" +#ifdef UNITTESTS +#include +#endif + #ifdef __MINGW32__ #include #endif @@ -210,6 +214,8 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) extern "C" char const *_nl_locale_name_default(void); #endif +#ifndef UNITTESTS +// main for normal game usage int main(int argc, char *argv[]) { #if defined(__MINGW32__) @@ -262,3 +268,14 @@ int main(int argc, char *argv[]) return client.testsExec(); } } + +#else + +// main for unit testing +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} + +#endif -- cgit v1.2.3-70-g09d2 From bb156df11431e3eb286ddd3311adf1ac710945e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Feb 2012 19:39:06 +0300 Subject: Remove some unneeded includes. --- build/makecheck4 | 2 +- src/actorspritemanager.cpp | 2 -- src/being.cpp | 1 - src/being.h | 1 - src/client.cpp | 2 -- src/compoundsprite.cpp | 3 ++- src/flooritem.cpp | 2 +- src/graphics.cpp | 1 - src/gui/ministatuswindow.h | 1 - src/guichanfwd.h | 6 ------ src/itemshortcut.cpp | 1 - src/localplayer.cpp | 5 ----- src/net/charhandler.h | 2 -- src/net/ea/playerhandler.cpp | 1 + src/net/playerhandler.h | 1 - src/net/tmwa/playerhandler.cpp | 1 + src/utils/stringutils.cpp | 2 -- 17 files changed, 6 insertions(+), 28 deletions(-) diff --git a/build/makecheck4 b/build/makecheck4 index 852986459..5c77d7f3a 100755 --- a/build/makecheck4 +++ b/build/makecheck4 @@ -1,5 +1,5 @@ #!/bin/bash -../../checkheaders/checkheaders ../src 2>tmp.txt +../../checkheaders/checkheaders --skip debug.h ../src 2>tmp.txt sed '/(style): Header not found/d' tmp.txt >makecheck4.txt rm tmp.txt diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 89a592005..803a30e7e 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -31,8 +31,6 @@ #include "gui/chatwindow.h" #include "gui/equipmentwindow.h" -#include "gui/killstats.h" -#include "gui/skilldialog.h" #include "gui/socialwindow.h" #include "gui/viewport.h" diff --git a/src/being.cpp b/src/being.cpp index 92d01097b..47a74c7b2 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -40,7 +40,6 @@ #include "sound.h" #include "sprite.h" #include "text.h" -#include "statuseffect.h" #include "gui/buydialog.h" #include "gui/buyselldialog.h" diff --git a/src/being.h b/src/being.h index a52963746..0b9257e83 100644 --- a/src/being.h +++ b/src/being.h @@ -27,7 +27,6 @@ #include "configlistener.h" #include "equipment.h" #include "map.h" -#include "particlecontainer.h" #include "position.h" #include "vector.h" diff --git a/src/client.cpp b/src/client.cpp index 023eb5353..a7825a835 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -69,7 +69,6 @@ #include "gui/worldselectdialog.h" #include "gui/widgets/button.h" -#include "gui/widgets/chattab.h" #include "gui/widgets/desktop.h" #include "net/charhandler.h" @@ -80,7 +79,6 @@ #include "net/loginhandler.h" #include "net/net.h" #include "net/npchandler.h" -#include "net/packetcounters.h" #include "net/partyhandler.h" #include "net/worldinfo.h" diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index 61fb3d4e0..62ef2d01c 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -24,11 +24,12 @@ #include "configuration.h" #include "game.h" #include "graphics.h" + #ifdef USE_OPENGL #include "openglgraphics.h" #include "opengl1graphics.h" #endif -#include "localplayer.h" + #include "map.h" #include "resources/image.h" diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 111019546..f126f336b 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -31,7 +31,7 @@ #include "gui/gui.h" #include "gui/sdlfont.h" -#include "net/net.h" +//#include "net/net.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" diff --git a/src/graphics.cpp b/src/graphics.cpp index 635cc6ab9..e98b1a283 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -24,7 +24,6 @@ #include "graphicsvertexes.h" #include "logger.h" -#include "map.h" #include "resources/image.h" #include "resources/imageloader.h" diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index ba2cf7b2d..eb6ded7dd 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -27,7 +27,6 @@ #include "listener.h" #include "gui/widgets/popup.h" -#include "gui/widgets/window.h" #include diff --git a/src/guichanfwd.h b/src/guichanfwd.h index b3808d8ba..7ccc221b4 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -27,11 +27,6 @@ namespace gcn { class ActionEvent; class ActionListener; - class AllegroFont; - class AllegroGraphics; - class AllegroImage; - class AllegroImageLoader; - class AllegroInput; class BasicContainer; class Button; class CheckBox; @@ -70,7 +65,6 @@ namespace gcn class MouseEvent; class MouseInput; class MouseListener; - class OpenGLAllegroImageLoader; class OpenGLGraphics; class OpenGLImage; class OpenGLSDLImageLoader; diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index f267dd755..fedb92257 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -24,7 +24,6 @@ #include "inventory.h" #include "item.h" #include "itemshortcut.h" -#include "localplayer.h" #include "playerinfo.h" #include "spellmanager.h" diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 01e8c1ae8..99108bd3a 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -41,21 +41,16 @@ #include "simpleanimation.h" #include "sound.h" #include "statuseffect.h" -#include "text.h" #include "dropshortcut.h" #include "gui/chatwindow.h" #include "gui/gui.h" -#include "gui/inventorywindow.h" -#include "gui/killstats.h" #include "gui/ministatuswindow.h" #include "gui/okdialog.h" #include "gui/outfitwindow.h" -#include "gui/palette.h" #include "gui/shopwindow.h" #include "gui/skilldialog.h" #include "gui/socialwindow.h" -#include "gui/statuswindow.h" #include "gui/theme.h" #include "gui/userpalette.h" #include "gui/viewport.h" diff --git a/src/net/charhandler.h b/src/net/charhandler.h index 492e27e55..cee319719 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -26,8 +26,6 @@ #include "localplayer.h" #include "playerinfo.h" -#include "net/logindata.h" - #include #include diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 76a7b0dbc..27aa4da80 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -22,6 +22,7 @@ #include "net/ea/playerhandler.h" +#include "localplayer.h" #include "logger.h" #include "party.h" #include "playerinfo.h" diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 6ae912102..aa5d2b793 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -25,7 +25,6 @@ #include "being.h" #include "flooritem.h" -#include "localplayer.h" namespace Net { diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 16e833ec9..bfe9eea42 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -23,6 +23,7 @@ #include "net/tmwa/playerhandler.h" #include "configuration.h" +#include "client.h" #include "logger.h" #include "net/messagein.h" diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 5e7bf19a0..798690602 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -22,8 +22,6 @@ #include "utils/stringutils.h" -#include "configuration.h" - #include #include #include -- cgit v1.2.3-70-g09d2 From 541bd299d521666d7d02b4f36b75f31dd8a2d64f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 01:23:09 +0300 Subject: Fix some possible errors in string untils. --- src/utils/stringutils.cpp | 34 +++++++++++++++++++++++----------- src/utils/stringutils.h | 2 +- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 798690602..9184ba79d 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -105,6 +105,7 @@ std::string strprintf(char const *format, ...) return res; } +/* std::string &removeBadChars(std::string &str) { std::string::size_type pos; @@ -118,6 +119,7 @@ std::string &removeBadChars(std::string &str) return str; } +*/ std::string removeColors(std::string msg) { @@ -316,27 +318,37 @@ void getSafeUtf8String(std::string text, char *buf) std::string getFileName(std::string path) { - size_t pos = path.rfind("/"); - if (pos == std::string::npos) - pos = path.rfind("\\"); - if (pos == std::string::npos) + size_t pos1 = path.rfind("/"); + size_t pos2 = path.rfind("\\"); + if (pos1 == std::string::npos) + pos1 = pos2; + else if (pos2 != std::string::npos && pos2 > pos1) + pos1 = pos2; + + if (pos1 == std::string::npos) return path; - return path.substr(pos + 1); + return path.substr(pos1 + 1); } std::string getFileDir(std::string path) { - size_t pos = path.rfind("/"); - if (pos == std::string::npos) - pos = path.rfind("\\"); - if (pos == std::string::npos) - return ""; - return path.substr(0, pos); + size_t pos1 = path.rfind("/"); + size_t pos2 = path.rfind("\\"); + if (pos1 == std::string::npos) + pos1 = pos2; + else if (pos2 != std::string::npos && pos2 > pos1) + pos1 = pos2; + + if (pos1 == std::string::npos) + return path; + return path.substr(0, pos1); } std::string& replaceAll(std::string& context, const std::string& from, const std::string& to) { + if (from.empty()) + return context; size_t lookHere = 0; size_t foundHere; while ((foundHere = context.find(from, lookHere)) != std::string::npos) diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 398737179..47d495dd0 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -103,7 +103,7 @@ std::string strprintf(char const *, ...) * @param str the string to remove the bad chars from * @return a reference to the string without bad chars */ -std::string &removeBadChars(std::string &str); +//std::string &removeBadChars(std::string &str); /** * Removes colors from a string -- cgit v1.2.3-70-g09d2 From 6d3f7abf7fa4502b0de347c69a81e1c65e0cae19 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 01:23:48 +0300 Subject: Add unit tests for stringutils. --- src/Makefile.am | 9 +- src/utils/stringutils_unittest.cc | 517 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 522 insertions(+), 4 deletions(-) create mode 100644 src/utils/stringutils_unittest.cc diff --git a/src/Makefile.am b/src/Makefile.am index 62b762af6..3fad9f3ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,10 +21,6 @@ else manaplus_SOURCES = endif -if ENABLE_UNITTESTS -manaplus_CXXFLAGS += -DUNITTESTS -endif - if USE_INTERNALGUICHAN manaplus_CXXFLAGS += -DUSE_INTERNALGUICHAN manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ @@ -785,6 +781,11 @@ manaplus_SOURCES += \ mumblemanager.cpp \ mumblemanager.h +if ENABLE_UNITTESTS +manaplus_CXXFLAGS += -DUNITTESTS +manaplus_SOURCES += \ + utils/stringutils_unittest.cc +endif EXTRA_DIST = CMakeLists.txt \ winver.h.in \ diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc new file mode 100644 index 000000000..81030631a --- /dev/null +++ b/src/utils/stringutils_unittest.cc @@ -0,0 +1,517 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#include "utils/stringutils.h" + +#include "gtest/gtest.h" + +#include +#include +#include + +#include "debug.h" + +TEST(stringuntils, trim1) +{ + std::string str = "str"; + EXPECT_EQ("str", trim(str)); + + str = " str"; + EXPECT_EQ("str", trim(str)); + EXPECT_EQ("str", trim(str)); + + str = " str this IS Long Стринг " + "~!@#$%^&*()_+`-=[]\\{}|;':\",./<>? "; + EXPECT_EQ("str this IS Long Стринг ~!@#$%^&*()_+`-=[]\\{}|;':\",./<>?", + trim(str)); + + str = ""; + EXPECT_EQ("", trim(str)); +} + +TEST(stringuntils, toLower1) +{ + std::string str = "str"; + EXPECT_EQ("str", toLower(str)); + + str = " StR"; + EXPECT_EQ(" str", toLower(str)); + + str = " str this IS Long " + "~!@#$%^&*()_+`-=[]\\{}|;':\",./<>? "; + + EXPECT_EQ(" str this is long ~!@#$%^&*()_+`-=[]\\{}|;':\",./<>? ", + toLower(str)); + + str = ""; + EXPECT_EQ("", toLower(str)); +} + +TEST(stringuntils, toUpper1) +{ + std::string str = "str"; + EXPECT_EQ("STR", toUpper(str)); + + str = " StR"; + EXPECT_EQ(" STR", toUpper(str)); + + str = " str this IS Long " + "~!@#$%^&*()_+`-=[]\\{}|;':,./<>? "; + + EXPECT_EQ(" STR THIS IS LONG ~!@#$%^&*()_+`-=[]\\{}|;':,./<>? ", + toUpper(str)); + + str = ""; + EXPECT_EQ("", toUpper(str)); +} + +TEST(stringuntils, atox1) +{ + std::string str = "0x10"; + EXPECT_EQ(16, atox(str)); + + str = "0x0"; + EXPECT_EQ(0, atox(str)); + + str = "0x1"; + EXPECT_EQ(1, atox(str)); + + str = "0x0x0x0x0x0x0x0"; + EXPECT_EQ(0, atox(str)); + + str = "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + atox(str); + + str = ""; + int k = atox(str); + + str = "0"; + k = atox(str); + + str = "0x"; + k = atox(str); +} + +TEST(stringuntils, ipToString1) +{ + EXPECT_EQ("0.0.0.0", std::string(ipToString(0))); + EXPECT_EQ("219.255.210.73", std::string(ipToString(1238564827))); +} + +TEST(stringuntils, removeColors1) +{ + EXPECT_EQ("", removeColors("")); + EXPECT_EQ("#", removeColors("#")); + EXPECT_EQ("##", removeColors("##")); + EXPECT_EQ("", removeColors("##1")); + EXPECT_EQ("2", removeColors("##12")); + EXPECT_EQ("1##", removeColors("1##")); + EXPECT_EQ("1", removeColors("1##2")); + EXPECT_EQ("13", removeColors("1##23")); + EXPECT_EQ("#1#2", removeColors("#1#2")); + EXPECT_EQ("#1", removeColors("#1##2")); +} + +TEST(stringuntils, compareStrI1) +{ + std::string str1 = ""; + std::string str2 = ""; + EXPECT_TRUE(compareStrI(str1, str2) == 0); + + str1 = "test"; + str2 = "test"; + EXPECT_TRUE(compareStrI(str1, str2) == 0); + + str1 = "test"; + str2 = "test1"; + EXPECT_TRUE(compareStrI(str1, str2) < 0); + + str1 = "test"; + str2 = "aest1"; + EXPECT_TRUE(compareStrI(str1, str2) > 0); +} + +TEST(stringuntils, isWordSeparator1) +{ + EXPECT_TRUE(isWordSeparator(' ')); + EXPECT_TRUE(isWordSeparator(',')); + EXPECT_TRUE(isWordSeparator('.')); + EXPECT_TRUE(isWordSeparator('\"')); + EXPECT_TRUE(!isWordSeparator(0)); + EXPECT_TRUE(!isWordSeparator('a')); + EXPECT_TRUE(!isWordSeparator('-')); +} + +TEST(stringuntils, findSameSubstring) +{ + std::string str1 = ""; + std::string str2 = ""; + + EXPECT_EQ("", findSameSubstring("", "")); + + str1 = "test line"; + str2 = "test line"; + EXPECT_EQ("test line", findSameSubstring(str1, str2)); + + str1 = "test li"; + str2 = "test line"; + EXPECT_EQ("test li", findSameSubstring(str1, str2)); + + str1 = "test li"; + str2 = "est li"; + EXPECT_EQ("", findSameSubstring(str1, str2)); +} + +TEST(stringuntils, findSameSubstringI) +{ + std::string str1 = ""; + std::string str2 = ""; + + EXPECT_EQ("", findSameSubstringI("", "")); + + str1 = "tEst line"; + str2 = "tesT line"; + EXPECT_EQ("tEst line", findSameSubstringI(str1, str2)); + + str1 = "test Li"; + str2 = "test lINe"; + EXPECT_EQ("test Li", findSameSubstringI(str1, str2)); + + str1 = "teSt li"; + str2 = "est li"; + EXPECT_EQ("", findSameSubstringI(str1, str2)); +} + +TEST(stringuntils, findI1) +{ + EXPECT_EQ(0, findI("", "")); + EXPECT_EQ(std::string::npos, findI("test", "line")); + EXPECT_EQ(0, findI("test line", "t")); + EXPECT_EQ(0, findI("test line", "te")); + EXPECT_EQ(3, findI("test line", "t l")); +} + +TEST(stringuntils, findI2) +{ + std::vector vect1; + vect1.push_back("test"); + vect1.push_back("line"); + vect1.push_back("qwe"); + + EXPECT_EQ(std::string::npos, findI("", vect1)); + EXPECT_EQ(0, findI("test", vect1)); + EXPECT_EQ(0, findI("tesT lIne", vect1)); + EXPECT_EQ(5, findI("teoT line", vect1)); + EXPECT_EQ(std::string::npos, findI("zzz", vect1)); +} + +TEST(stringuntils, encodeStr1) +{ + std::string str = encodeStr(10, 1); + EXPECT_EQ(10, decodeStr(str)); + + str = encodeStr(10, 2); + EXPECT_EQ(10, decodeStr(str)); + + str = encodeStr(100, 3); + EXPECT_EQ(100, decodeStr(str)); + + str = encodeStr(1000, 4); + EXPECT_EQ(1000, decodeStr(str)); +} + +TEST(stringuntils, extractNameFromSprite1) +{ + EXPECT_EQ("", extractNameFromSprite("")); + EXPECT_EQ("test", extractNameFromSprite("test")); + EXPECT_EQ("test", extractNameFromSprite("test.qwe")); + EXPECT_EQ("line", extractNameFromSprite("test/line.zzz")); +} + +TEST(stringuntils, removeSpriteIndex1) +{ + EXPECT_EQ("", removeSpriteIndex("")); + EXPECT_EQ("test", removeSpriteIndex("test")); + EXPECT_EQ("test", removeSpriteIndex("test[1]")); + EXPECT_EQ("line", removeSpriteIndex("test/line[12]")); +} + +TEST(stringuntils, getFileName1) +{ + EXPECT_EQ("", getFileName("")); + EXPECT_EQ("file", getFileName("file")); + EXPECT_EQ("file", getFileName("test/file1\\file")); + EXPECT_EQ("file", getFileName("test\\file1/file")); + EXPECT_EQ("", getFileName("file/")); + EXPECT_EQ("file", getFileName("/file")); +} + +TEST(stringuntils, getFileDir1) +{ + EXPECT_EQ("", getFileDir("")); + EXPECT_EQ("file", getFileDir("file")); + EXPECT_EQ("test/file1", getFileDir("test/file1\\file")); + EXPECT_EQ("test\\file1", getFileDir("test\\file1/file")); + EXPECT_EQ("file", getFileDir("file/")); + EXPECT_EQ("", getFileDir("/file")); +} + +TEST(stringuntils, replaceAll1) +{ + std::string str1 = ""; + std::string str2 = ""; + std::string str3 = ""; + + EXPECT_EQ("", replaceAll(str1, str2, str3)); + + str1 = "this is test line"; + str2 = ""; + str3 = ""; + EXPECT_EQ("this is test line", replaceAll(str1, str2, str3)); + + str1 = "this is test line"; + str2 = "is "; + str3 = ""; + EXPECT_EQ("thtest line", replaceAll(str1, str2, str3)); + + str1 = "this is test line"; + str2 = ""; + str3 = "1"; + EXPECT_EQ("this is test line", replaceAll(str1, str2, str3)); +} + +TEST(stringuntils, getBoolFromString1) +{ + EXPECT_TRUE(getBoolFromString("true")); + EXPECT_TRUE(!getBoolFromString("false")); + EXPECT_TRUE(getBoolFromString("1")); + EXPECT_TRUE(!getBoolFromString("0")); +} + +TEST(stringuntils, replaceSpecialChars1) +{ + std::string str; + + str = ""; + replaceSpecialChars(str); + EXPECT_EQ("", str); + + str = "test"; + replaceSpecialChars(str); + EXPECT_EQ("test", str); + + str = "&"; + replaceSpecialChars(str); + EXPECT_EQ("&", str); + + str = "&1"; + replaceSpecialChars(str); + EXPECT_EQ("&1", str); + + str = "&33"; + replaceSpecialChars(str); + EXPECT_EQ("&33", str); + + str = "&33;"; + replaceSpecialChars(str); + EXPECT_EQ("!", str); + + str = "1&33;"; + replaceSpecialChars(str); + EXPECT_EQ("1!", str); + + str = "&33;2"; + replaceSpecialChars(str); + EXPECT_EQ("!2", str); + + str = "&33;&"; + replaceSpecialChars(str); + EXPECT_EQ("!&", str); + + str = "test line&33;"; + replaceSpecialChars(str); + EXPECT_EQ("test line!", str); +} + +TEST(stringuntils, combineDye1) +{ + EXPECT_EQ("", combineDye("", "")); + EXPECT_EQ("test", combineDye("test", "")); + EXPECT_EQ("|line", combineDye("", "line")); + EXPECT_EQ("test|line", combineDye("test", "line")); +} + +TEST(stringuntils, combineDye2) +{ + EXPECT_EQ("", combineDye2("", "")); + EXPECT_EQ("test", combineDye2("test", "")); + EXPECT_EQ("", combineDye2("", "line")); + EXPECT_EQ("test.xml", combineDye2("test.xml", "123")); + EXPECT_EQ("test.xml|#43413d,59544f,7a706c", + combineDye2("test.xml|#43413d,59544f,7a706c", "")); + EXPECT_EQ("test.xml|#43413d,59544f,7a706c:W;", + combineDye2("test.xml|#43413d,59544f,7a706c", "W")); + EXPECT_EQ("test.xml|#43413d,59544f,7a706c:W;#123456:B;", + combineDye2("test.xml|#43413d,59544f,7a706c;#123456", "W;B")); +} + +TEST(stringuntils, packList1) +{ + std::list list; + EXPECT_EQ("", packList(list)); + + list.push_back(""); + EXPECT_EQ("|", packList(list)); + + list.clear(); + list.push_back("test"); + EXPECT_EQ("test", packList(list)); + + list.push_back("line"); + EXPECT_EQ("test|line", packList(list)); + + list.push_back("2"); + EXPECT_EQ("test|line|2", packList(list)); +} + +TEST(stringuntils, stringToHexPath1) +{ + std::string str; + + str = ""; + EXPECT_EQ("", stringToHexPath(str)); + + str = "a"; + EXPECT_EQ("%61/", stringToHexPath(str)); + + str = "ab"; + EXPECT_EQ("%61/%62", stringToHexPath(str)); + + str = "abc"; + EXPECT_EQ("%61/%62%63", stringToHexPath(str)); + + str = "abcd"; + EXPECT_EQ("%61/%62%63%64", stringToHexPath(str)); +} + +TEST(stringuntils, deleteCharLeft1) +{ + std::string str; + unsigned int pos = 0; + + str = ""; + deleteCharLeft(str, nullptr); + EXPECT_EQ("", str); + + str = "test line"; + pos = 4; + deleteCharLeft(str, &pos); + EXPECT_EQ("tes line", str); + + str = "тест line"; + pos = 8; + deleteCharLeft(str, &pos); + EXPECT_EQ("тес line", str); +} + +TEST(stringuntils, findLast1) +{ + std::string str; + + str = ""; + EXPECT_TRUE(findLast(str, "")); + + str = "test line"; + EXPECT_TRUE(findLast(str, "line")); + + str = "test line"; + EXPECT_TRUE(!findLast(str, "lin")); +} + +TEST(stringuntils, findFirst1) +{ + std::string str; + + str = ""; + EXPECT_TRUE(findFirst(str, "")); + + str = "test line"; + EXPECT_TRUE(findFirst(str, "test")); + + str = "test line"; + EXPECT_TRUE(!findFirst(str, "est")); +} + +TEST(stringuntils, findCutLast1) +{ + std::string str; + + str = ""; + EXPECT_TRUE(findCutLast(str, "")); + EXPECT_EQ("", str); + + str = "test line"; + EXPECT_TRUE(findCutLast(str, "line")); + EXPECT_EQ("test ", str); + + str = "test line"; + EXPECT_TRUE(!findCutLast(str, "lin")); + EXPECT_EQ("test line", str); +} + +TEST(stringuntils, findCutFirst1) +{ + std::string str; + + str = ""; + EXPECT_TRUE(findCutFirst(str, "")); + EXPECT_EQ("", str); + + str = "test line"; + EXPECT_TRUE(findCutFirst(str, "test")); + EXPECT_EQ(" line", str); + + str = "test line"; + EXPECT_TRUE(!findCutFirst(str, "est")); + EXPECT_EQ("test line", str); +} + +TEST(stringuntils, removeProtocol1) +{ + std::string str; + + str = ""; + EXPECT_EQ("", removeProtocol(str)); + + str = "http://"; + EXPECT_EQ("", removeProtocol(str)); + + str = "http://test"; + EXPECT_EQ("test", removeProtocol(str)); +} + +TEST(stringuntils, strStartWith1) +{ + EXPECT_TRUE(strStartWith("", "")); + EXPECT_TRUE(!strStartWith("", "1")); + EXPECT_TRUE(strStartWith("test line", "test")); + EXPECT_TRUE(strStartWith("test line", "test line")); + EXPECT_TRUE(!strStartWith("test line", "est")); +} -- cgit v1.2.3-70-g09d2 From 6006cbe9c0f786d320d69c7352ad6bbe71c92b75 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 03:52:21 +0300 Subject: Remove unused variable. --- src/localplayer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 99108bd3a..0576c8ddb 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2049,7 +2049,6 @@ void LocalPlayer::changeQuickDropCounter() std::string LocalPlayer::getQuickDropCounterString() { - std::string str; if (mQuickDropCounter > 9) { return strprintf("(%c) drop counter %d", -- cgit v1.2.3-70-g09d2 From a99b870ef80206eb58fb1b03dd64e8d0990ee268 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 04:01:03 +0300 Subject: Move logs from makecheck tools to subdir --- .gitignore | 1 + build/makecheck1 | 2 +- build/makecheck2 | 2 +- build/makecheck3 | 4 +--- build/makecheck4 | 2 +- build/makecheck5 | 7 ++++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index bef2937de..42a6980d6 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ mana.creator.user* run/* my/* win/* +build/logs build/make.log build/make1.log build/make2.log diff --git a/build/makecheck1 b/build/makecheck1 index 96b49e5c7..58f231e14 100755 --- a/build/makecheck1 +++ b/build/makecheck1 @@ -1,3 +1,3 @@ #!/bin/bash -cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>makecheck_err.txt +cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>logs/cppcheck1.txt diff --git a/build/makecheck2 b/build/makecheck2 index b9108b6ef..184903c7a 100755 --- a/build/makecheck2 +++ b/build/makecheck2 @@ -1,3 +1,3 @@ #!/bin/bash -../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >make_nsiqcppstyle.txt +../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >logs/nsiqcppstyle.txt diff --git a/build/makecheck3 b/build/makecheck3 index 95e04ad28..c09d002cb 100755 --- a/build/makecheck3 +++ b/build/makecheck3 @@ -1,6 +1,4 @@ #!/bin/bash cd ../src -#../../cppcheck/cppcheck --enable=all --force -j 5 -v -I /usr/include -I /usr/include/c++/4.5 -I /usr/include/libxml2 -I /usr/include/SDL . 1>../makecheck.txt 2>../makecheck_err.txt -#../../cppcheck/cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>../makecheck.txt 2>../makecheck_err.txt -../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/makecheck_err.txt +../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/logs/cppcheck2.txt diff --git a/build/makecheck4 b/build/makecheck4 index 5c77d7f3a..946761892 100755 --- a/build/makecheck4 +++ b/build/makecheck4 @@ -1,5 +1,5 @@ #!/bin/bash ../../checkheaders/checkheaders --skip debug.h ../src 2>tmp.txt -sed '/(style): Header not found/d' tmp.txt >makecheck4.txt +sed '/(style): Header not found/d' tmp.txt >logs/checkheader.txt rm tmp.txt diff --git a/build/makecheck5 b/build/makecheck5 index e20b58729..9cf5450b6 100755 --- a/build/makecheck5 +++ b/build/makecheck5 @@ -1,5 +1,6 @@ #!/bin/bash -find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>makecheck_err.txt -find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt -find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>makecheck_err.txt +find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>logs/vera.txt +find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt +find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt +find ../src -type f -name "*.cc" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -- cgit v1.2.3-70-g09d2 From 00d092dc0f458a3967f26e82655212db1b0bcc59 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 17:09:35 +0300 Subject: Fix possible infinite loop, also bit improve speed. --- src/client.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index a7825a835..ed3656ee0 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -864,7 +864,8 @@ int Client::gameExec() if (Net::getGeneralHandler()) Net::getGeneralHandler()->flushNetwork(); - while (get_elapsed_time(lastTickTime) > 0) + int k = 0; + while (lastTickTime != tick_time && k < 2) { if (gui) gui->logic(); @@ -874,6 +875,7 @@ int Client::gameExec() sound.logic(); ++lastTickTime; + k ++; } // This is done because at some point tick_time will wrap. -- cgit v1.2.3-70-g09d2 From 55dd2a721ec7dfb0966c1e93536096984d78e2e5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 18:50:24 +0300 Subject: Add option to enable/disable grouping friends in online list. --- src/defaults.cpp | 1 + src/gui/setup_players.cpp | 3 +++ src/gui/whoisonline.cpp | 18 +++++++++++++++--- src/gui/whoisonline.h | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/defaults.cpp b/src/defaults.cpp index 18b00dfb7..f5fb40881 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -225,6 +225,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "testInfo", ""); AddDEF(configData, "enableresize", true); AddDEF(configData, "noframe", false); + AddDEF(configData, "groupFriends", true); return configData; } diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index f0bf4c0ea..a08517fae 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -84,6 +84,9 @@ Setup_Players::Setup_Players() new SetupItemCheckBox(_("Allow self heal with mouse click"), "", "selfMouseHeal", this, "selfMouseHealEvent"); + new SetupItemCheckBox(_("Group friends in who is online window"), "", + "groupFriends", this, "groupFriendsEvent"); + setDimension(gcn::Rectangle(0, 0, 550, 350)); } diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 7c620bdf1..1efa9c22d 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -85,7 +85,8 @@ WhoIsOnline::WhoIsOnline(): mMemoryBuffer(nullptr), mCurlError(new char[CURL_ERROR_SIZE]), mAllowUpdate(true), - mShowLevel(false) + mShowLevel(false), + mGroupFriends(true) { mCurlError[0] = 0; setWindowName("WhoIsOnline"); @@ -124,12 +125,15 @@ WhoIsOnline::WhoIsOnline(): download(); config.addListener("updateOnlineList", this); + config.addListener("groupFriends", this); mUpdateOnlineList = config.getBoolValue("updateOnlineList"); + mGroupFriends = config.getBoolValue("groupFriends"); } WhoIsOnline::~WhoIsOnline() { config.removeListener("updateOnlineList", this); + config.removeListener("groupFriends", this); if (mThread && SDL_GetThreadID(mThread)) SDL_WaitThread(mThread, nullptr); @@ -282,7 +286,10 @@ void WhoIsOnline::loadList(std::vector &list) case PlayerRelation::FRIEND: player->setText("2"); - friends.push_back(player); + if (mGroupFriends) + friends.push_back(player); + else + neutral.push_back(player); break; case PlayerRelation::DISREGARDED: @@ -425,7 +432,10 @@ void WhoIsOnline::loadWebList() case PlayerRelation::FRIEND: player->setText("2"); - friends.push_back(player); + if (mGroupFriends) + friends.push_back(player); + else + neutral.push_back(player); break; case PlayerRelation::DISREGARDED: @@ -716,6 +726,8 @@ void WhoIsOnline::optionChanged(const std::string &name) { if (name == "updateOnlineList") mUpdateOnlineList = config.getBoolValue("updateOnlineList"); + else if (name == "groupFriends") + mGroupFriends = config.getBoolValue("groupFriends"); } void OnlinePlayer::setText(std::string color) diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h index dad51e857..1607286a9 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/whoisonline.h @@ -201,6 +201,7 @@ private: bool mAllowUpdate; bool mShowLevel; bool mUpdateOnlineList; + bool mGroupFriends; }; extern WhoIsOnline *whoIsOnline; -- cgit v1.2.3-70-g09d2 From ebf1cc07c1c48ebb56a719641442f0c1f7e2af4a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Feb 2012 19:34:22 +0300 Subject: Small changes in build scripts. --- build/bmakesnapshot | 2 +- build/clmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/bmakesnapshot b/build/bmakesnapshot index 89f465251..b13b31bfa 100755 --- a/build/bmakesnapshot +++ b/build/bmakesnapshot @@ -37,7 +37,7 @@ autoreconf -i cd po #make -j5 update-po 2>../build/make1.log -make -j5 update-gmo 2>../build/make1.log +make -j5 update-gmo 2>../build/logs/gcc47.txt cd .. make -j5 2>build/make2.log diff --git a/build/clmake b/build/clmake index a290af529..3817e6b89 100755 --- a/build/clmake +++ b/build/clmake @@ -13,5 +13,4 @@ export CXX=clang++ --bindir=$dir/run/bin \ --mandir=$dir/run/share/man -make -j5 2>build/make2.log - +make -j5 2>build/logs/clang.txt -- cgit v1.2.3-70-g09d2 From f8ffe39c8a24359bd598959433d9eb660dc24c53 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 13 Feb 2012 00:55:21 +0300 Subject: Enable chat log by default. --- src/defaults.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults.cpp b/src/defaults.cpp index f5fb40881..64572af13 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -132,7 +132,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "download-music", false); AddDEF(configData, "guialpha", 0.8f); AddDEF(configData, "ChatLogLength", 0); - AddDEF(configData, "enableChatLog", false); + AddDEF(configData, "enableChatLog", true); AddDEF(configData, "whispertab", true); AddDEF(configData, "customcursor", true); AddDEF(configData, "showownname", true); -- cgit v1.2.3-70-g09d2 From edefcb842b528ae4285e49370e37e888a9e6eff1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 13 Feb 2012 00:57:51 +0300 Subject: Change default max chat lines to 40. --- src/defaults.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults.cpp b/src/defaults.cpp index 64572af13..a439701a3 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -172,7 +172,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "hideShopMessages", true); AddDEF(configData, "showChatHistory", true); AddDEF(configData, "showChatColorsList", true); - AddDEF(configData, "chatMaxLinesLimit", 20); + AddDEF(configData, "chatMaxLinesLimit", 40); AddDEF(configData, "chatColor", 0); AddDEF(configData, "hideShield", true); AddDEF(configData, "showJob", true); -- cgit v1.2.3-70-g09d2 From a72b60b50e639bcd309baadf4199252510cb8118 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 15 Feb 2012 01:38:38 +0300 Subject: Update windows installer scripts. --- packaging/windows/evol.nsi | 10 ++++++---- packaging/windows/setup.nsi | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi index ffd3dae3f..73554e0cf 100644 --- a/packaging/windows/evol.nsi +++ b/packaging/windows/evol.nsi @@ -258,12 +258,14 @@ Section "Core files (required)" SecCore File "${DLLDIR}\SDL_net.dll" File "${DLLDIR}\SDL_ttf.dll" File "${DLLDIR}\exchndl.dll" - File "${DLLDIR}\SDL_gfx.dll" File "${DLLDIR}\libcurl-4.dll" File "${DLLDIR}\libiconv-2.dll" - File "${DLLDIR}\libiconv2.dll" - File "${DLLDIR}\libintl3.dll" - File "${DLLDIR}\libpng12-0.dll" + File "${DLLDIR}\libintl-8.dll" + File "${DLLDIR}\libjpeg-8.dll" + File "${DLLDIR}\libogg-0.dll" + File "${DLLDIR}\libpng15-15.dll" + File "${DLLDIR}\libvorbis-0.dll" + File "${DLLDIR}\libvorbisfile-3.dll" File "${DLLDIR}\libxml2-2.dll" File "${DLLDIR}\zlib1.dll" File "${SRCDIR}\AUTHORS" diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 38780e297..a68f9cbb2 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -255,12 +255,14 @@ Section "Core files (required)" SecCore File "${DLLDIR}\SDL_net.dll" File "${DLLDIR}\SDL_ttf.dll" File "${DLLDIR}\exchndl.dll" - File "${DLLDIR}\SDL_gfx.dll" File "${DLLDIR}\libcurl-4.dll" File "${DLLDIR}\libiconv-2.dll" - File "${DLLDIR}\libiconv2.dll" - File "${DLLDIR}\libintl3.dll" - File "${DLLDIR}\libpng12-0.dll" + File "${DLLDIR}\libintl-8.dll" + File "${DLLDIR}\libjpeg-8.dll" + File "${DLLDIR}\libogg-0.dll" + File "${DLLDIR}\libpng15-15.dll" + File "${DLLDIR}\libvorbis-0.dll" + File "${DLLDIR}\libvorbisfile-3.dll" File "${DLLDIR}\libxml2-2.dll" File "${DLLDIR}\zlib1.dll" File "${SRCDIR}\AUTHORS" -- cgit v1.2.3-70-g09d2 From 99bc9d1fb4bccae0785d731711e3b1009de1b394 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 15 Feb 2012 02:18:57 +0300 Subject: Replace some hardcoded dir separator to physfs. --- src/chatlogger.cpp | 12 ++++++++++-- src/client.cpp | 22 ++++++++++++---------- src/map.cpp | 3 ++- src/resources/resourcemanager.cpp | 4 ++-- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp index 33763e561..b8418edda 100644 --- a/src/chatlogger.cpp +++ b/src/chatlogger.cpp @@ -42,6 +42,8 @@ #include "utils/mkdir.h" #include "utils/stringutils.h" +#include + #include "debug.h" ChatLogger::ChatLogger() : @@ -172,11 +174,17 @@ void ChatLogger::setServerName(const std::string &serverName) secureName(mServerName); if (mLogDir != "") { - DIR *dir = opendir((mLogDir + "/" + mServerName).c_str()); + DIR *dir = opendir((mLogDir + PHYSFS_getDirSeparator() + + mServerName).c_str()); if (!dir) - mkdir_r((mLogDir + "/" + mServerName).c_str()); + { + mkdir_r((mLogDir + PHYSFS_getDirSeparator() + + mServerName).c_str()); + } else + { closedir(dir); + } } } diff --git a/src/client.cpp b/src/client.cpp index ed3656ee0..4bd60e977 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -443,7 +443,8 @@ void Client::gameInit() } else { - mOptions.dataPath = branding.getDirectory() + "/" + mOptions.dataPath = branding.getDirectory() + + PHYSFS_getDirSeparator() + branding.getStringValue("dataPath"); } mOptions.skipUpdate = true; @@ -1137,17 +1138,17 @@ int Client::gameExec() } else if (loginData.updateType & LoginData::Upd_Skip) { - UpdaterWindow::loadLocalUpdates(mLocalDataDir + "/" - + mUpdatesDir); + UpdaterWindow::loadLocalUpdates(mLocalDataDir + + PHYSFS_getDirSeparator() + mUpdatesDir); mState = STATE_LOAD_DATA; } else { logger->log1("State: UPDATE"); mCurrentDialog = new UpdaterWindow(mUpdateHost, - mLocalDataDir + "/" + mUpdatesDir, - mOptions.dataPath.empty(), - loginData.updateType); + mLocalDataDir + PHYSFS_getDirSeparator() + + mUpdatesDir, mOptions.dataPath.empty(), + loginData.updateType); } break; @@ -1175,7 +1176,8 @@ int Client::gameExec() "zip", false); - resman->addToSearchPath(mLocalDataDir + "/" + resman->addToSearchPath(mLocalDataDir + + PHYSFS_getDirSeparator() + mUpdatesDir + "/local/", false); } @@ -1610,7 +1612,7 @@ void Client::initConfigDir() if (mConfigDir.empty()) { #ifdef __APPLE__ - mConfigDir = mLocalDataDir + "/" + mConfigDir = mLocalDataDir + PHYSFS_getDirSeparator() + branding.getValue("appShort", "mana"); #elif defined __HAIKU__ mConfigDir = std::string(PHYSFS_getUserDir()) + @@ -1642,7 +1644,7 @@ void Client::initConfigDir() */ void Client::initServerConfig(std::string serverName) { - mServerConfigDir = mConfigDir + "/" + serverName; + mServerConfigDir = mConfigDir + PHYSFS_getDirSeparator() + serverName; if (mkdir_r(mServerConfigDir.c_str())) { @@ -1877,7 +1879,7 @@ void Client::initScreenshotDir() if (!configScreenshotSuffix.empty()) { - mScreenshotDir += "/" + configScreenshotSuffix; + mScreenshotDir += PHYSFS_getDirSeparator() + configScreenshotSuffix; // config.setValue("screenshotDirectorySuffix", // configScreenshotSuffix); } diff --git a/src/map.cpp b/src/map.cpp index 3ea9989a4..b8767e5e4 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -42,6 +42,7 @@ #include "utils/mkdir.h" #include +#include #include @@ -1251,7 +1252,7 @@ void Map::saveExtraLayer() std::string Map::getUserMapDirectory() const { - return Client::getServerConfigDirectory() + "/" + return Client::getServerConfigDirectory() + PHYSFS_getDirSeparator() + getProperty("_realfilename"); } diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 7adeaa268..ec8764a44 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -329,12 +329,12 @@ std::string ResourceManager::getPath(const std::string &file) // if the file is not in the search path, then its nullptr if (tmp) { - path = std::string(tmp) + "/" + file; + path = std::string(tmp) + PHYSFS_getDirSeparator() + file; } else { // if not found in search path return the default path - path = Client::getPackageDirectory() + "/" + file; + path = Client::getPackageDirectory() + PHYSFS_getDirSeparator() + file; } return path; -- cgit v1.2.3-70-g09d2 From 624b07bf0ee70794240135bb403e9dfb879749c4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 15 Feb 2012 02:35:06 +0300 Subject: Add function to fix dir separator. --- src/gui/sdlfont.cpp | 11 ++++++++--- src/gui/sdlfont.h | 4 ++-- src/utils/paths.cpp | 12 +++++++++++- src/utils/paths.h | 2 ++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 0e69db026..7e0114cb8 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -27,6 +27,7 @@ #include "graphics.h" #include "logger.h" #include "main.h" +#include "utils/paths.h" #include "resources/image.h" #include "resources/resourcemanager.h" @@ -98,7 +99,7 @@ typedef std::list::iterator CacheIterator; static int fontCounter; -SDLFont::SDLFont(const std::string &filename, int size, int style) : +SDLFont::SDLFont(std::string filename, int size, int style) : mCreateCounter(0), mDeleteCounter(0) { @@ -117,13 +118,16 @@ SDLFont::SDLFont(const std::string &filename, int size, int style) : } ++fontCounter; + + fixDirSeparators(filename); mFont = TTF_OpenFont(resman->getPath(filename).c_str(), size); if (!mFont) { logger->log("Error finding font " + filename); + std::string backFile = "fonts/dejavusans.ttf"; mFont = TTF_OpenFont(resman->getPath( - "fonts/dejavusans.ttf").c_str(), size); + fixDirSeparators(backFile)).c_str(), size); if (!mFont) { throw GCN_EXCEPTION("SDLSDLFont::SDLSDLFont: " + @@ -148,7 +152,7 @@ SDLFont::~SDLFont() } } -void SDLFont::loadFont(const std::string &filename, int size, int style) +void SDLFont::loadFont(std::string filename, int size, int style) { ResourceManager *resman = ResourceManager::getInstance(); @@ -159,6 +163,7 @@ void SDLFont::loadFont(const std::string &filename, int size, int style) return; } + fixDirSeparators(filename); TTF_Font *font = TTF_OpenFont(resman->getPath(filename).c_str(), size); if (!font) diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index 6fcad34d4..77e3761e7 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -53,14 +53,14 @@ class SDLFont : public gcn::Font * @param filename Font filename. * @param size Font size. */ - SDLFont(const std::string &filename, int size, int style = 0); + SDLFont(std::string filename, int size, int style = 0); /** * Destructor. */ ~SDLFont(); - void loadFont(const std::string &filename, int size, int style = 0); + void loadFont(std::string filename, int size, int style = 0); void createSDLTextChunk(SDLTextChunk *chunk); diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index faa1882e6..04f553ca9 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -20,10 +20,12 @@ #include "utils/paths.h" +#include "utils/stringutils.h" + #include #include #include - +#include #include #ifdef WIN32 @@ -65,3 +67,11 @@ bool checkPath(std::string path) && path.find("/..") == std::string::npos && path.find("\\..") == std::string::npos; } + +std::string &fixDirSeparators(std::string &str) +{ + if (*PHYSFS_getDirSeparator() == '/') + return str; + + return replaceAll(str, "/", "\\"); +} diff --git a/src/utils/paths.h b/src/utils/paths.h index f92fcdcb5..b89671adc 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -29,4 +29,6 @@ bool isRealPath(const std::string &str); bool checkPath(std::string path); +std::string &fixDirSeparators(std::string &str); + #endif // UTILS_PATHS_H -- cgit v1.2.3-70-g09d2 From d54d06ca11fee4d9d8b791837b729550e51e51b6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 15 Feb 2012 21:42:21 +0300 Subject: Fix code style. --- src/client.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 4bd60e977..fa8f032fa 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1879,9 +1879,8 @@ void Client::initScreenshotDir() if (!configScreenshotSuffix.empty()) { - mScreenshotDir += PHYSFS_getDirSeparator() + configScreenshotSuffix; -// config.setValue("screenshotDirectorySuffix", -// configScreenshotSuffix); + mScreenshotDir += PHYSFS_getDirSeparator() + + configScreenshotSuffix; } } } -- cgit v1.2.3-70-g09d2 From 572c2e0048400388c71b962b74b9a443a0b076a0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 15 Feb 2012 23:10:35 +0300 Subject: Fix default servers dialog size. --- src/gui/serverdialog.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index c50c2b802..ce61f6572 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -283,14 +283,10 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir): // Do this manually instead of calling reflowLayout so we can enforce a // minimum width. - int width = 0, height = 0; - getLayout().reflow(width, height); - if (width < 400) - { - width = 400; - getLayout().reflow(width, height); - } + int width = 500; + int height = 350; + getLayout().reflow(width, height); setContentSize(width, height); setMinWidth(getWidth()); -- cgit v1.2.3-70-g09d2 From cbf5a66ac0d5cbcd2f0058b9e326ef9b6d56f23b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 16 Feb 2012 02:43:31 +0300 Subject: Add race name to status and debug windows. --- src/being.cpp | 8 ++++++++ src/being.h | 7 +++++++ src/gui/debugwindow.cpp | 25 +++++++++++++++---------- src/gui/debugwindow.h | 1 + src/gui/statuswindow.cpp | 8 +++++++- 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/being.cpp b/src/being.cpp index 47a74c7b2..e1cb9b0ae 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -338,7 +338,15 @@ void Being::setSubtype(Uint16 subtype) // Prevent showing errors when sprite doesn't exist if (!ItemDB::exists(id)) + { id = -100; + setRaceName(_("Human")); + } + else + { + const ItemInfo &info = ItemDB::get(id); + setRaceName(info.getName()); + } setSprite(Net::getCharHandler()->baseSprite(), id); } diff --git a/src/being.h b/src/being.h index 0b9257e83..859ebf26c 100644 --- a/src/being.h +++ b/src/being.h @@ -769,6 +769,12 @@ class Being : public ActorSprite, public ConfigListener void updatePercentHP(); + void setRaceName(std::string name) + { mRaceName = name; } + + std::string getRaceName() + { return mRaceName; } + protected: /** * Sets the new path for this being. @@ -804,6 +810,7 @@ class Being : public ActorSprite, public ConfigListener Uint8 mSpriteDirection; /**< Facing direction */ std::string mName; /**< Name of character */ + std::string mRaceName; std::string mPartyName; std::string mGuildName; diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 19db5540a..b65068dc5 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -62,7 +62,7 @@ DebugWindow::DebugWindow(): setSaveVisible(true); setStickyButtonLock(true); - setDefaultSize(400, 150, ImageRect::CENTER); + setDefaultSize(400, 300, ImageRect::CENTER); mTabs = new TabbedArea; mMapWidget = new MapDebugTab; @@ -269,9 +269,10 @@ TargetDebugTab::TargetDebugTab() mTargetLabel = new Label(strprintf("%s ?", _("Target:"))); mTargetIdLabel = new Label(strprintf("%s ? ", _("Target Id:"))); - mTargetLevelLabel = new Label(strprintf("%s ?", _("Target Level:"))); - mTargetPartyLabel = new Label(strprintf("%s ?", _("Target Party:"))); - mTargetGuildLabel = new Label(strprintf("%s ?", _("Target Guild:"))); + mTargetLevelLabel = new Label(strprintf("%s ?", _("Target level:"))); + mTargetRaceLabel = new Label(strprintf("%s ?", _("Target race:"))); + mTargetPartyLabel = new Label(strprintf("%s ?", _("Target party:"))); + mTargetGuildLabel = new Label(strprintf("%s ?", _("Target guild:"))); mAttackDelayLabel = new Label(strprintf("%s ?", _("Attack delay:"))); mMinHitLabel = new Label(strprintf("%s ?", _("Minimal hit:"))); mMaxHitLabel = new Label(strprintf("%s ?", _("Maximum hit:"))); @@ -280,12 +281,13 @@ TargetDebugTab::TargetDebugTab() place(0, 0, mTargetLabel, 2); place(0, 1, mTargetIdLabel, 2); place(0, 2, mTargetLevelLabel, 2); - place(0, 3, mAttackDelayLabel, 2); - place(0, 4, mTargetPartyLabel, 2); - place(0, 5, mTargetGuildLabel, 2); - place(0, 6, mMinHitLabel, 2); - place(0, 7, mMaxHitLabel, 2); - place(0, 8, mCriticalHitLabel, 2); + place(0, 3, mTargetRaceLabel, 2); + place(0, 4, mAttackDelayLabel, 2); + place(0, 5, mTargetPartyLabel, 2); + place(0, 6, mTargetGuildLabel, 2); + place(0, 7, mMinHitLabel, 2); + place(0, 8, mMaxHitLabel, 2); + place(0, 9, mCriticalHitLabel, 2); place.getCell().matchColWidth(0, 0); place = h.getPlacer(0, 1); @@ -315,6 +317,9 @@ void TargetDebugTab::logic() _("Target Level:"))); } + mTargetRaceLabel->setCaption(strprintf("%s %s", + _("Target race:"), target->getRaceName().c_str())); + mTargetPartyLabel->setCaption(strprintf("%s %s", _("Target Party:"), target->getPartyName().c_str())); diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index ff86eaf74..8be6f1220 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -82,6 +82,7 @@ class TargetDebugTab : public DebugTab Label *mTargetLabel; Label *mTargetIdLabel; Label *mTargetLevelLabel; + Label *mTargetRaceLabel; Label *mTargetPartyLabel; Label *mTargetGuildLabel; Label *mAttackDelayLabel; diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 25403e544..1964b974d 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -135,7 +135,13 @@ StatusWindow::StatusWindow(): setSaveVisible(true); setStickyButtonLock(true); setDefaultSize((windowContainer->getWidth() - 480) / 2, - (windowContainer->getHeight() - 500) / 2, 480, 500); + (windowContainer->getHeight() - 500) / 2, 480, 500); + + if (player_node && !player_node->getRaceName().empty()) + { + setCaption(strprintf("%s (%s)", player_node->getName().c_str(), + player_node->getRaceName().c_str())); + } // ---------------------- // Status Part -- cgit v1.2.3-70-g09d2 From 4b9b559e914b7f46dccc6fd4db46f5f95e67e477 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 16 Feb 2012 21:53:59 +0300 Subject: Update liberation and mplus fonts. --- data/fonts/liberationsans-bold.ttf | Bin 136664 -> 137284 bytes data/fonts/liberationsans.ttf | Bin 139036 -> 139644 bytes data/fonts/liberationsansmono-bold.ttf | Bin 105428 -> 105616 bytes data/fonts/liberationsansmono.ttf | Bin 108140 -> 108476 bytes data/fonts/mplus-1p-bold.ttf | Bin 1295104 -> 1328708 bytes data/fonts/mplus-1p-regular.ttf | Bin 1296064 -> 1329316 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/data/fonts/liberationsans-bold.ttf b/data/fonts/liberationsans-bold.ttf index 46928192e..e9a9aa5e5 100644 Binary files a/data/fonts/liberationsans-bold.ttf and b/data/fonts/liberationsans-bold.ttf differ diff --git a/data/fonts/liberationsans.ttf b/data/fonts/liberationsans.ttf index 09329b2bf..e735ae664 100644 Binary files a/data/fonts/liberationsans.ttf and b/data/fonts/liberationsans.ttf differ diff --git a/data/fonts/liberationsansmono-bold.ttf b/data/fonts/liberationsansmono-bold.ttf index 35c42bb6b..e7fbbe636 100644 Binary files a/data/fonts/liberationsansmono-bold.ttf and b/data/fonts/liberationsansmono-bold.ttf differ diff --git a/data/fonts/liberationsansmono.ttf b/data/fonts/liberationsansmono.ttf index cf17ca6eb..20b0593bb 100644 Binary files a/data/fonts/liberationsansmono.ttf and b/data/fonts/liberationsansmono.ttf differ diff --git a/data/fonts/mplus-1p-bold.ttf b/data/fonts/mplus-1p-bold.ttf index f26632e87..377d04987 100644 Binary files a/data/fonts/mplus-1p-bold.ttf and b/data/fonts/mplus-1p-bold.ttf differ diff --git a/data/fonts/mplus-1p-regular.ttf b/data/fonts/mplus-1p-regular.ttf index 31a56b30b..d809f4f8f 100644 Binary files a/data/fonts/mplus-1p-regular.ttf and b/data/fonts/mplus-1p-regular.ttf differ -- cgit v1.2.3-70-g09d2 From 451d1e9a31349921ab40d88fbc3f4e71763d87d5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 16 Feb 2012 22:15:01 +0300 Subject: Adjust gui response cycle to 40 times. --- src/client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index fa8f032fa..6e80a46d6 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -866,7 +866,7 @@ int Client::gameExec() Net::getGeneralHandler()->flushNetwork(); int k = 0; - while (lastTickTime != tick_time && k < 2) + while (lastTickTime != tick_time && k < 40) { if (gui) gui->logic(); -- cgit v1.2.3-70-g09d2 From 29118fed4a93dfc69370d20fb1459b86df57199e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 17 Feb 2012 00:10:23 +0300 Subject: Update and rebuild translations. --- po/cs.po | 606 ++++++++++++++++++++++++---------------------- po/de.po | 612 ++++++++++++++++++++++++---------------------- po/es.po | 606 ++++++++++++++++++++++++---------------------- po/fi.po | 606 ++++++++++++++++++++++++---------------------- po/fr.po | 737 +++++++++++++++++++++++++++++--------------------------- po/id.po | 606 ++++++++++++++++++++++++---------------------- po/ja.po | 636 +++++++++++++++++++++++++----------------------- po/manaplus.pot | 602 +++++++++++++++++++++++---------------------- po/nl_BE.po | 606 ++++++++++++++++++++++++---------------------- po/pl.po | 644 +++++++++++++++++++++++++------------------------ po/pt.po | 646 +++++++++++++++++++++++++------------------------ po/pt_BR.po | 650 +++++++++++++++++++++++++------------------------ po/ru.po | 608 ++++++++++++++++++++++++---------------------- po/zh_CN.po | 606 ++++++++++++++++++++++++---------------------- 14 files changed, 4563 insertions(+), 4208 deletions(-) diff --git a/po/cs.po b/po/cs.po index 8759c9040..04efb42e9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" "PO-Revision-Date: 2012-02-02 16:45+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/" @@ -21,69 +21,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Viditelný na mapě" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "úskočil" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "minul" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Nastavení" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Výkon" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Připojuji se k serveru" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Přihlašuji se" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Vstupuji do herního světa" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Požaduji postavy" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Připojuji se k hernímu serveru" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Zaměňuji herní servery" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,63 +97,63 @@ msgstr "Zaměňuji herní servery" msgid "Error" msgstr "Chyba" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Požaduji registrační detaily" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Změna hesla" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Heslo úspěšně změněno!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Změna emailu" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Email úspěšně změněn!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Zrušení registrace úspěšné" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Nashledanou, vraťte se kdykoli..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Neplatný host updatů: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Chyba při vytváření adresáře s updaty!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Neznámý příkaz." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Nelze zaslat prázdné šeptání!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,105 +162,105 @@ msgstr "" "Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo " "jsi to ty." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Chybí jméno party." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Chybí jméno guildy." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Prosím zadej jméno." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Enter přepíná chat." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Zpráva zavírá chat." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Enter nyní přepíná chat." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Zpráva nyní ukončuje chat." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "přítel" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "přehlížený" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutrální" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Hráč je již %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Hráč byl úspěšně zařazen jako %s!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Hráč nemůže být zařazen jako %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Hráč nebyl ignorován!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Hráč již není ignorován!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Hráč nemůže být odignorován!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Hráč již byl vymazán!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Hráč byl úspěšně vymazán!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Hráč nemůže být vymazán!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Doba běhu klienta: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -264,7 +268,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" @@ -272,7 +276,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -280,7 +284,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -288,7 +292,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -296,27 +300,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "velikost chache fontů" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Velikost cache:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Vytvořeno:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Odstraněno:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "" @@ -386,36 +390,36 @@ msgstr "Pvp hodnost: %d" msgid "Comment: %s" msgstr "Komentář: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Ověřovač botů" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Jméno" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Útok" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Mluvit" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Výsledek" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Vynulovat" @@ -439,7 +443,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "" @@ -447,7 +451,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "" @@ -459,8 +463,8 @@ msgid "Quit" msgstr "Ukončit" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Vše" @@ -663,7 +667,7 @@ msgid "Enter password:" msgstr "Zadej heslo:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Smazat" @@ -739,7 +743,7 @@ msgstr "duhová 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -751,12 +755,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Přítomno: %s; %d hráčů je přítomno." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Šeptání pro %s: %s" @@ -855,62 +859,80 @@ msgstr "Počet textur:" msgid "Particle count: %d" msgstr "poet částic: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Cíl:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Id cíle:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Úroveň cíle:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Typ cíle:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Parta cíle:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Gilda cíle:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Prodleva útoku:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Minimální zásah:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Maximální zásah:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Kritický zásah:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Úroveň cíle:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Parta cíle:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Gilda cíle:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Příchozí: %d bytes/s" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Odchozí: %d bytes/s" @@ -1406,7 +1428,7 @@ msgstr "Odignorovat" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Kompletně ignorovat" @@ -1669,7 +1691,7 @@ msgstr "Zobrazit" msgid "Reset yellow bar" msgstr "Resetovat žlutý pruh" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Zkopírovat do chatu" @@ -1757,28 +1779,28 @@ msgstr "Přidat" msgid "Edit" msgstr "Upravit" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Stahuji seznam serverů...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Čekám na odezvu serveru..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Připravuji stažení" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Chyba při získávání seznamu serverů!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "potřebuje novější verzi" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "potřebuje v%s" @@ -2311,55 +2333,59 @@ msgstr "Zobrazovat IP adresy ve snímcích obrazovky" msgid "Allow self heal with mouse click" msgstr "Povolit léčení sebe sama kliknutím myši" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Vztahy" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutrální" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Přítel" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Přehlížený" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ignorovaný" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Vymazán" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Povolit obchodování" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Povolit šeptání" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Starý" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Vztahy" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Když ignoruji:" @@ -2943,50 +2969,50 @@ msgstr "Zvolte jméno vaší party." msgid "Specials" msgstr "" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Úroveň: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Peníze: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Práce: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Práce:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Bodů postavy: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Úroveň: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "" @@ -3303,23 +3329,23 @@ msgstr "Hranice domácího místa" msgid "Road Point" msgstr "Bod cesty" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Kdo je online - Obnovuji" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Obnovit" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Kdo je online - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Kdo je online - chyba" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "" @@ -4023,42 +4049,42 @@ msgstr "" "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může " "chovat podivně." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Snažili jste se sebrat neexistující předmět." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Předmět je příliš těžký." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Předmět je příliš daleko." -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "Inventář je plný." -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "Hromada je příliš velká." -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Předmět patří někomu jinému." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Neznámý problém při pokusu sebrat předmět." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4066,398 +4092,398 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 #, fuzzy msgid "xp" msgstr "Exp:" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 #, fuzzy msgid "job" msgstr "pruh práce" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) výchozí pohyby" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) invertované pohyby" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) pohyby s trochou šílených pohybů" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) pohyby s šílenými pohyby" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) dvojité normální + šílené" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) vlastní šílené pohyby" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) šílené pohyby" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) výchozí pohyb k cíli" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) pohyb k cíli do vzdálenosti 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) pohyb k cíli do vzdálenosti 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) pohyb k cíli do vzdálenosti 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) pohyb k cíli do vzdálenosti 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) pohyb k cíli do vzdálenosti 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) pohyb k cíli na útočný dosah" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) pohyb k cíli" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) výchozí následování" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) relativní následování" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) zrcadlené následování" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) neznámé následování" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) útok" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) výchozí útok" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) přepínat útok bez štítu" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) přepínat útok se štítem" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) jdi a útoč" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) jdi, útoč, sbírej" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) bez automatického útoku" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) malý sběr 1x1 pole" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) výchozí sběr 2x1 pole" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) sběr před 2x3 pole" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) sběr 3x3 pole" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) jdi a seber do vzdálenosti 4" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) jdi a seber do vzdálenosti 8" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) jdi a seber do max. vzdálenosti" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) sběr" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) Normální zobrazení mapy" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) debug zobrazení mapy" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) ultra zobrazení mapy" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) ultra zobrazení mapy 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) zobrazen prázdné mapy" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) zobrazení černobílé mapy" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) použij #flar pro magický útok" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) použij #chiza pro magický útok" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) použij #ingrav pro magický útok" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) použij #frillyar pro magický útok" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) použij #upmarmu pro magický útok" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) magický útok attack" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) výchozí imitace" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) imitace výstroje" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) imitace" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) u počítače" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) pryč (away)" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) away" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) mód herní kamery" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) mód volné kamery" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Modifikátory hry jsou zapnuty" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Modifikátory hry jsou vypnuty" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Následování zrušeno." -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitace zrušena." -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Vidíte " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Nastavení:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4923,31 +4949,31 @@ msgstr "%s opustil vaši partu." msgid "An unknown member tried to say: %s" msgstr "Neznámý člen se snažil říct: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Jste mrtev." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "S lítostí vám oznamujeme, že vaše postava byla zabita v bitvě." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Nejste již více naživu." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "Chladné ruce smrti se natahují po vaší duši." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Konec hry!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Vložte minci pro pokračování." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4955,80 +4981,80 @@ msgstr "" "Ne, děti. Vaše postava ve skutečnosti neumřela. Ona.. errm.. odešla na lepší " "místo." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "Váš plán zničit nepříteli zbraň pomocí úderů vlastním krkem selhal." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Tuším že to nešlo tak hladce." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Chcete zaevidovat váš majetek?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Žel, nezbyla po vás ani stopa..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Zničen." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Vypadá to, že vám někdo podává vaši hlavu." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" "Zase jste to podělal. Spláchněte vaše tělo do záchodu a najdete si nějaké " "jiné." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Ještě nejste mrtev. Zatím jen odpočíváte." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Již nejste." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Bylo vám odepřeno být." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Expiroval jste a šel jste navštívit svého tvůrce." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Jste tuhý." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Jste zbaven života, odpočívejte v pokoji." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Kdybyste nebyl tak animovaný, čuchal by jste ke květinkám zespoda." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "vaše metabolické procesy jsou nyní historií." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Padl jste." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "A je to v kýblu." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5036,43 +5062,43 @@ msgstr "" "Vaše trápení je u konce, opona je stažená a vy jste se připojil k vašemu " "neviditelnému sboru." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "nyní jste bývalý hráč." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Zpráva" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "Nesete více než polovinu vaší váhy. Obnovování života nyní není možné." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "Nesete méně než polovinu vaší váhy. Obnovování života je nyní možné." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Sebral jste %s." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "utratil jste %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "Nelze zlepšit tuto dovednost!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "nejdřív se vybavte šípy." @@ -5643,19 +5669,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "" diff --git a/po/de.po b/po/de.po index 40a2199df..8943216f0 100644 --- a/po/de.po +++ b/po/de.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" -"PO-Revision-Date: 2012-02-05 23:09+0000\n" -"Last-Translator: Andrei Karas \n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" +"PO-Revision-Date: 2012-02-06 18:34+0000\n" +"Last-Translator: Philipp \n" "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/" "de/)\n" "Language: de\n" @@ -25,69 +25,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Sichtbar au der Karte" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "ausweichen" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "verfehlt" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Einstellungen" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Leistung" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Themen" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Verbinde zum Server" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Anmelden" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Betrete die Spielwelt" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Spielfiguren werden angefragt" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Verbinde zum Charakterserver" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Charakterserver wechseln" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -97,64 +101,64 @@ msgstr "Charakterserver wechseln" msgid "Error" msgstr "Fehler" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Anfrage der Registrierungsdetails" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Passwort ändern" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Passwort erfolgreich geändert!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "E-Mail ändern" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "E-Mail erfolgreich geändert!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "erfolgreich abgemeldet." -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Leb wohl und komme jeder Zeit wieder..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s existiert nicht und kann nicht erstellt werden! Beende." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Ungültiger Updateserver: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" "Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Unbekannter Befehl." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Kann keine leeren Nachrichten versenden!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -163,160 +167,160 @@ msgstr "" "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, " "oder du bist es selbst." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Anfrage den Kanal %s betreten zu dürfen." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Name der Party fehlt." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Name der Gilde fehlt." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Bitte gib einen Namen an." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Nachricht schließt den Chat." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Enter aktiviert jetzt den Chat." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Nachricht schließt jetzt den Chat." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "Freund" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "unbeachtet" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Spieler ist bereits %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Spieler erfolgreich %s!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Spieler konnte nicht %s werden!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Spieler wurde nicht ignoriert!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Spieler wird nicht länger ignoriert!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "Feind" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Spieler ist bereits gelöscht!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Spieler erfolgreich gelöscht!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Spieler konnte nicht gelöscht werden!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Client läuft seit: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "Schrift-Cache Größe" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Cache-Größe:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Erstellt:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Gelöscht:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Bild-Quellen:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "" @@ -387,36 +391,36 @@ msgstr "Pvp Rang: %d" msgid "Comment: %s" msgstr "Kommentar: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Bot-Prüfer" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Name" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Angriff" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Sprechen" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Bewegen" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Resultat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Zurücksetzten" @@ -440,7 +444,7 @@ msgstr "Menge" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -448,7 +452,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -460,8 +464,8 @@ msgid "Quit" msgstr "Beenden" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Max" @@ -664,7 +668,7 @@ msgid "Enter password:" msgstr "Gib dein Passwort ein:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Löschen" @@ -740,7 +744,7 @@ msgstr "Regenbogen 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -752,12 +756,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Anwesend: %s ;%d Spieler sind anwesend." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Flüsternd zu %s: %s" @@ -856,62 +860,80 @@ msgstr "Texturanzahl:" msgid "Particle count: %d" msgstr "Partikelzählung: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Ziel:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Ziel ID:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Ziel level:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Art des Anvisierens:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Ziel Party:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Ziel Gilde:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Attackier-Verzögerung:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Minimaler Treffer" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Maximaler Treffer" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Kritischer Treffer" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Ziel level:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Ziel Party:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Ziel Gilde:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Eingehend: %d bytes/s" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Ausgehend: %d bytes/s" @@ -1301,7 +1323,7 @@ msgstr "NPC" #: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633 msgid "Clear" -msgstr "Frei" +msgstr "Leeren" #: src/gui/npcpostdialog.cpp:48 msgid "To:" @@ -1405,7 +1427,7 @@ msgstr "Nicht mehr Ignorieren" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "@@ignore|Ignoriere %s komplett@@" @@ -1668,7 +1690,7 @@ msgstr "Zeigen" msgid "Reset yellow bar" msgstr "Setze gelben Balken zurück" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Kopiere zu Chat" @@ -1756,28 +1778,28 @@ msgstr "Hinzufügen" msgid "Edit" msgstr "Ändern" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Lade Serverliste herunter...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Warte auf den Server" -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Download wird vorbereitet" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Fehler beim Empfangen der Serverliste!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "benötigt eine neuere Version" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "benötigt v%s" @@ -2311,55 +2333,59 @@ msgstr "IP auf Screenshots anzeigen." msgid "Allow self heal with mouse click" msgstr "Erlaube Selbstheilung mittels Mausklick" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Beziehung" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutral" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Freund" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Unbeachtet" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ignoriert" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Gelöscht" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Feind" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Handeln erlauben" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Flüstern erlauben" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Alt" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Beziehungen" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Wenn ignorierend:" @@ -2948,50 +2974,50 @@ msgstr "Name deiner Party wählen." msgid "Specials" msgstr "Special" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Stufe: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Geld: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "HP:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Job: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Job:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Charakterpunkte: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Level: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Korrekturpunkte: %d" @@ -3310,23 +3336,23 @@ msgstr "Stamm platz Grenze" msgid "Road Point" msgstr "Wegpunkt" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Wer ist Online - Aktualisiere" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Aktualisierung" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Wer ist Online -" -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Wer ist Online - Fehler" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Wer ist Online - Aktualisiere" @@ -4037,438 +4063,438 @@ msgstr "" "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder " "das Spiel lässt sich nicht richtig steuern." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Du wurdest von einem %s getötet" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Du versucht einen nicht exitierenden Gegenstand aufzuheben." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Gegenstand ist zu schwer" -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Gegenstand ist zu weit weg." -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "Inventar ist voll" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "Stapel ist zu groß" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Gegenstand gehört jemand anderem" -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Fehler bei dem Aufheben des Items." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben." msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" msgstr "" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) normale Bewegungen" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) bewegungen umkehren" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) bewegt sich etwas verrückt" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) bewegt sich verrückt" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) normal + verrückt Bewegen" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) unbekannte Bewegung" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) benutzerdefinierte verrückte Bewegung" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) verrückte Bewegung" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) bewegt sich normal zum Ziel" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(0) bewegt sich zum Ziel in Distanz 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) bewegt sich zum Ziel in Distanz 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) bewegt sich zum Ziel in Distanz 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) bewegt sich zum Ziel in Distanz 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) bewegt sich zum Ziel in Distanz 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) bewegt sich zum Ziel in Reichweite" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) Bogenschützen Angriffsreichweite" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) bewegt sich zu jedem Ziel" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) normales Folgen" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) relatives Folgen" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) gespiegeltes Folgen" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) hinterher Folgen" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) unbekannter Folge-Modus" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) Angriff" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) Normaler Angriff" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) wechsel das Attackenlayout ohne Schild" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) wechsel das Attackenlayout mit Schild" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) gehe und greife an" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) gehe, greife an, hebe auf" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) ohne automatischen Angriff" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) kleine aufhebe Zelle 1x1" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) normale aufhebe Zelle 2x1" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) 2x3 Kästchen nach vorne aufheben" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) 3x3 Kästchen aufheben" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) bis Distanz 4 gehen und aufheben" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) bis Distanz 8 gehen und aufheben" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) bis zur maximalen Distanz aufheben" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) aufheben" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) Normale Kartenansicht" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) Debug Kartenansicht" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) Ultra Kartenansicht" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) Ultra Kartenansicht 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) Leere Kartenansicht" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) Schwarz-Weiß Kartenansicht" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) benutze #flar als magischen Angriff" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) benutze #chiza als magischen Angriff" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) benutze #ingrav als magischen Angriff" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) benutze #frillyar als magischen Angriff" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) benutze #upmarmu als magischen Angriff" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) magischer Angriff" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) greife alle Spieler an" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) greife schlechte Beziehungen an" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) greife keine Spieler an" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) PVP Attacke" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) normale Imitation" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) Outfit Imitation" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) Imitation" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Abwesend" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) Anwesend" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) Abwesend" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) Abwesend" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) spielerverfolgende Kamera" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) freie Kamera" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Spielmodifikatoren sind aktiviert" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Spielmodifikatoren sind deaktiviert" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Folgen:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Folgen abgebrochen" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitation abgebrochen" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Du siehst" -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [options] [manaplus-file]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Optionen:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr "-l --log-file : Log Datei benutzen" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Verzeichnis für die Chat Log" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Die Version des Spieles anzeigen" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " - --help : Zeigt diesen Hilfstext an" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : zu benutzendes Einstellungsverueichniss" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Mit angegebenem Benutzernamen anmelden" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : Angegebenes Passwort benutzen" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --charakter : Mit angegebenem Spieler anmelden" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Name oder IP-Adresse des Loginservers" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Port des Loginservers" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Benutzt diesen Aktualisierungs Host" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Wähle zuletzt benutzten Server und Spieler aus" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Überspringe das Herunterladen von Updates" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Verzeichnis um Bildschirmfotos zu speichern" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr "--safemode : Starte das Spiel im sicheren Modus" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr "--no-opengl : Deaktiviere OpenGL für diese Sitzung" @@ -4941,32 +4967,32 @@ msgstr "%s hat deine Party verlassen" msgid "An unknown member tried to say: %s" msgstr "Ein unbekanntes Mitglied hat versucht zu sagen: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Ach ja: Du bist Tot." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "" "Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Du bist nicht länger lebendig." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Game Over!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Werfe eine Münze ein um Weiterzuspielen." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4974,7 +5000,7 @@ msgstr "" "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem " "besserem Ort gegangen." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." @@ -4982,123 +5008,123 @@ msgstr "" "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider " "nicht ganz so genial, wie Du dachtest..." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Ich glaube, das war nicht so gut." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Möchtest du eine Auflistung Deiner Verletzungen?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Leider wurde niemals eine Spur von Dir gefunden..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Vernichtet." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Sieht aus, als würde Dein Kopf Dich anschauen." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" "Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir ein " "paar Neue." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Du bist nicht Tod, du ruhst dich nur aus." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Du bit tot." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Du bist nicht mehr..." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Deine Zeit ist abgelaufen. Zeit deinem Schöpfer gegenüberzutreten." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Du bist eine Leiche." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Deines Lebens beraubt, ruhst du in Frieden." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" "Wenn sie nicht so unvorsichtig gewesen währen, könnten sie die Radischen " "noch von oben sehen." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Deine metabolischen Prozesse sind nun Geschichte." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Du bist weg vom Fenster." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "" "Du schaust dir die Gänseblümchen\n" "gerade von unten an." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." msgstr "\"Übung macht den Meister\", meint das Monster." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Du bist ein Ex-Spieler" -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Du schmachst an den Fjorden" -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Nachricht" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine " "Gesundheit nicht mehr regenerieren." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Du trägst weniger als die hälfte des Gewichts. Du kannst dich regenerieren." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Du hast %s aufgehoben." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Du bezahltest %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "Kann diese Fähigkeit nicht aufwerten!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Rüste dich erst mit Pfeilen aus." @@ -5676,19 +5702,19 @@ msgstr "Verbindung mit Server abgebrochen. " msgid "%s is not in your party!" msgstr "%s ist nicht in Deiner Party!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Drucke '..'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Blinkender Name" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Schwebende '...' Blase" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Schwebende Blase" diff --git a/po/es.po b/po/es.po index cdbb59b52..94da72cba 100644 --- a/po/es.po +++ b/po/es.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" "PO-Revision-Date: 2012-02-05 23:20+0000\n" "Last-Translator: Nelson Martell \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" @@ -23,69 +23,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Visible sobre el mapa" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "evade" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "falla" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuración" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Rendimiento" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vídeo" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Temas" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Conectando al servidor" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Accediendo a la cuenta" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Entrando al mundo del juego" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Cargando personajes" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Conectando al servidor del juego" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Cambiando servidores del juego" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,63 +99,63 @@ msgstr "Cambiando servidores del juego" msgid "Error" msgstr "Error" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Solicitando detalles de registro" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Cambio de contraseña" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "¡Contraseña cambiada exitosamente!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Cambio de Email" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "¡Email modificado exitosamente!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Registro cancelado" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Adiós, vuelve cuando quieras..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "¡%s no existe y no puede ser creado! Saliendo." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Servidor de actualización inválido: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "¡Error al crear la carpeta de actualizaciones!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Comando desconocido." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "¡No puedes enviar susurros vacíos!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,160 +164,160 @@ msgstr "" "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya " "existe, o eres tú." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando la entrada del canal %s." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta el nombre del grupo." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Falta el nombre del Clan." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Por favor, especifique un nombre." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Volver a alternar el chat." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Mensaje cierra la charla." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Volver ahora a cambiar de chat." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Mensaje ahora cierra el chat." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "desatendido" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "¡Jugador ya es %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "¡Jugador %s exitosamente!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "¡Jugador no pudo ser %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "El jugador no estaba ignorado!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "¡El jugador ya no es ignorado!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "¡Al jugador no se le puede dejar de ignorar!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "en la lista negra" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "enemigo" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "¡Jugador ya borrado!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "¡Jugador borrado con éxito!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "¡Jugador no pudo ser borrado!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Tiempo de actividad del cliente: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d día" msgstr[1] "%d días" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "tamaño de caché de fuente" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Tam. caché:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Creado:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Borrado:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Imágenes de recurso:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "Imágenes de recurso huérfano:" @@ -384,36 +388,36 @@ msgstr "Rango PVP: %d" msgid "Comment: %s" msgstr "Comentario: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Bot Checker" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Nombre" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Hablar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Mover" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Restablecer" @@ -437,7 +441,7 @@ msgstr "Cantidad:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -445,7 +449,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -457,8 +461,8 @@ msgid "Quit" msgstr "Salir" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Máximo" @@ -661,7 +665,7 @@ msgid "Enter password:" msgstr "Ingrese contraseña:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Borrar" @@ -737,7 +741,7 @@ msgstr "arco iris 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -749,12 +753,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jugadores están presentes." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Susurrando a %s: %s" @@ -853,62 +857,80 @@ msgstr "Contador de Texturas:" msgid "Particle count: %d" msgstr "Recuento de partículas: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Objetivo:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Id de Objetivo:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Nivel del Objetivo:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Tipo de objetivo:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Grupo del Objetivo:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Clan del Objetivo:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Retraso de ataque:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Golpe mínimo:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Golpe máximo:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Golpe crítico:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Nivel del Objetivo:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Grupo del Objetivo:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Clan del Objetivo:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Recibiendo: %d bytes/s" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Enviando: %d bytes/s" @@ -1403,7 +1425,7 @@ msgstr "Des-ignorar" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Ignorar completamente" @@ -1666,7 +1688,7 @@ msgstr "Mostrar" msgid "Reset yellow bar" msgstr "Restablecer barra amarilla" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Copiar al chat" @@ -1754,28 +1776,28 @@ msgstr "Añadir" msgid "Edit" msgstr "Editar" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Bajando la lista de servidores...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Esperando al servidor..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Preparando la descarga" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "¡Error al recuperar la lista de servidores!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "requiere una versión mas nueva" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "requiere v%s" @@ -2309,55 +2331,59 @@ msgstr "Mostrar dirección IP en la captura de pantalla" msgid "Allow self heal with mouse click" msgstr "Permitir curarse a sí mismo con clic del ratón" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Relación" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutral" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Amigo" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Desatendido" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ignorado" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Borrado" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "En la lista negra" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Enemigo" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Permitir intercambios" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Permitir mensajes privados" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Viejo" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Relaciones" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Cuando se ignora a alguien:" @@ -2941,50 +2967,50 @@ msgstr "Escoge el nombre del grupo." msgid "Specials" msgstr "Especiales" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Nivel: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Dinero: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "HP:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Trabajo: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Trabajo:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Puntos del personaje: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Nivel: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Puntos de corrección: %d" @@ -3303,23 +3329,23 @@ msgstr "Limites de Lugar de Inicio" msgid "Road Point" msgstr "Mostrar camino" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Quién está conectado - Actualizando" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Actualizar" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Quienes están conectados - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Quienes están conectados - error" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Quienes están conectados - Actualizar" @@ -4027,439 +4053,439 @@ msgstr "" "Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego " "puede presentar un comportamiento raro." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Fuiste eliminado por %s" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Intentaste recoger un objeto inexistente." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "El artículo es muy pesado." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "El artículo está muy lejos." -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "El inventario está lleno." -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "El agrupamiento es demasiado grande." -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "El artículo pertenece a alguien más." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Problema desconocido al intentar recoger el artículo." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Recogiste un %d [@@%d|%s@@]." msgstr[1] "Recogiste unos %d [@@%d|%s@@]." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" msgstr "xp" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "trabajo" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) moverse predeterminado" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) moverse invertido" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) moverse con algunos movimientos locos" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) moverse con movimientos locos" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) doble normal + loco" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) movimiento desconocido" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) movimiento loco número %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) maniobra alocada personalizada" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) maniobra loca" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) moverse por defecto hacia el objetivo" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) moverse al objetivo en distancia 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) moverse al objetivo en distancia 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) moverse al objetivo en distancia 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) moverse al objetivo en distancia 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) moverse al objetivo en distancia 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) desplazarse al objetivo en el rango de ataque" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) rango de ataque de arquero" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) mover al objetivo" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) seguimiento predeterminado" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) seguimiento relativo" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) seguimiento tipo espejo" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) seguimiento como mascota" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) seguimiento desconocido" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) atacar" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) ataque predeterminado" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) intercambiar ataque sin escudo" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) intercambiar ataque con escudo" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) ir y atacar" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) ir, atacar, recoger" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) sin atacar automáticamente" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) recoger a 1x1 celdas (pequeño)" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) recoger a 2x1 celdas (predeterminado)" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) recoger interesadamente a 2x3 celda" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) recoger a 3x3 celdas" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) ir y recoger en distancia 4" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) ir y recoger en distancia 8" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) ir y recoger a máxima distancia" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) recoger" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) vista normal del mapa" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) vista depurar del mapa" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) ultra vista del mapa" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) ultra vista del mapa 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) vista vacía del mapa" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) vista del mapa en blanco y negro" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) usar #flar para ataque mágico" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) usar #chiza para ataque mágico" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) usar #ingrav para ataque mágico" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) usar #frillyar para ataque mágico" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) usar #upmarmu para ataque mágico" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) ataque mágico" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) atacar a todos los jugadores" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "(f) atacar a todos, excepto a amigos" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) atacar a quienes están en malas relaciones" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) no atacar a los jugadores" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) ataque pvp" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) imitación predeterminada" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) imitación de conjuntos" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) imitación" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Fuera del Teclado" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) en el teclado" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) lejos del teclado" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) afuera" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) modo de cámara de juego" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) modo de cámara libre" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Modificadores del juego están habilitados" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Modificadores del juego están deshabilitados" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "Los modificadores del juego son desconocidos" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Seguir: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Imitación: " -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitación cancelada" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Ves " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opciones] [manaplus-file]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr " usado para establecer parámetros personalizados." -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr " al cliente manaplus." -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Opciones:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Archivo de registro a usar" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Directorio a usar para registro del Chat" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Muestra la versión" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Muestra la ayuda" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Carpeta de Configuración a usar" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Acceder con este nombre de usuario" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : Acceder con la contraseña" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character : Acceder con este jugador" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login server o IP" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Puerto del servidor" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Usar este host de actualización" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Escoje el personaje por defecto y el servidor" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Saltarse las actualizaciones" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Carpeta por donde cargar los datos del juego" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Carpeta para usar los datos locales" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Carpeta donde guardar los screenshots" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Iniciar el juego en modo seguro" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : Comenzar a probar controladores y auto configurar" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Deshabilita OpenGL en esta sesion" @@ -4939,31 +4965,31 @@ msgstr "%s dejó tu grupo." msgid "An unknown member tried to say: %s" msgstr "Un miembro desconocido intentó decir: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Estás muerto." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Ya no estás tan vivo." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "Las manos frías de la muerte se están apoderando de tu alma." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "¡Fin del Juego!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Inserta moneda para continuar." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4971,7 +4997,7 @@ msgstr "" "No, niños. Tu jugador no murió realmente. Sólo... eeeh... fue a un lugar " "mejor." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." @@ -4979,72 +5005,72 @@ msgstr "" "Parece que tu plan de romper las armas de tus enemigos golpeándolas con tu " "garganta falló." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Creo que esto no fue muy bien." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "¿Quieres que tus posesiones sean identificadas?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Desgraciadamente, nada de ti fue encontrado..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Aniquilado." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Parece que te tiraron tu cabeza a tus manos." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Tu no estás muerto aún... sólo estás descansando." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Tu ya no existes más." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Parece que dejaste de existir." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Has expirado e ido a ver al tu creador." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Eres un cadáver." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Despojado de la vida, descansas en paz." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Si no estuvieras tan animado, diría que estás muerto." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Tus procesos metabólicos son ya historia." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Estás fuera de tus botas." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "Te han echado a patadas." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5052,46 +5078,46 @@ msgstr "" "Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro " "de los invisibles." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Eres un ex-jugador." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Estas avanzando... hacia el barranco." -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Mensaje" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la " "salud." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Has recogido %s." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Has gastado %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "¡Imposible incrementar!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Equipar las flechas primero." @@ -5667,19 +5693,19 @@ msgstr "Conexión al servidor terminada. " msgid "%s is not in your party!" msgstr "¡%s no está en tu grupo!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Parpadear nombre" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Burbuja '...' flotante" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Burbuja Flotante" diff --git a/po/fi.po b/po/fi.po index c09731088..57d696fb3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" "PO-Revision-Date: 2012-02-05 23:09+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: LANGUAGE \n" @@ -19,69 +19,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Näkyvillä kartalla" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "väistö" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "huti" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "P" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "-" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Asetukset" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Tehokkuus" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Kuva" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Teemat" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Yhdistän palvelimeen" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Kirjaudun sisään" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Siirryn pelimaailmaan" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Pyydän hahmoja" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Yhdistän pelipalvelimeen" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Vaihdan pelipalvelinta" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -91,63 +95,63 @@ msgstr "Vaihdan pelipalvelinta" msgid "Error" msgstr "Virhe" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Pyydän rekisteröitymisen yksityiskohtia" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Salasanan vaihto" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Salasana vaihdettu onnistuneesti!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Sähköpostin vaihto" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Sähköpostiosoite vaihdettu onnistuneesti!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Tietojen poisto onnistui" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Näkemisiin, tule pian takaisin..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Epäkelpo päivitysosoite: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Päivityshakemistoa luodessa tapahtui virhe!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Tuntematon komento." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Et voi lähettää tyhjiä kuiskauksia!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -156,160 +160,160 @@ msgstr "" "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai " "käytit omaa nimeäsi." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Pyyntö liittyä kanavalle %s lähetetty." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ryhmän nimi puuttuu." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Killan nimi puuttuu." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Anna nimi." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Viesti sulkee keskustelun." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Nyt viesti sulkee keskustelun." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "ystävä" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "vaimennettu" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutraali" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Pelaaja on jo %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Pelaaja on nyt %s." -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Pelaajaa ei ollut jätetty huomiotta!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Pelaaja huomioidaan taas." -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Pelaajan uudelleenhuomiointi epäonnistui." -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "mustalistattu" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "vihollinen" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Pelaaja on jo pyyhitty!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Pelaaja pyyhitty." -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty." -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Ohjelma ollut käynnissä: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d viikon" msgstr[1] "%d viikkoa" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d päivän" msgstr[1] "%d päivää" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d tunnin" msgstr[1] "%d tuntia" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuutin" msgstr[1] "%d minuuttia" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunnin" msgstr[1] "%d sekuntia" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "kirjasinvälimuistin koko" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Välimuistin koko:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Luotu:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Poistettu:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Resurssikuvat:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "Orvot resurssikuvat:" @@ -381,36 +385,36 @@ msgstr "PvP-taso: %d" msgid "Comment: %s" msgstr "Kommentti: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Bottitutka" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Nimi" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Hyökkää" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Keskustele" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Liiku" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Tulos" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Nollaa" @@ -434,7 +438,7 @@ msgstr "Määrä:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -442,7 +446,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -454,8 +458,8 @@ msgid "Quit" msgstr "Sulje" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Max" @@ -658,7 +662,7 @@ msgid "Enter password:" msgstr "Salasana:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Poista" @@ -734,7 +738,7 @@ msgstr "sateenkaari 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -746,12 +750,12 @@ msgstr "???" msgid "Chat" msgstr "Keskustelu" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Läsnä: %s; %d pelaajaa paikalla." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Kuiskaat pelaajalle %s: %s" @@ -850,62 +854,80 @@ msgstr "Tekstuurien määrä:" msgid "Particle count: %d" msgstr "Hiukkasluku: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Kohde:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Kohteen tunniste:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Kohteen taso:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Kohdetyyppi:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Kohteen ryhmä:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Kohteen kilta:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Hyökkäysviive:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Minimivahinko:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Maksimivahinko:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Kriittinen osuma:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Kohteen taso:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Kohteen ryhmä:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Kohteen kilta:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Sisään: %d tavua/s" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Ulos: %d tavua/s" @@ -1399,7 +1421,7 @@ msgstr "Huomioi jälleen" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Jätä täysin huomiotta" @@ -1662,7 +1684,7 @@ msgstr "Näytä" msgid "Reset yellow bar" msgstr "Palauta oletusmuokkaimet (keltainen palkki)" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Kopioi keskusteluun" @@ -1750,28 +1772,28 @@ msgstr "Lisää" msgid "Edit" msgstr "Muokkaa" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Lataan palvelinluettelon...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Odotan palvelinta..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Valmistelen latausta" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Palvelinluettelon hakeminen epäonnistui!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "vaatii uudemman version" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "vaatii version %s" @@ -2306,55 +2328,59 @@ msgstr "Näytä IP-osoitteet kuvakaappauksissa" msgid "Allow self heal with mouse click" msgstr "Salli itsen parantaminen hiiren napsautuksella" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Relaatio" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutraali" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Ystävä" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Vaimennettu" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Huomiotta jätetty" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Pyyhitty" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "Mustalla listalla" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Vihollinen" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Salli kaupakäynti" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Salli kuiskaukset" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Vanha" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Suhteet" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Kun jätät huomiotta:" @@ -2936,50 +2962,50 @@ msgstr "Anna ryhmällesi nimi." msgid "Specials" msgstr "Erikoisuudet" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Taso: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Rahat: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "VP:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Kok:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Työ: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Työ:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Hahmopisteitä: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Taso: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Korjauspisteitä: %d" @@ -3296,23 +3322,23 @@ msgstr "Kotipaikan raja" msgid "Road Point" msgstr "Väyläpiste" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Kuka on linjoila - päivitän" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Päivitä" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Kuka on linjoilla - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Kuka on linjoilla - virhe" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Kuka on linjoilla - päivitä" @@ -4021,439 +4047,439 @@ msgstr "" "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; " "ole hyvä ja poista päällekkäisyydet. " -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Sinut tappoi %s." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Yritit poimia olemattoman tavaran." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Tavara on liian painava." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Tavara on liian kaukana." -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "Sinulla on liikaa tavaraa ennestään." -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "Kasa on liian suuri." -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Tavara kuuluu jollekulle muulle." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Tuntematon ongelma esti tavaran poimimisen." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu." msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" msgstr "" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) oletusliikkeet" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) käännetyt liikkeet" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) liikkuu osin villiliikkein" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) liikkuu villiliikkein" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) tuplaa tavallinen + villi" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) tuntematon liikkumistapa" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) villiliike nro %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) oma villiliike" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) villiliike" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) oletussiirtymä kohteen luo" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) siirry kohteen luo etäisyydellä 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) siirry kohteen luo etäisyydellä 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) siirry kohteen luo etäisyydellä 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) siirry kohteen luo etäisyydellä 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) siirry kohteen luo etäisyydellä 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) siirry kohteen luo hyökkäyskantamalla" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) jousiampujan hyökkäyskantama" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) siirry kohteen luo" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) oletusseuraaminen" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) suhteellinen seuraaminen" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) peilikuvaseuraaminen" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) lemmikkiseuraaminen" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) tuntematon seuraaminen" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) hyökkäys" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) oletushyökkäys" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) vaihda hyökkäystä, ei kilpeä" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) vaihda hyökkäystä, kilpi mukana" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) mene ja hyökkää" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) mene, hyökkää, poimi" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) ei automaattista hyökkäystä" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) pieni poiminta 1x1 ruutua" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) oletuspoiminta 2x1 ruutua" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) poiminta edestä 2x3 ruutua" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) poiminta 3x3 ruutua" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) mene ja poimi etäisyydellä 4" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) mene ja poimi etäisyydellä 8" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) mene ja poimi maksimietäisyydellä" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) poiminta" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) normaali karttanäkymä" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) debug-karttanäkymä" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) ultra-karttanäkymä" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) ultra-karttanäkymä 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) tyhjä karttanäkymä" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) mustavalkoinen karttanäkymä" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) #flar taikahyökkäyksenä" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) #chiza taikahyökkäyksenä" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) #ingrav taikahyökkäyksenä" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) #frillyar taikahyökkäyksenä" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) #upmarmu taikahyökkäyksenä" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) taikahyökkäys" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) hyökkää kaikkien pelaajien kimppuun" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) hyökkää jos huonot suhteet" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) älä hyökkää pelaajien kimppuun" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) pelaajien kanssa taistelu" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) oletusmatkinta" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) asun matkinta" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) matkinta" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Poissa" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) paikalla" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) poissa" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) poissaolo" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) pelin kameratila" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) vapaa kamera" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Pelimuokkaimet käytössä" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Pelimuokkaimet poissa käytöstä" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "Pelimuokkaimet ovat tuntemattomia" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Seuraa: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Seuraaminen keskeytetty" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Matki: " -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Matkiminen keskeytetty" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Näet " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [asetukset] [manaplus-tiedosto]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr " jolla asetetaan erikoisvalitsimia" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr " manaplus-ohjelmalle." -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Asetusvivut:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Käytettävä lokitiedosto" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Käytettävä keskustelulokihakemisto" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Näytä versionumero" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Näytä tämä ohje" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Käytä tätä asetushakemistoa" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Käyttäjätunnus sisäänkirjautumiseen" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : Salasana sisäänkirjautumiseen" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character : Hahmo sisäänkirjautumiseen" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr "" " -s --server : Palvelinnimi tai IP-osoite sisäänkirjautumiseen" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Palvelinportti sisäänkirjautumiseen " -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Käytä tätä päivityspalvelinta" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Aseta oletushahmopalvelin ja -hahmo" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Ohita päivityslataukset" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Lataa pelidata tästä hakemistosta" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Hakemisto paikallisdatan tallennukseen" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Kuvankaappausten tallennushakemisto" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Käynnistä peli vikasietotilassa" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr " -T --tests : Käynnistä ajuritestaus ja automaattiasetukset" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Poista OpenGL käytöstä tämän session ajaksi" @@ -4925,31 +4951,31 @@ msgstr "%s on eronnut ryhmästä." msgid "An unknown member tried to say: %s" msgstr "Tuntematon jäsen yritti sanoa: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Olet kuollut." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Et ole enää erityisen elossa." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "Tuonelasta käy sieluusi kylmä viima." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Se siitä!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Syötä kolikko jatkaaksesi." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4957,7 +4983,7 @@ msgstr "" "Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan " "paikkaan." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." @@ -4965,72 +4991,72 @@ msgstr "" "Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi " "epäonnistui." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Ei tainnut mennä kovin lujaa." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Pim! Olet annihiloitu." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Jäi näköjään oma pää vetävän käteen." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Et ole kuollut vielä, lepäät vain." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Olet lakannut olemasta." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Olet lähtenyt moikkaamaan luojaasi." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Raato mikä raato." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Olet eloton, mutta lepäät rauhassa." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Ellet olisi näin liikkuvainen, pukkaisit päivänkakkaraa." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Aineenvaihduntaprosessisi ovat historiaa." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Olet lopultakin nakkisuojassa." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "Potkaisit tyhjää." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5038,43 +5064,43 @@ msgstr "" "Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan " "jokeen." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Olet entinen pelaaja." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Kaipaat kotivuonoille." -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Viesti" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "%s poimittu." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Käytit %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "Taidon korottaminen epäonnistui!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Varusta ensin nuolia." @@ -5650,19 +5676,19 @@ msgstr "Yhteys palvelimeen katkaistu. " msgid "%s is not in your party!" msgstr "%s ei ole ryhmässäsi!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Tulosta '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Vilkuta nimeä" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Leijuva '...' -puhekupla" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Leijuva puhekupla" diff --git a/po/fr.po b/po/fr.po index c25cc010e..cb44a62e4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ # Translators: # Andrei Karas , 2011. # , 2011. -# Bernard , 2011. +# Bernard , 2011, 2012. # Jumpy , 2011. # , 2011, 2012. # Steel Style , 2012. @@ -13,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" -"PO-Revision-Date: 2012-02-05 23:09+0000\n" -"Last-Translator: Andrei Karas \n" -"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" +"PO-Revision-Date: 2012-02-15 09:56+0000\n" +"Last-Translator: Bernard \n" +"Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/" "fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -24,69 +24,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Visible sur la carte" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "esquivé" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "raté" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuration" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vidéo" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Thèmes" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Connexion au serveur" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Connexion" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Vous entrez dans un nouveau monde" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Téléchargement des personnages" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Connexion au serveur de jeu" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Changement de serveur de jeu" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -96,64 +100,64 @@ msgstr "Changement de serveur de jeu" msgid "Error" msgstr "Erreur" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Demande des paramètres d'inscription" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Changement de mot de passe" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Le mot de passe a été changé avec succès !" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Changer d'e-mail" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "L'adresse e-mail a été changée avec succès !" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Désinscription réussie" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "A bientôt, revenez quand vous voudrez..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Site de mise à jour invalide : %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Impossible de créer le dossier de mise à jour !" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Commande inconnue." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Vous ne pouvez pas envoyer de messages vides." -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -162,161 +166,161 @@ msgstr "" "Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s" "\". Soit elle existe déjà, soit il s'agit de vous même." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Demande de rejoindre le canal %s." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Le nom du groupe est manquant." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Le nom de la guilde est manquant." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Veuillez indiquer un nom." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "La touche ferme la ligne d'entrée du chat." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Le message ferme la conversation." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "" "La touche ferme maintenant la ligne d'entrée de la conversation." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Le message ferme maintenant la conversation." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "ami" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "écarté" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutre" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Joueur déjà %s !" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Joueur %s avec succès!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Le joueur n'a pas pu %s !" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Le joueur n'était pas ignoré !" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Le joueur n'est plus ignoré !" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "sous liste noire" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "ennemi" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Joueur déjà effacé !" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Joueur éliminé avec succès !" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "le joueur n'a pas pu être effacé !" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Heure de lancement du client : %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondes" msgstr[1] "%d secondes" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "Taille du cache de polices" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Dimension du cache :" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Créé : " -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Effacé :" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Images des ressources :" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "Images des ressources non affectées :" @@ -388,36 +392,36 @@ msgstr "Rang PvP : %d" msgid "Comment: %s" msgstr "Commentaire : %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Testeur de Robot" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Nom" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Attaquer" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Parler" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Déplacement" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Résultat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Réinitialiser" @@ -441,7 +445,7 @@ msgstr "Montant:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -449,7 +453,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -461,8 +465,8 @@ msgid "Quit" msgstr "Quitter" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Max." @@ -665,7 +669,7 @@ msgid "Enter password:" msgstr "Entrer le mot de passe :" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Supprimer" @@ -741,7 +745,7 @@ msgstr "arc en ciel 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -753,12 +757,12 @@ msgstr "???" msgid "Chat" msgstr "Conversation" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Présents : %s ; %d joueurs sont présents." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Message envoyé à %s : %s" @@ -857,62 +861,80 @@ msgstr "Comptage des trames :" msgid "Particle count: %d" msgstr "Effets de particules : %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Cible :" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Id de la Cible :" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Cibler un niveau :" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Type de cible" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Cibler un groupe :" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Cibler une guilde :" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Délai d'attaque :" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Coup Mini :" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Coup Max :" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Coup Critique :" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Cibler un niveau :" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Cibler un groupe :" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Cibler une guilde :" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Entrée : %d bytes/s" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Sortie : %d bytes/s" @@ -951,7 +973,7 @@ msgstr "Editer le Serveur" #: src/gui/editserverdialog.cpp:62 msgid "Address:" -msgstr "Addresse :" +msgstr "Adresse :" #: src/gui/editserverdialog.cpp:63 msgid "Port:" @@ -967,7 +989,7 @@ msgstr "Description :" #: src/gui/editserverdialog.cpp:175 msgid "Please at least type both the address and the port of the server." -msgstr "S'il te plait, entres la bonne adresse et le bon port du serveur." +msgstr "S'il vous plait, entrez l'adresse et le port du serveur." #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74 msgid "Equipment" @@ -1370,7 +1392,7 @@ msgstr "Éviter" #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 #: src/gui/popupmenu.cpp:717 msgid "Black list" -msgstr "Liste noir" +msgstr "Liste noire" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416 @@ -1406,7 +1428,7 @@ msgstr "Ne plus ignorer" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Ignorer complètement" @@ -1530,11 +1552,11 @@ msgstr "Enlever" #: src/gui/popupmenu.cpp:574 msgid "Warp" -msgstr "Télétransportation" +msgstr "Téléportation" #: src/gui/popupmenu.cpp:590 msgid "Clear outfit" -msgstr "Nettoyer les tenues" +msgstr "Effacer la tenue" #: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1669,7 +1691,7 @@ msgstr "Montrer" msgid "Reset yellow bar" msgstr "Remise aux valeurs de défaut de la barre jaune" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Copier dans la conversation" @@ -1757,28 +1779,28 @@ msgstr "Ajouter" msgid "Edit" msgstr "Éditer" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Téléchargement de la liste des serveurs...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "En attente du serveur..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Préparation du téléchargement" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Erreur lors du téléchargement de la liste de serveur !" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "requiert une nouvelle version" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "requiert la v%s" @@ -2005,7 +2027,7 @@ msgstr "Activer la manette de jeu" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "Continuer d'utiliser le joystick si la fenêtre est minimisée." +msgstr "Utiliser le joystick si la fenêtre est au second plan." #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -2017,7 +2039,7 @@ msgstr "Stop" #: src/gui/setup_joystick.cpp:149 msgid "Rotate the stick and dont press buttons" -msgstr "Tournez le manche et n'appuyer pas sur les boutons" +msgstr "Tournez le manche et n'appuyez pas sur les boutons" #: src/gui/setup_keyboard.cpp:80 msgid "Keyboard" @@ -2181,15 +2203,16 @@ msgstr "Enregistrer les conversations des PNJ" #: src/gui/setup_other.cpp:157 msgid "Bots support" -msgstr "Aide de bots" +msgstr "Support des bots" #: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" -msgstr "Activer le bot d'enchère" +msgstr "Activer le bot d'enchères" #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" -msgstr "Activer le bot de guilde et désactiver le support par défault" +msgstr "" +"Activer le support du bot de guilde et désactiver le support par défault" #: src/gui/setup_other.cpp:168 msgid "Enable server side attack" @@ -2221,7 +2244,7 @@ msgstr "Montrer le fond" #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" -msgstr "Meilleure Performance (Autoriser une meilleure performance)" +msgstr "Meilleure Performance (autoriser pour une meilleure performance)" #: src/gui/setup_perfomance.cpp:58 msgid "Auto adjust perfomance" @@ -2238,11 +2261,11 @@ msgstr "" #: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" -msgstr "Autoriser la réduction des cartes (Programme)" +msgstr "Autoriser la réduction des cartes (Logiciel)" #: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" -msgstr "Meilleure qualité (quitter pour une meilleure performance)" +msgstr "Meilleure qualité (désactiver pour une meilleure performance)" #: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" @@ -2251,7 +2274,7 @@ msgstr "" #: src/gui/setup_perfomance.cpp:77 msgid "Show beings transparency" -msgstr "Montrer les êtres en transparence" +msgstr "Montrer les créatures en transparence" #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." @@ -2259,15 +2282,15 @@ msgstr "Autoriser la réorganisation des cartes éléments de dessin" #: src/gui/setup_perfomance.cpp:83 msgid "Small memory (enable for lower memory usage)" -msgstr "Petite mémoire (autoriser pour une utilisation faible de la mémoire)" +msgstr "Petite mémoire (autoriser pour une utilisation moindre de la mémoire)" #: src/gui/setup_perfomance.cpp:86 msgid "Disable advanced beings caching (Software)" -msgstr "Disable advanced beings caching (Software)" +msgstr "Désactiver la mise en cache des créatures avancées (logiciel)" #: src/gui/setup_perfomance.cpp:89 msgid "Disable beings caching (Software)" -msgstr "Désactiver la mise en cache des êtres" +msgstr "Désactiver la mise en cache des créatures" #: src/gui/setup_players.cpp:54 msgid "Show gender" @@ -2283,7 +2306,7 @@ msgstr "Afficher son propre nom" #: src/gui/setup_players.cpp:63 msgid "Enable extended mouse targeting" -msgstr "Activer la souris suplémentaire lors du ciblage" +msgstr "Activer le mode de visée étendu de la souris" #: src/gui/setup_players.cpp:66 msgid "Target dead players" @@ -2303,65 +2326,69 @@ msgstr "Caractère à risque dans le nom" #: src/gui/setup_players.cpp:78 msgid "Show statuses" -msgstr "Montrer les Status" +msgstr "Montrer les Statuts" #: src/gui/setup_players.cpp:81 msgid "Show ip addresses on screenshots" -msgstr "Afficher les adresses ip sur les photos d'écran" +msgstr "Afficher les adresses ip sur les captures d'écran" #: src/gui/setup_players.cpp:84 msgid "Allow self heal with mouse click" msgstr "Autoriser la récupération automatique sur clic droit de la souris" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Relation" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutre" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Ami" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Négligé" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ignoré" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Effacé" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" -msgstr "Sous liste noir" +msgstr "Sous liste noire" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Ennemi" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Autoriser les échanges" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Autoriser les messages privés" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Ancien" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Relations" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Quand ignoré :" @@ -2427,7 +2454,7 @@ msgstr "Japonais" #: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" -msgstr "Néerlandais (Belgique / Flandre)" +msgstr "Néerlandais (Belgique / Flamand)" #: src/gui/setup_theme.cpp:156 msgid "Portuguese" @@ -2570,7 +2597,7 @@ msgstr "avec des particules" #: src/gui/setup_video.cpp:301 msgid "Enable resize" -msgstr "Activer la redimension" +msgstr "Activer le redimensionnement" #: src/gui/setup_video.cpp:302 msgid "No frame" @@ -2605,7 +2632,7 @@ msgstr "Détail des particules" #: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716 #: src/gui/setup_video.cpp:728 msgid "None" -msgstr "Rien" +msgstr "Aucun" #: src/gui/setup_video.cpp:494 msgid "" @@ -2714,11 +2741,11 @@ msgstr "Points de compétences : %d" #: src/gui/skilldialog.cpp:385 msgid "basic" -msgstr "" +msgstr "de base" #: src/gui/skilldialog.cpp:386 msgid "Skill: basic, Id: 1" -msgstr "" +msgstr "Compétence: de base, Id: 1" #: src/gui/skilldialog.cpp:420 #, c-format @@ -2733,7 +2760,7 @@ msgstr "Compétence %d" #: src/gui/skilldialog.cpp:438 #, c-format msgid "Skill: %s, Id: %d" -msgstr "" +msgstr "Compétence: %s, Id: %d" #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format @@ -2954,50 +2981,50 @@ msgstr "Choisissez le nom du groupe." msgid "Specials" msgstr "Cpt. spéciales" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Niveau : %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Argent : %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "Vie :" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp :" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "PM :" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Métier : %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Compétences :" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Points de caractéristiques du personnage : %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Niveau : %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Points de correction : %d" @@ -3157,7 +3184,7 @@ msgstr "##1 Le processus de mise à jour n'est pas achevé" #. TRANSLATORS: Continues "you try again later.". #: src/gui/updaterwindow.cpp:573 msgid "##1 It is strongly recommended that" -msgstr "##1 Il est fortement recommandé que" +msgstr "##1 Il est fortement recommandé de" #. TRANSLATORS: Begins "It is strongly recommended that". #: src/gui/updaterwindow.cpp:575 @@ -3170,7 +3197,7 @@ msgstr "Terminé" #: src/gui/userpalette.cpp:116 msgid "Being" -msgstr "Forme de vie" +msgstr "Créature" #: src/gui/userpalette.cpp:117 msgid "Friend Names" @@ -3316,23 +3343,23 @@ msgstr "Limites de votre position" msgid "Road Point" msgstr "Étape" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Qui est en ligne - Mise à jour" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Mise à jour" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Qui est en ligne - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Qui est en ligne - Erreur" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Qui est en ligne - Mise à jour" @@ -3613,7 +3640,7 @@ msgstr "Entrepôt" #: src/inventory.cpp:253 msgid "Cart" -msgstr "Sac" +msgstr "Panier" #: src/keyboardconfig.cpp:43 msgid "Basic Keys" @@ -3673,7 +3700,7 @@ msgstr "Viser le monstre le plus proche" #: src/keyboardconfig.cpp:68 msgid "Target NPC" -msgstr "Cibler le PNJ" +msgstr "Sélectionner le PNJ" #: src/keyboardconfig.cpp:69 msgid "Target Player" @@ -3865,7 +3892,7 @@ msgstr "Raccourci d'émoticône %d" #: src/keyboardconfig.cpp:278 msgid "Outfits Keys" -msgstr "Touches d'habillages" +msgstr "Touches des tenues" #: src/keyboardconfig.cpp:279 msgid "Wear Outfit" @@ -3905,7 +3932,7 @@ msgstr "Onglet de conversation suivant" #: src/keyboardconfig.cpp:297 msgid "Close current Chat Tab" -msgstr "Fermer la fenêtre de dialogue ouverte" +msgstr "Fermer l'onglet de dialogue courant" #: src/keyboardconfig.cpp:299 msgid "Previous chat line" @@ -3925,7 +3952,7 @@ msgstr "Désactiver la saisie dans le chat" #: src/keyboardconfig.cpp:307 msgid "Other Keys" -msgstr "Autre touches" +msgstr "Autres touches" #: src/keyboardconfig.cpp:308 msgid "Ignore input 1" @@ -4044,447 +4071,447 @@ msgstr "" "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des " "touches ou attendez vous à un possible comportement étrange du jeu." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Tu as été tué par %s" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Vous avez essayé de prendre un item qui n'existe pas." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "L'objet est trop lourd." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "L'objet est trop éloigné" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "L'inventaire est plein" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "La pile est trop grande" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "L'objet appartient a quelqu'un d'autre" -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Problème inconnu pour ramasser l'objet." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]." msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" -msgstr "" +msgstr "xp" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" -msgstr "" +msgstr "job" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) Mouvements par défaut" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) Mouvements inversés" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) mouvements un peu fous" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) mouvements complètements fous" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) double normal et fou" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" -msgstr "(?) déplacement inconnue" +msgstr "(?) déplacement inconnu" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" -msgstr "(%d) mouvement de fou numerique %d" +msgstr "(%d) mouvement de fou numéro %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) mouvements fous personnalisés" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) mouvements fous" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) Aller à la cible distante par défaut" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" -msgstr "(1) Aller à la cible en distante de 1" +msgstr "(1) Aller à la cible distante de 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" -msgstr "(2) Aller vers la cible jusqu'à 2 de distance" +msgstr "(2) Aller à la cible jusqu'à 2 de distance" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" -msgstr "(3) Aller à la cible en distante de 3" +msgstr "(3) Aller à la cible distante de 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" -msgstr "(5) Aller à la cible en distante de 5" +msgstr "(5) Aller à la cible distante de 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" -msgstr "(7) Aller à la cible en distante de 7" +msgstr "(7) Aller à la cible distante de 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) Aller à la cible dans le champ d'attaque" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" -msgstr "(a) Portée des attaques des Archéens" +msgstr "(a) Portée de l'attaque des archers" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) Aller à la cible" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) Suivre : défaut" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) Suivre: mouvement relatif" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) Suivre effet miroir" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) Suivre comme un toutou" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) Suivre : mode inconnu" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) Attaque" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) Attaque : défaut" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" -msgstr "(s) Attaquer sans protection" +msgstr "(s) Attaquer sans bouclier" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" -msgstr "(S) Attaquer avec protection" +msgstr "(S) Attaquer avec bouclier" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) Se déplacer et attaquer" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) Se déplacer, attaquer et ramasser" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) Sans attaque automatique" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) Ramassage sur 1x1 case" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) Ramassage par défaut sur 2x1 cases" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Ramassage avant sur 2x3 cases" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) Ramassage sur 3x3 cases" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) Aller et ramasser jusqu'à 4 de distance" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) Aller et ramasser jusqu'à 8 de distance" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) Aller et ramasser jusqu'à la distance max" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) Ramassage" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) Vue normale du jeu" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) Vue du jeu mode déverminage" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) Vue du jeu mode Ultra 1" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(u) Vue du jeu mode Ultra 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) Vue de la carte vide" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) Vue de la carte en N&B" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) Utiliser #flar comme sort d'attaque" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) Utiliser #chiza comme sort d'attaque" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) Utiliser #ingrav comme sort d'attaque" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) Utiliser #frillyar comme sort d'attaque" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Utiliser #upmarmu comme sort d'attaque" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) Sorts d'attaque" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) attaque tous les joueurs" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" -msgstr "" +msgstr "(f) attaquer tous, sauf les amis" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) attaque les mauvaises relations" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) Ne pas attaquer les joueurs" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) attaque en PVP" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) Imitation par défaut" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) Imiter les équipements" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) Imitation" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Inactif" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) Présent sur le jeu" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) Absent" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) Absent" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) Mode camera du jeu" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) Mode camera libre" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Modificateurs de mode de jeu activés" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Modificateurs de mode de jeu désactivés" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "Les modificateurs de jeux sont inconnus" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Suivre : " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Suivi annulé" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Imitation: " -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitation annulée" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Vous voyez " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [options] [manaplus-file]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[Manaplus-file]: Le fichier manaplus est un fichier XML (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "utilisé pour définir des paramètres personnalisés" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "pour le client manaplus." -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Options :" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : fichier journal à utiliser" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" " -L --chat-log-dir : Dossier a utiliser pour l'enregistrement des " "conversatoins" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Affiche la version" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Montre cette rubrique d'aide" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Répertoire de configuration à utiliser" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Se connecter avec ce nom d'utilisateur" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : Se connecter avec ce mot de passe" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character : Se connecter avec ce personnage" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nom du serveur (ou IP) pour la connexion" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Port de connexion au serveur" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr "" " --update-host : Utilise cette URL pour les fichiers de mises à jour" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Choisir le serveur de personnages et le personnage par " "défaut" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr "" " -u --skip-update : Ne pas effectuer le téléchargement des mises à jour" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Répertoire des données du jeu à charger" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" " -L --localdata-dir : Répertoire à utiliser comme répertoire principal" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Répertoire à utiliser pour les imprime-écrans" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Démarrer le jeu en mode sûr" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : Commencer le test des drivers et la configuration " "automatique" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Désactive l'OpenGL pour cette session" @@ -4522,7 +4549,7 @@ msgstr "Dextérité :" #: src/net/ea/charserverhandler.cpp:71 msgid "Luck:" -msgstr "Volonté :" +msgstr "Chance :" #: src/net/ea/charserverhandler.cpp:115 msgid "Access denied. Most likely, there are too many players on this server." @@ -4560,7 +4587,7 @@ msgstr "Case incorrecte." #: src/net/ea/charserverhandler.cpp:167 msgid "Incorrect race." -msgstr "Race incorrect." +msgstr "Race incorrecte." #: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" @@ -4601,7 +4628,7 @@ msgstr "MVP joueur :" #: src/net/ea/chathandler.cpp:370 msgid "All whispers ignored." -msgstr "Tous les chuchotements sont passés sous silence." +msgstr "Tous les chuchotements sont ignorés." #: src/net/ea/chathandler.cpp:374 msgid "All whispers ignore failed." @@ -4609,11 +4636,11 @@ msgstr "La mise en silence de tout les chuchotements a échoué" #: src/net/ea/chathandler.cpp:385 msgid "All whispers unignored." -msgstr "Tous les chuchotements ne sont plus sous silence." +msgstr "Tous les chuchotements ne sont plus ignorés." #: src/net/ea/chathandler.cpp:389 msgid "All whispers unignore failed." -msgstr "La remise en activité de tout les chuchotements a échoué" +msgstr "La remise en activité de tous les chuchotements a échoué" #: src/net/ea/gamehandler.cpp:92 #, c-format @@ -4716,7 +4743,7 @@ msgstr "%s a quitté votre guilde." #: src/net/ea/guildhandler.cpp:499 msgid "You were kicked from guild." -msgstr "Tu as été viré de la guilde." +msgstr "Tu as été exclus de la guilde." #: src/net/ea/guildhandler.cpp:512 #, c-format @@ -4963,33 +4990,33 @@ msgstr "%s a quitté le groupe." msgid "An unknown member tried to say: %s" msgstr "Un membre inconnu a essayé de dire : %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Vous êtes mort." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "" "Nous avons le regret de vous informer que votre personnage est mort sur le " "champ de bataille." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Vous n'êtes plus vraiment en vie." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "Les mains gelées de la faucheuse viennent réclamer ton âme." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Fin de la partie !" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Introduire une pièce pour continuer" -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4997,7 +5024,7 @@ msgstr "" "Non, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,... " "il... est parti dans un monde meilleur." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." @@ -5005,76 +5032,76 @@ msgstr "" "Votre tentative de casser l'arme de votre ennemi en la frappant avec votre " "gorge a échoué." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Voulez-vous que vos biens soient identifiés ?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Vaporisé." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Il semble que l'on vous ait rendu votre tête." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" "Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un " "autre." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Vous n'existez plus." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Vous avez cessez d'exister." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Tu es fini. Tu es parti retrouver ton créateur." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Tu es un dur." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Privé de toute essence de vie, tu reposes en paix." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" "Si tu n'étais pas autant en forme, tu serais en train de manger les " "pissenlits par la racine." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Vos processus métaboliques appartiennent au passé maintenant." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Tu es en dehors des clous" -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "Tu viens de toucher le fond." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5082,47 +5109,47 @@ msgstr "" "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint " "l'armée de l'ombre." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Tu n'es plus qu'un ancien joueur sans intérêt." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Tu reposes au fond de l'eau." -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Message" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus " "en mesure de regagner vos points de vie." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Vous portez moins que la moitié de votre poids. Vous pouvez récupérer votre " "santé." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Vous avez ramassé %s." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Vous avez dépensé %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" -msgstr "Ne peut pas augmenter la capacité !" +msgstr "La compétence ne peut pas être augmentée!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Équiper d'abord les flèches!" @@ -5160,11 +5187,11 @@ msgstr "Pas assez de vie !" #: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" -msgstr "PV insuffisant !" +msgstr "SP insuffisants !" #: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" -msgstr "Vous n'avez pas de messages !" +msgstr "Vous n'avez pas d'aide-mémoire !" #: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" @@ -5204,7 +5231,7 @@ msgstr "Vous n'avez rien pu voler..." #: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." -msgstr "Le poison fut sans effet..." +msgstr "Le poison n'a pas eu d'effet..." #: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128 #, c-format @@ -5239,9 +5266,7 @@ msgstr "Échange non pris en compte." #: src/net/ea/tradehandler.cpp:237 msgid "Failed adding item. Trade partner is over weighted." -msgstr "" -"Impossible de rajouter un objet. Votre partenaire pour cet échange est " -"surchargé." +msgstr "Impossible de rajouter un objet. Votre partenaire est surchargé." #: src/net/ea/tradehandler.cpp:242 msgid "Failed adding item. Trade partner has no free slot." @@ -5251,7 +5276,7 @@ msgstr "" #: src/net/ea/tradehandler.cpp:247 msgid "Failed adding item. You can't trade this item." -msgstr "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable." +msgstr "Impossible d'ajouter l'objet. Celui-ci n'est pas échangeable." #: src/net/ea/tradehandler.cpp:251 msgid "Failed adding item for unknown reason." @@ -5367,7 +5392,7 @@ msgstr "Les caractéristiques du personnage sont trop basses." #, c-format msgid "At least one stat is out of the permitted range: (%u - %u)." msgstr "" -"Au moins une des caractéristiques est en dehors des limites autorisés : (%u " +"Au moins une des caractéristiques est en dehors des limites autorisées : (%u " "- %u)." #: src/net/manaserv/charhandler.cpp:178 @@ -5705,19 +5730,19 @@ msgstr "Connexion au serveur terminée." msgid "%s is not in your party!" msgstr "%s n'est pas membre de votre groupe !" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Affiche '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Fais clignoter le nom" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Bulle flottante '...'" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Bulle flottante" diff --git a/po/id.po b/po/id.po index 87b86049f..d6c7fad7e 100644 --- a/po/id.po +++ b/po/id.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" "PO-Revision-Date: 2012-02-02 16:45+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/" @@ -21,69 +21,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Terlihat di peta" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "Menghindar" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "Luput" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "l" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Pengaturan" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Terhubung dengan server" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Masuk" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Memasuki arena permainan" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Pemilihan karakter" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "terhubung dengan server" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Pergantian server" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,63 +97,63 @@ msgstr "Pergantian server" msgid "Error" msgstr "Kesalahan" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Meminta detail registrasi" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Ubah sandi" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Perubahan sandi berhasil" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Perubahan email" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Perubahan email berhasil" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Telah tidak terdaftar" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Selamat tinggal, datang kembali setiap saat" -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s tidak ada dan tidak dapat dibuat!keluar." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Gagal mengupdate host: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Gagal membuat direktori update!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Perintah tidak dikenal." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Tidak dapat mengirimkan pesan tanpa nama" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,155 +162,155 @@ msgstr "" "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, " "atau nama anda sendiri" -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Meminta untuk masuk ke channel %s." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Nama kelompok tidak dapat di temukan" -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Nama organisasi tidak ditemukan." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Tetapkan sebuah nama" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Kembalikan pengalihan obrolan" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Tutup pesan obrolan" -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Kembalikan sekarang pengalihan obrolan" -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Pesan menutup obrolan" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "Teman" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "Diabaikan" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "netral" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Pemain telah %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Pemain telah berhasil %s!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Pemain tidak bisa %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Pemain tidak diabaikan!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Pemain tidak lagi diabaikan!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Pemain tidak dapat diabaikan" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Pemain telah terhapus" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Pemain telah berhasil dihapus" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Pemain tidak dapat dihapus" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "Ukuran jenis huruf cache" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Ukuran Cache:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Buat" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Hapus" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Sumber gambar" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "" @@ -377,36 +381,36 @@ msgstr "Peringkat Pvp: %d" msgid "Comment: %s" msgstr "Komentar: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Pengecek Bot" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Nama" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Pukul" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Berbicara" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Jalan" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Hasil" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Reset" @@ -430,7 +434,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -438,7 +442,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -450,8 +454,8 @@ msgid "Quit" msgstr "Keluar" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Max" @@ -654,7 +658,7 @@ msgid "Enter password:" msgstr "Masukkan sandi" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Hapus" @@ -730,7 +734,7 @@ msgstr "pelangi 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -742,12 +746,12 @@ msgstr "???" msgid "Chat" msgstr "Obrolan" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Kehadiran: %s; %d pemain yang hadir." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Berbisik ke %s: %s" @@ -846,62 +850,80 @@ msgstr "Penghitungan tekstur:" msgid "Particle count: %d" msgstr "Hitung partikel: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Target" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Id target:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Target Level" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Tipe target:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Target Kelompok:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Target Organisasi:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Kecepatan menyerang:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Pukulan minimal:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Pukulan maksimal:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Pukulan kritis:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Target Level" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Target Kelompok:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Target Organisasi:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Masuk: %d bytes/det" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Keluar: %d bytes/det" @@ -1393,7 +1415,7 @@ msgstr "Batalkan pengabaian" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "" @@ -1656,7 +1678,7 @@ msgstr "Tampilkan" msgid "Reset yellow bar" msgstr "Atur ulang bar kuning" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Pindahkan ke chat" @@ -1744,28 +1766,28 @@ msgstr "Tambah" msgid "Edit" msgstr "Ganti" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Mengunduh daftar server... %2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Menyambung ke server..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Menyiapkan pengunduhan" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Gagal mengunduh data server!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "Membutuhkan versi terbaru" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "Membutuhkan v%s" @@ -2297,55 +2319,59 @@ msgstr "" msgid "Allow self heal with mouse click" msgstr "" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Hubungan" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Netral" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Teman" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Diabaikan" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ditolak" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Dihapus" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Perbolehkan penukaran" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Perbolehkan berbisik" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Lama" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Ketika menolak:" @@ -2926,50 +2952,50 @@ msgstr "" msgid "Specials" msgstr "" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Tingkatan: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "" @@ -3286,23 +3312,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "" @@ -4004,437 +4030,437 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Mencoba mengambil item yang tidak lagi ada" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "item terlalu berat" -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "barang terlalu jauh" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "Perbekalan sudah penuh" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Barang milik orang lain." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" msgstr "" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) jalan normal" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) normal ganda + mode gila" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) jalan ke target di jarak 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?)bergerak ke target" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?)serangan" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) pukulan normal" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) ganti pukulan tanpa pelindung" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) pukulan dengan pelindung" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) jalan dan serang" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) jalan, serang, ambil" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) tanpa penyerangan otomatis" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?)mengambil" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) penampilan peta normal" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) penampilan peta kosong" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b)penampilan peta hitam & putih" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) gunakan #flar untuk serangan magic" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) gunakan #chiza untuk serangan magic" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(l) gunakan #ingrav untuk serangan magic" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) gunakan #frillyar untuk serangan magic" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gunakan #upmarmu untuk serangan magic" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) serangan magic" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) pada keyboard" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) pergi" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) pergi" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Perombakan game diperbolehkan" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Perombakan game tidak diperbolehkan" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Ikuti:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Batal mengikuti" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Tirukan:" -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Batal menirukan" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4898,152 +4924,152 @@ msgstr "" msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "" -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "" -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." msgstr "" -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "" -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "" -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "" -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "" -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat " "beregenerasi." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "" @@ -5614,19 +5640,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "" diff --git a/po/ja.po b/po/ja.po index cb90a39b0..4d1dd812d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,80 +12,84 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" -"PO-Revision-Date: 2012-02-05 23:09+0000\n" -"Last-Translator: Andrei Karas \n" -"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/" -"ja/)\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" +"PO-Revision-Date: 2012-02-12 16:02+0000\n" +"Last-Translator: Candy \n" +"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/" +"language/ja/)\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "マップに表示させる" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "ドッジ" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "ミス" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "設定" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "パフォーマンス" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "ビデオ" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "テーマ" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "サーバーに接続しています" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "ログインしています" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "ゲームの世界に移動しています" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "キャラクターを呼び出しています" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "ゲームサーバーに接続しています" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "ゲームサーバーを変更しています" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,63 +99,63 @@ msgstr "ゲームサーバーを変更しています" msgid "Error" msgstr "エラー" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "登録内容を呼び出しています" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "パスワード変更" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "パスワードを変更しました" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "メールアドレス変更" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "メールアドレスを変更しました" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "登録を解除しました" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "さようなら　また会いましょう" -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%sは存在しない為、作成できません" -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "無効なアップデートホスト:%s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "更新フォルダの作成エラー" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "エラー: %s は存在しない為、作成できません" -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "不明なコマンドです" -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "空のささやきを送信することはできません" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,155 +164,155 @@ msgstr "" "%sへのささやきタブの作成に失敗しました。そのタブは既に開いている、もしくは自" "分宛てです" -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "%sチャンネルへの参加をリクエスト中" -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "パーティ名がありません" -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "ギルド名がありません" -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "名前を入力してください" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "改行キーでチャット入力ができます" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "チャットを閉じます" -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "改行キーでチャット入力ができます" -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "チャットを閉じます" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "友達" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "無視" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "中性" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "プレイヤーは既に%s" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "プレイヤーの%sに成功しました" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "プレイヤーを%sできなかった" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "プレイヤーを完全無視できませんでした" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "プレイヤーを完全無視解除しました" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "プレイヤーを完全無視解除できませんでした" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "ブラックリスト化されています" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "敵" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "プレイヤーは削除されています" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "プレイヤーを削除しました" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "プレイヤーを削除できませんでした" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "クライアントの稼働時間: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d週" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d日" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d時" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "フォントキャッシュサイズ" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "キャッシュサイズ:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "作成:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "削除:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "リソースイメージ:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "リソース孤児イメージ:" @@ -379,36 +383,36 @@ msgstr "PVP ランク: %d" msgid "Comment: %s" msgstr "コメント: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "ボットチェッカー" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "名前" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "攻撃" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "話す" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "動く" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "結果" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "リセット" @@ -432,7 +436,7 @@ msgstr "量:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -440,7 +444,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -452,8 +456,8 @@ msgid "Quit" msgstr "終了" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "最大" @@ -656,7 +660,7 @@ msgid "Enter password:" msgstr "パスワードを入力して下さい:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "削除" @@ -732,7 +736,7 @@ msgstr "虹 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -744,12 +748,12 @@ msgstr "???" msgid "Chat" msgstr "チャット" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "現在: %s; %d プレイヤーがいます" -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "%sにささやき中:%s" @@ -770,7 +774,7 @@ msgstr "いいえ" #: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702 #: src/gui/popupmenu.cpp:716 msgid "Ignore" -msgstr "完全無視" +msgstr "無視" #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 @@ -848,62 +852,80 @@ msgstr "テクスチャー数:" msgid "Particle count: %d" msgstr "パーティクル数:%d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "ターゲット:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "ターゲットID:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "ターゲットレベル:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "ターゲットタイプ:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "ターゲットパーティ:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "ターゲットギルド:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "攻撃遅延" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "最低ヒット:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "最高ヒット:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "クリティカルヒット:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "ターゲットレベル:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "ターゲットパーティ:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "ターゲットギルド:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "ピング: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "入力: %dバイト/秒" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "出力: %d バイト/秒" @@ -1395,7 +1417,7 @@ msgstr "完全無視解除" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "完全無視" @@ -1485,7 +1507,7 @@ msgstr "攻撃リストへ追加する" #: src/gui/popupmenu.cpp:333 msgid "Add to ignore list" -msgstr "完全無視リストへ追加する" +msgstr "無視リストへ追加する" #: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520 msgid "Add name to chat" @@ -1658,7 +1680,7 @@ msgstr "表示" msgid "Reset yellow bar" msgstr "黄色バーをリセットする" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "チャットへコピーする" @@ -1734,7 +1756,7 @@ msgstr "読込み" #: src/gui/serverdialog.cpp:263 msgid "Connect" -msgstr "ログイン" +msgstr "接続" #: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89 @@ -1746,28 +1768,28 @@ msgstr "追加" msgid "Edit" msgstr "編集" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "サーバーリストをダウンロード中...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "サーバーからの応答を待っています" -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "ダウンロード準備中..." -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "サーバーリストの読み込みに失敗" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "アップデートが必要です" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "v%sが必要" @@ -1887,7 +1909,7 @@ msgstr "デバッグタブに呪文をログする" #: src/gui/setup_chat.cpp:102 msgid "Show server messages in debug tab" -msgstr "サーバーメッセージをデバッグタブにログする" +msgstr "デバッグタブにサーバーメッセージをログする" #: src/gui/setup_chat.cpp:105 msgid "Enable trade tab" @@ -2303,55 +2325,59 @@ msgstr "スクリーンショットにIPを表示させる" msgid "Allow self heal with mouse click" msgstr "クリックでヒール" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "関係" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "普通" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "友達" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "無視している" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "完全無視している" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "削除済" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "ブラックリスト化されています" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "敵" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "トレードを受付ける" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "全てのささやきを受け取る" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "古い" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "関係" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "完全無視の際には:" @@ -2534,7 +2560,7 @@ msgstr "最大" #: src/gui/setup_video.cpp:290 msgid "Full screen" -msgstr "フールスクリーン" +msgstr "フルスクリーン" #: src/gui/setup_video.cpp:291 msgid "Custom cursor" @@ -2696,11 +2722,11 @@ msgstr "スキルポイント: %d" #: src/gui/skilldialog.cpp:385 msgid "basic" -msgstr "" +msgstr "基本" #: src/gui/skilldialog.cpp:386 msgid "Skill: basic, Id: 1" -msgstr "" +msgstr "スキル:基本、 Id: 1" #: src/gui/skilldialog.cpp:420 #, c-format @@ -2715,7 +2741,7 @@ msgstr "スキル %d" #: src/gui/skilldialog.cpp:438 #, c-format msgid "Skill: %s, Id: %d" -msgstr "" +msgstr "スキル: %s, Id: %d" #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format @@ -2932,50 +2958,50 @@ msgstr "パーティ名を選んでください" msgid "Specials" msgstr "スペシャル" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "レベル: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "GP: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "HP:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "経験値:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "ジョブ: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "ジョブポイント:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "キャラクターポイント: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "レベル: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "修正点: %d" @@ -3294,23 +3320,23 @@ msgstr "ホームボーダー" msgid "Road Point" msgstr "ロードポイント" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "オンラインリスト - アップデート中" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "アップデート" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "オンラインリスト - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "オンラインリスト - エラー" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "オンラインリスト - アップデート" @@ -4018,440 +4044,440 @@ msgstr "" "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ" "ん。" -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "%sによって殺されました" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "存在しないアイテムは拾えません" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "アイテムが重過ぎます" -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "アイテムが遠すぎます." -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "インベントリーが満杯です" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "量が多すぎます" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "これは他のプレイヤーのアイテムです" -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "不明なエラーの為拾えません" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "%d [@@%d|%s@@]を手に入れました" -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" -msgstr "" +msgstr "xp" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" -msgstr "" +msgstr "ジョブ" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) デフォルトムーブ" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) 逆ムーブ" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) クレイジームーブを含んだムーブ" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) クレイジームーブ" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) ダブルノーマル + クレイジー" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) 不明なムーブ" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) クレイジームーブ %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) カスタムクレイジームーブ" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) クレイジームーブ" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) ターゲットへデフォルト接近" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) 距離1でターゲットへ接近" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) 距離2でターゲットに近付く" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) 距離3でターゲットへ接近" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) 距離5でターゲットに近付く" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) 距離7でターゲットに近付く" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) 攻撃範囲内のターゲットに近付く" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) 弓師攻撃範囲" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) ターゲットに近付く" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) デフォルトフォロー" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) 友達フォロー" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) ミラーフォロー" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) ペットフォロー" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) 不明なフォロー" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) 攻撃" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) デフォルト攻撃" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) 盾なし攻撃" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) 盾あり攻撃" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) 接近、攻撃" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) 接近、攻撃、拾う" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) 自動攻撃なし" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) 小範囲で拾う 1x1セル" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) デフォルト範囲で拾う 2x1セル" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) 広範囲で拾う 2x3セル" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) 3x3セルの範囲で拾う" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) 距離4の範囲で拾う" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) 距離8で拾う" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) 最大範囲で拾う" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) 拾う" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) 通常マップビュー" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) デバッグマップビュー" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) ウルトラマップビュー" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) ウルトラマップビュー2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) 空マップビュー" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) 白黒マップビュー" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) 魔法攻撃は #flarを使う" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) 魔法攻撃は #chizaを使う" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) 魔法攻撃は #ingravを使う" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) 魔法攻撃は #frillyarを使う" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) 魔法攻撃は #upmarmuを使う" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) 魔法攻撃" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) 全てのプレイヤーを攻撃" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" -msgstr "" +msgstr "(f) 友達以外を攻撃" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) 敵を攻撃" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) 他のプレイヤーを攻撃しない" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) PvP攻撃" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) デフォルト真似" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) 服装真似" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) 真似をする" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "アウェイ" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) キーボード" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) アウェイ" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) アウェイ" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) ゲームカメラモード" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) フリーカメラモード" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "ゲームモディファイアは有効になってます" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "ゲームモディファイアは無効になってます" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "不明なゲームモディファイアー" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "フォロー: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "フォローを止める" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "真似: " -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "真似をやめる" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr " が見える" -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [オプション] [manaplus-ファイル]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr " でカスタムパラメーターを設定しました" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr " をmanaplusクライアントへ設定しました" -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "オプション:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : 使用するログファイル" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : チャットログ場所" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : バージョンを表示" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : ヘルプメニュー表示" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : 使用する設定ファイル" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : この名前でログインする" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : このパスワードでログインする" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character : このキャラクターでログインする" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : ログインサーバー又はIP" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : ログインサーバーポート" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : このアップデートホストを利用する" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : デフォルトで使用するキャラクターサーバーとキャラク" "ターを選択する" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : アップデートをスキップする" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : ゲームデータを読み込む場所" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : ローカルデータディレクトリの場所" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : スクリーンショットの保存場所" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : セーフモードでゲームを始める" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : ドライバーと自動コンフィグレーションのテストを始める" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --openglエラー : OpenGLを今回のみ無効にする" @@ -4923,151 +4949,151 @@ msgstr "%sがパーティから退会しました" msgid "An unknown member tried to say: %s" msgstr "不明なメンバーからの応答: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "あなたは死にました" -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "残念なお知らせですが、あなた様のキャラは戦闘中にお亡くなりになりました" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "既に死んでいる模様です" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "死神の冷たい手に魂が取られてしまった" -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "ゲームオーバー" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "ゲームを続けるためにはコインを入れてください" -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." msgstr "" "あなたのキャラは本当は死んではいません。もっと素敵なところに向かっただけ" -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "敵の武器を潰す予定だったが…失敗した" -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "あんまり上手くいかなかったぜー" -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "遺体の持ち物を確定して欲しい？" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "悲しいですがあなたの跡形さえも残っていません" -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "全滅しちゃった" -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "敵から「忘れ物」って自分の頭を渡されました" -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "またやっちゃったね。死体をドブに捨てたら新しいのもらえるかも" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "まだ死んでいません。一時休憩中です" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "あなたは無になった" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "存在を消し去った" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "あなたは息を引き取り、神の元へ旅立った" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "あなたは死体になった" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "命を失い天国に向かった" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "そんなにも生気に満ちていなければ既に葬られていたはず" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "あなたのがんばりは今や歴史となった" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "死んじゃった" -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "やっちゃった" -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." msgstr "最後の呼吸だった。死神に会った後、無と結合した" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "存在しないプレイヤーです" -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "お前の魂は北極まで飛ばれた" -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "メッセージ" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "インベントリーが体重の半分以上の為、体力は回復できません" -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "インベントリーが体重の半分以下になった為、体力は回復します" -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "%sを手に入れました" -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "%sを使いました" -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "スキルはこれ以上あがりません" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "矢を装着して下さい" @@ -5638,19 +5664,19 @@ msgstr "サーバーへの接続が切断されました " msgid "%s is not in your party!" msgstr "%sはパーティのメンバーではありません" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "'...'を表示する" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "名前を点灯させる" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "フローティング'...'吹出し" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "吹出し" diff --git a/po/manaplus.pot b/po/manaplus.pot index ea9e825db..7b065a0af 100644 --- a/po/manaplus.pot +++ b/po/manaplus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,69 +18,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -90,223 +94,223 @@ msgstr "" msgid "Error" msgstr "" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "" -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "" -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "" -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "" -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "" -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "" @@ -376,36 +380,36 @@ msgstr "" msgid "Comment: %s" msgstr "" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "" @@ -429,7 +433,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "" @@ -437,7 +441,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "" @@ -449,8 +453,8 @@ msgid "Quit" msgstr "" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "" @@ -653,7 +657,7 @@ msgid "Enter password:" msgstr "" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "" @@ -729,7 +733,7 @@ msgstr "" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -741,12 +745,12 @@ msgstr "" msgid "Chat" msgstr "" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "" @@ -845,62 +849,76 @@ msgstr "" msgid "Particle count: %d" msgstr "" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +msgid "Target level:" msgstr "" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +msgid "Target race:" msgstr "" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:274 +msgid "Target party:" msgstr "" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:275 +msgid "Target guild:" +msgstr "" + +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "" @@ -1394,7 +1412,7 @@ msgstr "" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "" @@ -1657,7 +1675,7 @@ msgstr "" msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "" @@ -1745,28 +1763,28 @@ msgstr "" msgid "Edit" msgstr "" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "" -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "" @@ -2298,55 +2316,59 @@ msgstr "" msgid "Allow self heal with mouse click" msgstr "" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "" @@ -2927,50 +2949,50 @@ msgstr "" msgid "Specials" msgstr "" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "" @@ -3287,23 +3309,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "" @@ -4005,438 +4027,438 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" msgstr "" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4900,150 +4922,150 @@ msgstr "" msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "" -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "" -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." msgstr "" -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "" -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "" -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "" -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "" -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "" @@ -5614,19 +5636,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index b45b9432f..37f942299 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" "PO-Revision-Date: 2012-02-05 23:09+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/" @@ -20,69 +20,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Zichtbaar op de map" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "ontwijkt" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "mist" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configureren" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Video" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Verbinden met server" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Inloggen" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Spelwereld binnenkomen" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Aanvragen personage" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Verbinden met de spelserver" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Wijzigen spelservers" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -92,63 +96,63 @@ msgstr "Wijzigen spelservers" msgid "Error" msgstr "Fout" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Aanvragen registratie details" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Paswoord Wijziging" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Paswoord is gewijzigd!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Email Wijziging" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Email is gewijzigd!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Registratie ongedaan gemaakt!" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Tot ziens..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Ongeldige update host %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Fout bij het creëren van de update map!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Onbekend commando." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Kan geen lege berichten sturen!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -157,160 +161,160 @@ msgstr "" "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds " "bestaat, of het is jezelf." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Aanvragen om bij kanaal %s toegevoegd te worden." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Groepsnaam ontbreekt." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Guild-naam ontbreekt." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Gelieve een naam te specifiëren" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Ga terug naar chat" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Bericht sluit chat." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Ga nu terug naar chat." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Bericht sluit nu chat." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "vriend" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "genegeerd" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutraal" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Speler reeds %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Speler succesvol %s!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Speler kan niet %s zijn!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Speler is niet genegeerd!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Speler niet langer genegeerd!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Speler kan niet worden genegeerd!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Speler reeds verwijderd!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Speler succesvol verwijderd!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Speler kan niet worden verwijderd!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Client uptime: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uren" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d seconden" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Aangemaakt:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Verwijdered:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "" @@ -381,36 +385,36 @@ msgstr "Pvp rang: %d" msgid "Comment: %s" msgstr "" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Bot Controleerder" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Naam" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Aanvallen" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Spreken" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Beweeg" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Resultaat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Reset" @@ -434,7 +438,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -442,7 +446,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -454,8 +458,8 @@ msgid "Quit" msgstr "Afsluiten" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Maximum" @@ -658,7 +662,7 @@ msgid "Enter password:" msgstr "Geef wachtwoord:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Verwijderen" @@ -734,7 +738,7 @@ msgstr "regenboog 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -746,12 +750,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Aanwezig: %s; %d speler zijn aanwezig." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Fluisteren naar %s: %s" @@ -850,62 +854,80 @@ msgstr "" msgid "Particle count: %d" msgstr "Deeltjes-aantal: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Doel:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Doel identificatie:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Doel niveau:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Doel Type:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Doel Party:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Doel Gilde:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Aanvalsvertraging:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Doel niveau:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Doel Party:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Doel Gilde:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Invoer: %d bytes/sec" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Uitvoer: %d bytes/sec" @@ -1399,7 +1421,7 @@ msgstr "" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Volledig genegeerd" @@ -1662,7 +1684,7 @@ msgstr "Toon" msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Kopieer naar chat" @@ -1750,28 +1772,28 @@ msgstr "Toevoegen" msgid "Edit" msgstr "Wijzig" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Downloaden van server lijst...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Wachten op server..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Download voorbereiden" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Fout tijdens ophalen server lijst" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "vereist een nieuwere versie" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "vereist v%s" @@ -2305,55 +2327,59 @@ msgstr "" msgid "Allow self heal with mouse click" msgstr "" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Relatie" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutraal" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Vriend" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Geen rekening mee houden" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Genegeerd" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Gewist" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Handelen toestaan" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Fluisteren toestaan" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Oud" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Relaties" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Tijdens negeren:" @@ -2940,50 +2966,50 @@ msgstr "Kies uw groepsnaam." msgid "Specials" msgstr "Specialen" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Level: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Geld: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "Leven:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Ervaring:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "Magie:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Job: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Job:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Niveau: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "" @@ -3302,23 +3328,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Wie Is Online - Bijwerken" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Bijwerken" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Wie Is Online - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Wie Is Online - fout" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Wie Is Online - Bijgewerkt" @@ -4029,438 +4055,438 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Geprobeerd een nietbestaand voorwerp op te rapen." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Voorwerp is te zwaar." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Voorwerp is te ver weg." -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Voorwerp behoort bij iemand anders." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Onbekend probleem bij het oprapen van voorwerp." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "U raapte op %d [@@%d|%s@@]." msgstr[1] "U raapte op %d [@@%d|%s@@]." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" msgstr "" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) standaard bewegingen" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) geïnverteerde bewegingen" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) bewegingen met enkele vreemde bewegingen" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) bewegingen met vreemde bewegingen" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) dubbel normaal + raar" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) manuele vreemde beweging" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) vreemde beweging" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) standaard bewegingen tot aan doel" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) bewegen tot aan doel in bereik 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) bewegen tot aan doel in bereik 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) bewegen tot aan doel in bereik 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) bewegen tot aan doel in bereik 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) bewegen tot aan doel in bereik 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) beweeg tot aan doel in aanvalsbereik" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) beweeg tot aan doel" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) standaard volgen" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) relatief volgen" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) gespiegeld volgen" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) huisdier volgen" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) onbekend volgen" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) aanval" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) standaard aanval" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) wissel aanval zonder schild" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) wissel aanval met schild" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) ga en val aan" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) ga, val aan, raap op" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) zonder auto aanval" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) klein raap op 1x1 velden" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) standaard raap op 2x1 velden" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) vooruit raap op 2x3 velden" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) raap op 3x3 velden" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) go en raap op met bereik 4" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) ga en raap op met bereik 8" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) ga en raap op zonder bereiklimiet" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) raap op" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) normale map tonen" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) debug map tonen" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) ultra map tonen" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) ultra map tonen 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) lege map tonen" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) zwart & witte map tonen" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) gebruik #flar voor magie aanval" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) gebruik #chiza voor magie aanval" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) gebruik #ingrav voor magie aanval" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) gebruik #frillyar voor magie aanval" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gebruik #upmarmu voor magie aanval" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) magie aanval" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) standaard imitatie" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) kleren imitatie" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) imitatie" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Weg" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) op toetsenbord" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) weg" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) weg" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) spel camera modus" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) vrije camera modus" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Volg: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Volgen onderbroken" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Imitatie: " -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitatie onderbroken" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Opties:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Log bestand te gebruiken" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Chat log bestand te gebruiken" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Toon de versie" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Toon deze help" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Configuratie map te gebruiken" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Login met deze gebruikersnaam" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : Loging met dit wachtwoord" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character : Login met dit karakter" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login servernaam of IP" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Login serverpoort" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Updateserver te gebruiken" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Kies standaard karakterserver en karakter" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : update downloads overslaan" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Map om spelgegevens te laden" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Map te gebruiken als lokale data map" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir: Map te gebruiken om screenshots te bewaren" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Start spel in veilige modus" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Zet OpenGL af voor deze sessie" @@ -4936,33 +4962,33 @@ msgstr "%s heeft jouw groep verlaten." msgid "An unknown member tried to say: %s" msgstr "Een onbekend lid probeerde te zeggen: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Je bent dood." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "" "We betreuren het om je te melden dat jouw personage is gestorven in een " "gevecht." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Je bent niet langer levend." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Game Over!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Werp een muntstuk in om verder te spelen." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4970,7 +4996,7 @@ msgstr "" "Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is " "naar een beter plaats gegaan." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." @@ -4978,117 +5004,117 @@ msgstr "" "Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel " "te slaan is mislukt." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Dit verliep niet zoals gepland." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Verslagen" -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Het ziet ernaar uit dat je je pijp aan Maarten mag geven." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" "Je hebt het weer verknald, dump jouw lichaam en ga er een nieuw halen." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Je bent nog niet dood. Je bent maar aan het rusten." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Je bent niet langer." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Je hebt opgehouden te zijn." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Je bent stokstijf." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Beroofd van het leven, rust je in vrede." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Jouw metabolische processen behoren nu tot het verleden." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Je bent een ex-speler." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Bericht" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven " "herstellen." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "" @@ -5661,19 +5687,19 @@ msgstr "Verbinding met server beëindigd. " msgid "%s is not in your party!" msgstr "%s is niet in jouw groep!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Say '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Blink naam" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Zwevende '...' bel" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Zwevende bel" diff --git a/po/pl.po b/po/pl.po index 3c40b1082..e64871525 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" -"PO-Revision-Date: 2012-02-05 23:09+0000\n" -"Last-Translator: Andrei Karas \n" -"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" +"PO-Revision-Date: 2012-02-09 12:20+0000\n" +"Last-Translator: derpella \n" +"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/" "pl/)\n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -21,69 +21,73 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Widoczne na mapie" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "Unik!" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "Pudło!" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Konfiguracja" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Wydajność programu" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Obraz" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Skórki" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Łączenie z serwerem" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Logowanie" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Wchodzenie do świata gry" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Sprawdzanie postaci" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Łączenie się z serwerem gry" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Zmiana serwera" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,63 +97,63 @@ msgstr "Zmiana serwera" msgid "Error" msgstr "Błąd" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Sprawdzanie szczegółów rejestracji" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Zmiana hasła" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Hasło zmienione z powodzeniem!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Zmiana adresu e-mail" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Adres e-mail zmieniony z powodzeniem!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Wyrejestrowano z powodzeniem" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Żegnaj, będziemy czekać na Twój powrót..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s nie istnieje i nie może byś utworzone! Wyjście." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Nieprawidłowy serwer aktualizacji: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Błąd podczas tworzenia katalogu aktualizacji!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Nieznane polecenie." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Nie można wysłać pustych szeptów!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -157,105 +161,105 @@ msgid "" msgstr "" "Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Prośba o dołączenie do kanału %s." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Brakuje nazwy grupy." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Brak nazwy gildii." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Proszę wpisać prawidłową nazwę." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Return włącza czat." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Wiadomość zamyka czat." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Return od teraz włącza czat." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Wiadomość od teraz zamyka czat." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "znajomy" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "lekceważony" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutralny" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Gracz jest już %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Gracz jest teraz %s!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Gracz nie może być %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Gracz nie był ignorowany!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Gracz już nie jest ignorowany!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Gracz nie może być odignorowany!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "dodany/a do czarnej listy" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "wróg" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Gracz został usunięty!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Gracz usunięty z powodzeniem!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Gracz nie mógł zostać usunięty!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Czas pracy programu: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -263,7 +267,7 @@ msgstr[0] "%d tydzień" msgstr[1] "%d tygodni/e" msgstr[2] "%d tygodni/e" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" @@ -271,7 +275,7 @@ msgstr[0] "%d dzień" msgstr[1] "%d dni" msgstr[2] "%d dni" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -279,7 +283,7 @@ msgstr[0] "%d godzina" msgstr[1] "%d godzin/y" msgstr[2] "%d godzin/y" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -287,7 +291,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minut/y" msgstr[2] "%d minut/y" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -295,27 +299,27 @@ msgstr[0] "%d sekunda" msgstr[1] "%d sekund/y" msgstr[2] "%d sekund/y" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "rozmiar cache czcionki" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Rozmiar cache:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Stworzono:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Usunięto:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Obrazy źródłowe:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "Osierocone obrazy źródłowe:" @@ -385,36 +389,36 @@ msgstr "Miejsce w PvP: %d" msgid "Comment: %s" msgstr "Komentarz: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Wykrywacz botów" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Nazwa" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atak" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Rozmowa" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Podejdź" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Rezultat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Resetuj" @@ -438,7 +442,7 @@ msgstr "Ilość:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -446,7 +450,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -458,8 +462,8 @@ msgid "Quit" msgstr "Wyjdź" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Maks." @@ -555,7 +559,7 @@ msgstr "Potwierdzenie hasła nie zgadza się." #: src/gui/charcreatedialog.cpp:70 msgid "New Character" -msgstr "" +msgstr "Nowa postać" #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61 #: src/gui/logindialog.cpp:96 src/gui/register.cpp:75 @@ -587,7 +591,7 @@ msgstr "Fryzura:" #: src/gui/charcreatedialog.cpp:112 msgid "^" -msgstr "" +msgstr "^" #: src/gui/charcreatedialog.cpp:119 msgid "Race:" @@ -662,7 +666,7 @@ msgid "Enter password:" msgstr "Wprowadź hasło:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Usuń" @@ -738,7 +742,7 @@ msgstr "tęczowy 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -750,12 +754,12 @@ msgstr "???" msgid "Chat" msgstr "Czat" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "%s obecny/a. %d graczy online." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Szepczesz do %s: %s" @@ -854,62 +858,80 @@ msgstr "Licznik tekstur:" msgid "Particle count: %d" msgstr "Licznik cząsteczek: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Cel:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "ID celu:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Poziom celu:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Rodzaj celu:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Grupa celu:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Gildia celu:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Opóźnienie ataku:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Najsłabsze uderzenie:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Najmocniejsze uderzenie:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Uderzenie krytyczne:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Poziom celu:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Grupa celu:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Gildia celu:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Wejście: %d bajtów" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Wyjście: %d bajtów" @@ -944,11 +966,11 @@ msgstr "Ok" #: src/gui/editserverdialog.cpp:54 msgid "Edit Server" -msgstr "" +msgstr "Edytuj serwer" #: src/gui/editserverdialog.cpp:62 msgid "Address:" -msgstr "" +msgstr "Adres:" #: src/gui/editserverdialog.cpp:63 msgid "Port:" @@ -960,11 +982,11 @@ msgstr "Typ serwera:" #: src/gui/editserverdialog.cpp:65 msgid "Description:" -msgstr "" +msgstr "Opis:" #: src/gui/editserverdialog.cpp:175 msgid "Please at least type both the address and the port of the server." -msgstr "" +msgstr "Wymagany zarówno adres jak i port serwera." #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74 msgid "Equipment" @@ -1405,7 +1427,7 @@ msgstr "Odignoruj" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Całkowicie ignoruj" @@ -1668,7 +1690,7 @@ msgstr "Pokaż" msgid "Reset yellow bar" msgstr "Zresetuj żółty pasek" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Skopiuj do czatu" @@ -1756,28 +1778,28 @@ msgstr "Dodaj" msgid "Edit" msgstr "Edycja" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Ściąganie listy serwerów... %2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Czekanie na serwer..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Przygotowanie ściągania" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Błąd przy uzyskiwaniu listy serwerów!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "wymaga nowszej wersji" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "wymaga v%s" @@ -2309,55 +2331,59 @@ msgstr "Pokaż adres IP na zrzutach ekranu" msgid "Allow self heal with mouse click" msgstr "Pozwól na leczenie siebie kliknięciem" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Relacja" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutralny" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Przyjaciel" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Lekceważony" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ignorowany" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Skasowany" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "Dodany/a do czarnej listy" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Wróg" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Zezwól na handel" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Zezwól na szepty" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Resetuj" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Relacje" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Gdy ignorowany:" @@ -2566,11 +2592,11 @@ msgstr "jako cząsteczkę" #: src/gui/setup_video.cpp:301 msgid "Enable resize" -msgstr "" +msgstr "Włącz zmianę rozmiaru" #: src/gui/setup_video.cpp:302 msgid "No frame" -msgstr "" +msgstr "Bez ramki" #: src/gui/setup_video.cpp:306 msgid "FPS limit:" @@ -2707,11 +2733,11 @@ msgstr "Dostępne punkty umiejętności: %d" #: src/gui/skilldialog.cpp:385 msgid "basic" -msgstr "" +msgstr "podstawowy" #: src/gui/skilldialog.cpp:386 msgid "Skill: basic, Id: 1" -msgstr "" +msgstr "Skill: podstawowy, Id: 1" #: src/gui/skilldialog.cpp:420 #, c-format @@ -2726,7 +2752,7 @@ msgstr "Umiejętność %d" #: src/gui/skilldialog.cpp:438 #, c-format msgid "Skill: %s, Id: %d" -msgstr "" +msgstr "Skill: %s, Id: %d" #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format @@ -2842,12 +2868,12 @@ msgstr "Zaproś" #. TRANSLATORS: here P is title for visible players tab in social window #: src/gui/socialwindow.cpp:1278 msgid "P" -msgstr "" +msgstr "V" #. TRANSLATORS: here F is title for friends tab in social window #: src/gui/socialwindow.cpp:1282 msgid "F" -msgstr "" +msgstr "F" #: src/gui/socialwindow.cpp:1415 #, c-format @@ -2943,50 +2969,50 @@ msgstr "Wybierz nazwę grupy." msgid "Specials" msgstr "Specjalne" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Poziom: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Pieniądze: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "HP:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Praca: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Praca:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Punkty postaci: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Poziom: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Punkty korekcyjne: %d" @@ -3305,23 +3331,23 @@ msgstr "Obwódka lokalizacji domowej" msgid "Road Point" msgstr "Drogowskaz" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Kto jest online- aktualizacja" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Aktualizuj" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Gracze online- " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Gracze online- błąd" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Gracze online- aktualizacja" @@ -4025,42 +4051,42 @@ msgstr "" "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić " "się problemy." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Zostałeś/aś zabity/a przez %s" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Próbowano podnieść nieistniejący przedmiot." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Przedmiot zbyt ciężki." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Przedmiot za daleko" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "Inwentarz jest pełny." -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "Za duży stos." -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Przedmiot należy do kogoś innego." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Nieznany problem podczas próby podniesienia przedmiotu." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4068,396 +4094,396 @@ msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]." msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]." msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" -msgstr "" +msgstr "xp" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" -msgstr "" +msgstr "skill" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) domyślne poruszanie się" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) odwrócone ruchy" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) trochę szalonych ruchów" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) dużo szalonych ruchów" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) podwójne normalne + szalone" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) nieznany sposób poruszania się" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) szalone ruchy numer %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) własne szalone ruchy" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) szalone ruchy" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) domyślne przybliżenie do celu" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) podejdź do 1 pola od celu" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) podejdź do 2 pól od celu" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) podejdź do 3 pól od celu" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) podejdź do 5 pól od celu" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) podejdź do 7 pól od celu" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) podejdź do celu na zasięg ataku" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) zasięg ataku łucznika" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) pól do celu" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) domyślne podążanie" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) relatywne podążanie" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) lustrzane podążanie" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) niewolnicze podążanie" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) nieznane podążanie" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) atak" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) domyślny atak" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) zdejmij tarczę do ataku" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) załóż tarczę do ataku" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) idź, atakuj" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) idź, atakuj, podnieś" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) bez autoataku" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) podnoś w promieniu 1x1" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) podnoś w promieniu 2x1" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) podnoś w promieniu 2x3" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) podnoś w promieniu 3x3" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) podejdź i podnoś do 4 pól" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) podejdź i podnoś do 8 pól" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) podejdź i podnoś w zasięgu wzroku" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) podnoś" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) normalny widok mapy" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) widok debug" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) płaska mapa" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) płaska mapa 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) mapa bez tekstur" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) dwukolorowa mapa" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) użyj #flar jako M.A." -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) użyj #chiza jako M.A." -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) użyj #ingrav jako M.A." -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) użyj #frillyar jako M.A." -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) użyj #upmarmu jako M.A." -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) magiczny atak" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) atakuj wszystkich graczy" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" -msgstr "" +msgstr "(f) atakuj niezaprzyjaźnionych" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) atakuj nielubianych" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) nie atakuj nikogo" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) atak PvP" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) domyślna imitacja" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) Imituj strój" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) imitacja" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "AFK" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) przy klawiaturze" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) AFK" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) stan" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) tryb kamery gry" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) wolny tryb kamery" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Modyfikatory gry włączone." -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Modyfikatory gry wyłączone." -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "Modyfikatory gry nieznane" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Podążasz za: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Podążanie anulowane." -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Imitujesz: " -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitacja anulowana" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Widzisz " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opcje] [manaplus-file]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr " używane do wprowadzania własnych parametrów" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr " do klienta manaplus." -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Opcje:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Używany plik logów" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Używany katalog logów" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Pokaż wersję" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Pokaż tą pomoc" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Katalog konfiguracyjny" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Zaloguj się tym loginem" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : Zaloguj się tym hasłem" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character : Zaloguj się tą postacią" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nazwa serwera lub IP" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Port serwera" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Użyj tego serwera aktualizacji" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Wybierz domyślny serwer i postać" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Omiń aktualizację" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Katalog z danymi gry" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Katalog z lokalnymi danymi" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Katalog ze zrzutami ekranu" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Rozpocznij grę w trybie bezpieczeństwa" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr " -T --test :Rozpocznij test sterowników i autokonfigurację" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Wyłącz OpenGL w tej sesji" @@ -4937,31 +4963,31 @@ msgstr "%s opuścił/a Twoją grupę." msgid "An unknown member tried to say: %s" msgstr "Nieznany członek grupy chciał powiedzieć: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Jesteś martwy/a." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Z ubolewaniem powiadamiamy, iż Twoja postać poległa w bitwie." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Już nie jesteś taki żywy." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "Skostniałe łapy ponurego żniwiarza sięgają po Twoją duszę." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Koniec gry!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Wrzuć żeton aby kontynuować." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4969,79 +4995,79 @@ msgstr "" "Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się " "do lepszego miejsca." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" "Twój plan zniszczenia broni wrogów poprzez uderzanie o nią gardłem zawiódł." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Czy chesz zidentyfikować swoje rzeczy?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Niestety, ślad po Tobie zaginął..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Unicestwiony." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Wygląda na to, że podano tobie twoją głowę." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "Znowu nawaliłeś, wrzuć swoje ciało do ścieku i kup sobie nowe." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Jeszcze nie umarłeś. Tylko sobie odpoczywasz." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Już Cię nie ma." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Twoja marna egzystencja może teraz odejść w zapomnienie." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Odeszłeś by spotkać się ze swym stwórcą." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Jesteś sztywniak." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Pozbawiony życia, spoczywasz w pokoju." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Gdybyś nie był wirtualny, wąchałbyś kwiatki od spodu." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Twoje procesy metaboliczne są teraz historią." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Wypadłeś z rozgrywki." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "Kopnąłeś w kalendarz." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5049,46 +5075,46 @@ msgstr "" "Zrzuciłeś swą ziemską powłokę, wyniosłeś ducha poza doczesne wymiary i " "przyłączyłeś się do chórów anielskich." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Jesteś eks-graczem." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Kopyrtnąłeś." -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Wiadomość" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać " "zdrowie." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Podniosłeś/aś %s." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Wydałeś/aś %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "Nie można podnieść poziomu umiejętności!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Dodaj strzały do ekwipunku." @@ -5663,19 +5689,19 @@ msgstr "Połączenie z serwerem przerwane." msgid "%s is not in your party!" msgstr "%s nie jest w twojej grupie!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Pisz '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Mruganie nicka" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Bąbelek \"...\" nad głową" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Bąbelek nad głową" diff --git a/po/pt.po b/po/pt.po index 21ce13a39..8d9f4c253 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,80 +10,84 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" -"PO-Revision-Date: 2012-02-05 23:09+0000\n" -"Last-Translator: Andrei Karas \n" -"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/" -"pt/)\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" +"PO-Revision-Date: 2012-02-07 19:45+0000\n" +"Last-Translator: freya \n" +"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/" +"language/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Visivel no mapa" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "desviou" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "errou" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "l" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configurar" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vídeo" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Temas" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Conectando ao servidor" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Efetuando login" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Entrando no domínio do jogo" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Requisitando personagens" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,63 +97,63 @@ msgstr "Mudando servidores do jogo" msgid "Error" msgstr "Erro" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s não existe e não pode ser criado! Saindo." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Não é possível enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,160 +162,160 @@ msgstr "" "Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela " "já existe ou é você mesmo." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" -msgstr "amigo" +msgstr "amigo(a)" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Não foi possível deixar de ignorar o jogador(a)!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "Na Lista Negra" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "Inimigo" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "Tamanho do cache de fonte" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Tamanho de Cache:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Recursos de imagens:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "Recursos de imagens orfãos:" @@ -382,36 +386,36 @@ msgstr "Posição no PVP: %d" msgid "Comment: %s" msgstr "Comentário: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Analizador de bot" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Mover" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Resetar" @@ -435,7 +439,7 @@ msgstr "Quantidade:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -443,7 +447,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -455,8 +459,8 @@ msgid "Quit" msgstr "Sair" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Máximo" @@ -659,7 +663,7 @@ msgid "Enter password:" msgstr "Entre com a senha" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Excluir" @@ -735,7 +739,7 @@ msgstr "arco-íris 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -747,12 +751,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -851,62 +855,80 @@ msgstr "Contador de Texturas:" msgid "Particle count: %d" msgstr "Contagem de partículas: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Alvo:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "ID do alvo:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Nível do alvo:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Tipo de alvo:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Grupo do alvo:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Guilda do alvo:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Atraso de Ataque:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Dano Minimo:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Dano Máximo:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Dano Crítico:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Nível do alvo:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Grupo do alvo:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Guilda do alvo:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Entrada: %d bytes/s" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Saída: %d bytes/s" @@ -1191,7 +1213,7 @@ msgstr "%s %d?" #: src/gui/killstats.cpp:370 msgid "jacko spawning" -msgstr "JackOvai aparecer" +msgstr "Aparição do JackO" #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." @@ -1279,7 +1301,7 @@ msgstr "Precisa" #: src/gui/npcdialog.cpp:52 msgid "Stop waiting" -msgstr "Pare de esperar" +msgstr "Aguarde..." #: src/gui/npcdialog.cpp:53 msgid "Next" @@ -1340,12 +1362,12 @@ msgstr "Sussuro" #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" -msgstr "Curar:" +msgstr "Curar" #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 #: src/gui/popupmenu.cpp:683 msgid "Be friend" -msgstr "Ser Amigo" +msgstr "Ser Amigo(a)" #: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 #: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 @@ -1356,7 +1378,7 @@ msgstr "Ser Amigo" #: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 #: src/gui/popupmenu.cpp:728 msgid "Disregard" -msgstr "Ser inimigo" +msgstr "Ser inimigo(a)" #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 #: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 @@ -1372,7 +1394,7 @@ msgstr "Lista Negra" #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695 #: src/gui/popupmenu.cpp:703 msgid "Set as enemy" -msgstr "Definir como inimigo." +msgstr "Definir como inimigo(a)" #: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162 #: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178 @@ -1400,7 +1422,7 @@ msgstr "Não ignorar" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Ignorar completamente" @@ -1444,12 +1466,12 @@ msgstr "Chutar Jogador" #: src/gui/popupmenu.cpp:268 msgid "Nuke" -msgstr "Deixar pelado" +msgstr "Desaparecer" #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 #: src/gui/popupmenu.cpp:829 msgid "Show Items" -msgstr "Mostar itens:" +msgstr "Mostar itens" #: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 #: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 @@ -1663,7 +1685,7 @@ msgstr "Mostrar" msgid "Reset yellow bar" msgstr "Resetar barra amarela" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Copiar para o chat" @@ -1751,28 +1773,28 @@ msgstr "Adicionar" msgid "Edit" msgstr "Editar" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Baixando lista de servidores...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Aguardando servidor..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Preparando download" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Erro ao recuperar lista!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "requer uma versão mais nova" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "requer v%s" @@ -2305,55 +2327,59 @@ msgstr "Mostrar endereço de IP em Capturas de Tela" msgid "Allow self heal with mouse click" msgstr "Permitir curar-se com o clique do mouse " -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Relação" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutro" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" -msgstr "Amigo" +msgstr "Amigo(a)" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Desconsiderado" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ignorado" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Apagado" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "Na Lista Negra " -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Inimigo" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Permitir negociações" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Permitir mensagens particulares" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Antigo" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Relações" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Quando ignorar:" @@ -2702,11 +2728,11 @@ msgstr "Pontos de habilidade disponíveis: %d" #: src/gui/skilldialog.cpp:385 msgid "basic" -msgstr "" +msgstr "básico" #: src/gui/skilldialog.cpp:386 msgid "Skill: basic, Id: 1" -msgstr "" +msgstr "Habilidade: básico, Id: 1" #: src/gui/skilldialog.cpp:420 #, c-format @@ -2721,7 +2747,7 @@ msgstr "Habilidade %d" #: src/gui/skilldialog.cpp:438 #, c-format msgid "Skill: %s, Id: %d" -msgstr "" +msgstr "Habilidade: %s, Id: %d" #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format @@ -2938,50 +2964,50 @@ msgstr "Escolha o nome do seu grupo." msgid "Specials" msgstr "Especiais" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Nível: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Dinheiro: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "HP:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Job: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Job:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Pontos do personagem: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Nível: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Pontos de correção: %d" @@ -3299,23 +3325,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -4021,443 +4047,443 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Você foi morto(a) por %s" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Problema desconhecido ao tentar pegar item." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Você pegou %d [@@%d|%s@@]." msgstr[1] "Você pegou %d [@@%d|%s@@]." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" -msgstr "" +msgstr "exp" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" -msgstr "" +msgstr "Profissão" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) Movimento desconhecido" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) movimento louco numero %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) movimentos loucos" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) Alcance de arqueiros" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) Ataque" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) atacar todos inimigos" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" -msgstr "" +msgstr "(f) ataque todos, exceto amigos" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) atacar más relações" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) não atacar jogadores" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) Ataque PVP" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) Mímica padrão" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) Mímica de roupas" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) Mímica" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) Ausente" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) Ausente" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo ativados" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "Modificador de jogo desconhecido" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Você vê " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opções] [manaplus-arquivo]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "usado para definir parâmetros customizados" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "para o cliente manaplus. " -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Escolhe um personagem e um servidor de personagem " "padrão" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr "" " -d --data : Pasta de onde os dados do jogo vão ser carregados" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" " -L --localdata-dir : Diretório a ser usado como pasta de dados local" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --testes : Começar a testar drivers para auto configuração" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4932,31 +4958,31 @@ msgstr "%s saiu do seu grupo." msgid "An unknown member tried to say: %s" msgstr "Um membro desconhecido tentou dizer: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Você está morto(a)." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Lamentamos informar que seu personagem foi morto em combate." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Você não me parece assim tão vivo(a)." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "As mãos frias da morte estão levando sua alma." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Fim de jogo!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Insira uma moeda para continuar." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4964,79 +4990,79 @@ msgstr "" "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para " "um lugar melhor." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Eu acho que as coisas não correram tão bem." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Você quer uma identificação de suas posses?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Infelizmente, seus traços nunca foram encontrados..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Aniquilado." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Parece que te ofereceram sua própria cabeça." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Você não morreu ainda. Está apenas descansando." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Você não é mais." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Você deixou de ser." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Você expirou e foi encontrar seu criador." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Você é um cadáver." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Sem vida, você descansa em paz." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Se não fosse tão animado, estaria comendo grama pela raiz." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Seus processos metabólicos agora são história." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Você bateu as botas." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "Você chutou o balde." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5044,47 +5070,47 @@ msgstr "" "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito " "coro invisível." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Você é um(a) ex-jogador(a)." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Você foi desta para melhor." -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Mensagem" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Você está carregando mais que a metade de seu peso. Você não poderá mais " "recuperar HP." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Você está carregando menos da metade de seu peso. Você vai recuperar-se " "novamente." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Você pegou %s." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Você gastou %s" -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "Impossível aumentar o atributo!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Equipe as flechas primeiro." @@ -5657,19 +5683,19 @@ msgstr "Conexão com o servidor interrompida. " msgid "%s is not in your party!" msgstr "%s não está em seu grupo!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Bolha Flutuante" diff --git a/po/pt_BR.po b/po/pt_BR.po index 92cc956a1..0cbbf66d8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12,80 +12,84 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" -"PO-Revision-Date: 2012-02-05 23:09+0000\n" -"Last-Translator: Andrei Karas \n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" +"PO-Revision-Date: 2012-02-10 20:29+0000\n" +"Last-Translator: freya \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/" -"manaplus/team/pt_BR/)\n" +"manaplus/language/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Mapa visivel " -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" -msgstr "por nome" +msgstr "desviou" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" -msgstr "por id" +msgstr "errou" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" -msgstr "por peso" +msgstr "Configurar" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Vídeo" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Temas" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" -msgstr "por quantidade" +msgstr "Saindo" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" -msgstr "por tipo" +msgstr "Conectando ao servidor" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Habilitar rolagem suave" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Rolagem suave" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,63 +99,63 @@ msgstr "Mudando servidores do jogo" msgid "Error" msgstr "Erro" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s não existe e não pode ser criado! Saindo." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Não é possível enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,160 +164,160 @@ msgstr "" "Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela " "já existe ou é você mesmo." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" -msgstr "amigo" +msgstr "amigo(a)" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Não foi possível deixar de ignorar o jogador!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "Na Lista Negra" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "inimigo" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "Tamanho de fonte Cache" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Tamanho de cache:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Recursos de imagem:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "Recurso de imagem orfão:" @@ -384,36 +388,36 @@ msgstr "Posição no PVP: %d" msgid "Comment: %s" msgstr "Comentário: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Analizador de bot" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Mover" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Resetar" @@ -437,7 +441,7 @@ msgstr "Quantidade:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -445,7 +449,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -457,8 +461,8 @@ msgid "Quit" msgstr "Sair" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Máximo" @@ -661,7 +665,7 @@ msgid "Enter password:" msgstr "Entre com a senha:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Excluir" @@ -737,7 +741,7 @@ msgstr "arco-íris 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -749,12 +753,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -853,62 +857,80 @@ msgstr "Contador de texturas:" msgid "Particle count: %d" msgstr "Contagem de partículas: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Alvo:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "ID do alvo:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "Nível do alvo:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "Tipo de alvo:" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "Grupo do alvo:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "Guilda do alvo:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Atarso de ataque:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Hit minimo:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Hit máximo:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Hit crítico:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Nível do alvo:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Grupo do alvo:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Guilda do alvo:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Entrada: %d bytes/s" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Saída: %d bytes/s" @@ -1171,7 +1193,7 @@ msgstr[1] "Tempo para o próximo nível %d mins: %s " #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" -msgstr "Ultim exp por morte:" +msgstr "Ultima exp por morte:" #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 @@ -1338,7 +1360,7 @@ msgstr "Negócios" #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406 msgid "Whisper" -msgstr "Mensagem Privada:" +msgstr "Sussurro" #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677 msgid "Heal" @@ -1347,7 +1369,7 @@ msgstr "Cura" #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412 #: src/gui/popupmenu.cpp:683 msgid "Be friend" -msgstr "Ser amigo" +msgstr "Ser amigo(a)" #: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158 #: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175 @@ -1358,7 +1380,7 @@ msgstr "Ser amigo" #: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715 #: src/gui/popupmenu.cpp:728 msgid "Disregard" -msgstr "Ser inimigo" +msgstr "Ser inimigo(a)" #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 #: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415 @@ -1402,7 +1424,7 @@ msgstr "Não ignorar" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "Ignorar completamente" @@ -1446,12 +1468,12 @@ msgstr "Chutar Jogador" #: src/gui/popupmenu.cpp:268 msgid "Nuke" -msgstr "Nu" +msgstr "Desaparecer" #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 #: src/gui/popupmenu.cpp:829 msgid "Show Items" -msgstr "Mostrar itens:" +msgstr "Mostrar itens" #: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741 #: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137 @@ -1665,7 +1687,7 @@ msgstr "Mostrar" msgid "Reset yellow bar" msgstr "Zerar barra amarela" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Copiar para chat" @@ -1753,28 +1775,28 @@ msgstr "Adicionar" msgid "Edit" msgstr "Editar" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Baixando lista de servidores...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Aguardando servidor..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Preparando download" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Erro ao recuperar lista!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "requer uma versão mais nova" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "requer v%s" @@ -2308,55 +2330,59 @@ msgstr "Mostrar endereço de IP em Capturas de Tela" msgid "Allow self heal with mouse click" msgstr "Permitir se curar com o clique do mouse" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Relação" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Neutro" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" -msgstr "Amigo" +msgstr "Amigo(a)" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Desconsiderado" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Ignorado" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Apagado" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "Na Lista Negra " -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Inimigo" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Permitir negociações" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Permitir mensagens particulares" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Antigo" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Relações" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Quando ignorar:" @@ -2705,11 +2731,11 @@ msgstr "Pontos de habilidade disponíveis: %d" #: src/gui/skilldialog.cpp:385 msgid "basic" -msgstr "" +msgstr "básico" #: src/gui/skilldialog.cpp:386 msgid "Skill: basic, Id: 1" -msgstr "" +msgstr "Habilidade: báico, Id: 1" #: src/gui/skilldialog.cpp:420 #, c-format @@ -2724,7 +2750,7 @@ msgstr "Habilidade %d" #: src/gui/skilldialog.cpp:438 #, c-format msgid "Skill: %s, Id: %d" -msgstr "" +msgstr "Habilidade: %s, Id: %d" #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format @@ -2941,50 +2967,50 @@ msgstr "Escolha o nome do seu grupo." msgid "Specials" msgstr "Especiais" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Nível: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Dinheiro: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "HP:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Job: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Job:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Pontos do personagem: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Nível: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Pontos de correção: %d" @@ -3302,23 +3328,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -4024,442 +4050,442 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Você foi morto(a) por %s" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Problema desconhecido ao tentar pegar item." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "Você pegou %d [@@%d|%s@@]." msgstr[1] "Você pegou %d [@@%d|%s@@]." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" -msgstr "" +msgstr "exp" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" -msgstr "" +msgstr "profissão" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) movimento desconhecido" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) movimento louco número %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) Movimentos loucos" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) Alcance ataque de arqueiro" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) Ataque" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) atacar qualquer jogador" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" -msgstr "" +msgstr "(f) ataque todos, exceto amigos" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) atacar más relações" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) não atacar jogadores" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) ataque em pvp" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) Mímica padrão" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) Mímica de roupas" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) Mímica" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) Modo Ausente" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) Ausente" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "Modificadores são desconhecidos" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Seguindo cancelado" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Você vê " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "Manaplus [opções] [manaplus-arquivo]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "Usado para parâmetros customizados" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "Para o cliente Manaplus." -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Escolhe um personagem e um servidor de personagem " "padrão" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr "" " -d --data : Pasta de onde os dados do jogo vão ser carregados" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" " -L --localdata-dir : Diretório a ser usado como pasta de dados local" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr " -T --testes : Começa a testar drivers e a auto-configurar" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4934,31 +4960,31 @@ msgstr "%s saiu do seu grupo." msgid "An unknown member tried to say: %s" msgstr "Um membro desconhecido tentou dizer: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Você está morto." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Lamentamos informar que seu personagem foi morto(a) em combate." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Você não me parece assim tão vivo." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "As mãos frias da morte estão levando sua alma." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Fim de jogo!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Insira uma moeda para continuar." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4966,79 +4992,79 @@ msgstr "" "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para " "um lugar melhor." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Eu acho que as coisas não correram tão bem." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Você quer uma identificação de suas posses?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Infelizmente, seus traços nunca foram encontrados..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Aniquilado." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Parece que te ofereceram sua própria cabeça." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Você não morreu ainda. Está apenas descansando." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Você não é mais." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Você deixou de ser." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Você expirou e foi encontrar seu criador." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Você é um cadáver." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Sem vida, você descansa em paz." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Se não fosse tão animado, estaria comendo grama pela raiz." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Seus processos metabólicos agora são história." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Você bateu as botas." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "Você chutou o balde." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5046,47 +5072,47 @@ msgstr "" "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito " "coro invisível." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Você é um ex-jogador(a)" -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Você foi desta para melhor." -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Mensagem" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Você está carregando mais que a metade de seu peso. Você não poderá mais " "recuperar HP." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Você está carregando menos ou metade de seu peso. Você pode recuperar-se " "novamente." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Você pegou %s." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Você gastou %s" -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "Impossível aumentar o atributo!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Equipe as flechas primeiro." @@ -5659,19 +5685,19 @@ msgstr "Conexão com o servidor interrompida. " msgid "%s is not in your party!" msgstr "%s não está em seu grupo!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Bolha Flutuante" diff --git a/po/ru.po b/po/ru.po index 5d32213fe..088029a23 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,11 +11,11 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" -"PO-Revision-Date: 2012-02-05 23:11+0000\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" +"PO-Revision-Date: 2012-02-16 21:05+0000\n" "Last-Translator: Andrei Karas \n" -"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/" -"ru/)\n" +"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/" +"language/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,69 +23,73 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "Видимые на карте" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "Человек" + +#: src/being.cpp:560 msgid "dodge" msgstr "уворот" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "промах" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "О" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "Б" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Настройка" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Производительность" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "Видео" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "Темы" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "Идет подключение к серверу..." -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "Авторизация" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "Входим в игровой мир" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "Получение списка персонажей" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "Подключение к игровому серверу" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "Смена игрового сервера" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -95,63 +99,63 @@ msgstr "Смена игрового сервера" msgid "Error" msgstr "Ошибка" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "Запрос регистрационных данных" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "Изменить Пароль" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "Пароль изменен!" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "Сменить Email" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "Email изменен!" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "Регистрация удалена" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "Хорошо, возвращайтесь в любое время..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s не существует, и не может быть создано! Выход." -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "Некорректный сервер обновлений: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "Ошибка создания директории для обновлений!" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Ошибка: %s не существует, и не может быть создан! Выход." -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "Неизвестная команда." -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "Нельзя отправлять пустые сообщения!" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,105 +164,105 @@ msgstr "" "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка " "уже создана, или этот игрок Вы сами." -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "Запрос на присоединение к каналу %s." -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Не указано название группы" -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "Не задано имя гильдии." -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "Пожалуйста, укажите имя" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "Enter переключает Вас на окно чата." -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "Сообщение закрывает чат." -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "Теперь Return переключает чат." -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "Теперь сообщение закрывает чат." -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "друг" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "пренебрегаемый" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "нейтральный" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "Игрок уже %s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "Игрок удачно %s!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "Игрок не может быть %s!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "Игрок не был игнорируемым!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "Игрок больше не игнорируется!" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "Игрок не может быть удален из списка игнорирования!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "добавлен в черный список" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "враг" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "Игрок и так уже удален!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "Игрок удален!" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "Игрок не может быть удален!" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "Время работы клиента: %s" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -266,7 +270,7 @@ msgstr[0] "%d неделя" msgstr[1] "%d недели" msgstr[2] "%d недель" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" @@ -274,7 +278,7 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дней" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -282,7 +286,7 @@ msgstr[0] "%d час" msgstr[1] "%d часа" msgstr[2] "%d часов" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -290,7 +294,7 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -298,27 +302,27 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "размер кеша шрифта" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "Размер кеша:" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "Создано:" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "Удалено:" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "Изображений:" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "Удаленных изображений:" @@ -390,36 +394,36 @@ msgstr "PvP ранг: %d" msgid "Comment: %s" msgstr "Комментарий: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "Окно детектора ботов" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "Имя" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Атака" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Разговор" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "Движение" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "Результат" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Сбросить" @@ -443,7 +447,7 @@ msgstr "Количество:" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -451,7 +455,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -463,8 +467,8 @@ msgid "Quit" msgstr "Выход" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "Макс" @@ -667,7 +671,7 @@ msgid "Enter password:" msgstr "Введите пароль:" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Удалить" @@ -743,7 +747,7 @@ msgstr "радуга 3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -755,12 +759,12 @@ msgstr "???" msgid "Chat" msgstr "Чат" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "Присутствуют: %s; Всего %d игроков." -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "Вы прошептали %s: %s" @@ -859,62 +863,76 @@ msgstr "Количество текстур:" msgid "Particle count: %d" msgstr "Количество частиц: %d" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "Цель:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "Id цели:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +msgid "Target level:" msgstr "Уровень цели:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +msgid "Target race:" +msgstr "Расса цели:" + +#: src/gui/debugwindow.cpp:274 +msgid "Target party:" msgstr "Группа цели:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +msgid "Target guild:" msgstr "Гильдия цели:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "Задержка атаки:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "Минимальный удар:" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "Максимальный удар:" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "Критический удар:" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "Уровень цели:" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "Группа цели:" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "Гильдия цели:" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "Пинг: %s мс." -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "Вх.: %d байт/сек." -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "Исх.: %d байт/сек." @@ -1410,7 +1428,7 @@ msgstr "Не игнорировать" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "@@ignore|Полностью игнорировать@@" @@ -1673,7 +1691,7 @@ msgstr "Показать" msgid "Reset yellow bar" msgstr "сбросить настройки" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "Скопировать в чат" @@ -1761,28 +1779,28 @@ msgstr "Добавить" msgid "Edit" msgstr "Изменить" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "Получение списка серверов...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "Ожидание ответа от сервера" -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "Подготовка к загрузке" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "Не удалось получить список серверов!" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "требуется более новая версия" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "требуется v%s" @@ -2320,55 +2338,59 @@ msgstr "Показывать ip адреса на снимках экрана" msgid "Allow self heal with mouse click" msgstr "Включить самолечение по клику мыши" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "Группировать друзей в окне онлайн списка" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "Отношение" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "Нейтральное" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "Друг" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "Пренебрегаемый" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "Игнорировано" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "Стерт" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "В черном списке" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "Враг" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "Разрешить торговлю" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "Разрешить шептание" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "Старые" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "Связи" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Когда игнорируется:" @@ -2955,50 +2977,50 @@ msgstr "Выберите имя будущей группы." msgid "Specials" msgstr "Особые" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "Уровень: %d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "Деньги: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "ОЖ:" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "Мана:" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "Профессия: %d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "Профессия:" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "Очки персонажа: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "Уровень: %d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "Очков навыков: %d" @@ -3317,23 +3339,23 @@ msgstr "Бордюр домашней позиции" msgid "Road Point" msgstr "Точка дороги" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "Кто онлайн - обновление" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Обновить" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "Кто онлайн - " -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Кто онлайн - ошибка" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "Кто онлайн - обновление" @@ -4040,42 +4062,42 @@ msgstr "" "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно " "вести." -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "Вас убил %s" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "Попытка поднять несуществующий предмет." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "Предмет слишком тяжелый." -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "Предмет слишком далеко" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "Инвентарь переполнен." -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "Слишком много предметов." -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "Предмет принадлежит кому-то еще." -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "Неизвестная проблема при поднятии предмета." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4083,398 +4105,398 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]." msgstr[1] "Вы подняли %d [@@%d|%s@@]." msgstr[2] "Вы подняли %d [@@%d|%s@@]." -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 msgid "xp" msgstr "опыт" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "работа" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "(D) движения по умолчанию" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "(I) обратное движение" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "(c) обычное движение иногда с сумашедшими движениями" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "(C) движение с сумашедшими движениями" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "(d) нормальные и сумашедшие движения" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "(?) неизвестное движение" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) сумасшедшее движение %d" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "(a) пользовательские сумашедшие движения" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "(?) неизвестные сумасшедшие движения" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "(0) обычное движение к цели" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "(1) движение к цели на расстояние 1" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "(2) движение к цели на расстояние 2" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "(3) движение к цели на расстояние 3" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "(5) движение к цели на расстояние 5" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "(7) движение к цели на расстояние 7" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "(A) движение к цели на расстояние атаки" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "(a) атака лучника" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?) неизвестное движение к цели" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "(D) следование по умолчанию" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "(R) относительное следование" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "(M) зеркальное следование" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "(P) следование как животное" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "(?) неизвестное следование" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) неизвестная атака" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "(D) обычная атака" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "(s) переключение атаки без щита" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "(S) переключение атаки со щитом" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) идти и атаковать" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "(A) идти, атаковать, собирать" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "(d) без автоатаки" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "(S) поднятие в области 1x1" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "(D) поднятие из области 2x1" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "(F) поднятие из области спереди 2x3" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "(3) поднятие из области 3x3" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "(g) движение и поднятие на расстоянии 4" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "(g) движение и поднятие на расстоянии 8" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "(A) движение и поднятие на максимальном расстоянии" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?) неизвестный режим поднятия" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "(N) обычный режим карты" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "(D) отладочный режим карты" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "(u) специальный режим карты" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "(U) специальный режим карты 2" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "(e) режим пустой карты" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "(b) черно-белый режим карты" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "(f) использовать #flar для атаки" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "(c) использовать #chiza для атаки" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "(I) использовать #ingrav для атаки" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "(F) использовать #frillyar для атаки" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "(U) использовать #upmarmu для атаки" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "(?) неизвестная магическая атака" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "(a) атаковать всех игроков" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "(f) атаковать всех кроме друзей" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "(b) атаковать врагов" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "(d) не атаковать игроков" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "(?) pvp атака" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "(D) имитация по умолчанию" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "(O) имитация нарядов" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "(?) неизвестная имитация" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "Отошел" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "(O) возле компьютера" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "(A) отошел" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "(?) неизвестный режим отошел" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "(G) игровая камера" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "(F) свободная камера" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "Игровые модификаторы включены" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "Игровые модификаторы выключены" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "Игровые модификаторы в неизвестном положении" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "Следование: " -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "Следование отменено" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "Имитация: " -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "Имитация отменена" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "Вы видите " -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [параметры] [файл-manaplus]" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr " используется для указания дополнительных параметров" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr " в клиенте." -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "Опции:" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Использовать указанный файл как лог" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Использовать указанный каталог для лога" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr " -v --version : Показать версию" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr " -h --help : Показать эту справку" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Использовать указанный каталог конфигурации" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr " -U --username : Войти с указанным логином" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr " -P --password : Войти с указанным паролем" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr " -c --character : Использовать указанный персонаж" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr " -s --server : Имя или IP сервера авторизации" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr " -p --port : Порт сервера авторизации" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr " --update-host : Использовать этот узел обновлений" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Выбрать персонаж и сервер персонажей по умолчанию" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Пропустить обновление" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Загрузить игровые данные из этого каталога" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Каталог для локальных данных" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Сохранять скриншоты в указанном каталоге" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Запуск игры в безопасном режиме" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" " -T --tests : Запускает проверку драйверов и автоконфигурацию" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Не использовать OpenGL для этой сессии" @@ -4945,31 +4967,31 @@ msgstr "%s покинул Вашу группу." msgid "An unknown member tried to say: %s" msgstr "Неизвестный участник попытался сказать: %s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Вы мертвы." -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "С грустью сообщаем вам, что Ваш персонаж пал в бою." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Вас больше нет среди живых." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "Холодные руки Смерти извлекают Вашу душу." -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Игра Окончена!" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "Опустите монетку для продолжения." -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4977,78 +4999,78 @@ msgstr "" "Нет, детки. Ваш персонаж на самом деле не умер. Он...эммм...ушел в лучший " "мир." -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "Ваш план сломать оружие врагов о свое горло провалился." -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Похоже, это было не слишком хорошо." -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Хочешь, предскажу твою судьбу?" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Грустно, Вас вряд ли когда-нибудь найдут..." -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Уничтожен." -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Похоже, Вам отдали Вашу голову." -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "Вы опять пролетели, выбросите своё тело в трубу, и получите другое." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "Вы не мертвы. Вы просто отдыхаете." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "Вас больше нет." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "Вы перестали быть." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "Ваше время истекло, пора встретиться с Создателем." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "Вы сдулись." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "Лишенный жизни, покойся с миром." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Если бы Вы не были нарисованными, Вы бы отправлись на тот свет" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "Ваш обмен веществ стал историей." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "Вы упали с ветки." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "Вы протянули ноги." -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -5056,47 +5078,47 @@ msgstr "" "Вы затаскали свою смертную оболочку, сорвали занавес и незримо " "присоединились к кровоточащему хору..." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "Вы не жилец." -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "Вас пришпиливают к фьордам." -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "Сообщение" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье " "восстанавливаться не будет." -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Вес предметов составляет менее половины допустимого. Теперь Вы можете " "восстанавливаться." -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "Вы получили %s." -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "Вы потратили %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "Не удалось увеличить навык!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "Для начала экипируйтесь стрелами!" @@ -5673,19 +5695,19 @@ msgstr "Подключение к серверу прервано." msgid "%s is not in your party!" msgstr "%s не в группе!" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "Печатать '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "Мигать именем" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "Плавающий '...' пузырек" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "Плавающий пузырек" diff --git a/po/zh_CN.po b/po/zh_CN.po index 271a4d4ef..3d2bf1221 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2012-02-06 02:06+0300\n" +"POT-Creation-Date: 2012-02-16 23:43+0300\n" "PO-Revision-Date: 2012-02-02 16:45+0000\n" "Last-Translator: Andrei Karas \n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/" @@ -21,69 +21,73 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1169 +#: src/actorspritemanager.cpp:1168 msgid "Visible on map" msgstr "在地图上可见" -#: src/being.cpp:553 +#: src/being.cpp:343 +msgid "Human" +msgstr "" + +#: src/being.cpp:560 msgid "dodge" msgstr "躲闪" -#: src/being.cpp:553 +#: src/being.cpp:560 msgid "miss" msgstr "无法出售无法出售的物品。" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1534 src/gui/whoisonline.cpp:749 +#: src/being.cpp:1540 src/gui/whoisonline.cpp:760 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1539 src/gui/whoisonline.cpp:754 +#: src/being.cpp:1545 src/gui/whoisonline.cpp:765 msgid "I" msgstr "I" -#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:960 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "魔法攻击" -#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:967 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "性能" -#: src/client.cpp:969 src/gui/setup_video.cpp:319 +#: src/client.cpp:972 src/gui/setup_video.cpp:319 msgid "Video" msgstr "视频" -#: src/client.cpp:974 +#: src/client.cpp:977 msgid "Themes" msgstr "主题" -#: src/client.cpp:1056 +#: src/client.cpp:1059 msgid "Connecting to server" msgstr "魔法防御" -#: src/client.cpp:1088 +#: src/client.cpp:1091 msgid "Logging in" msgstr "尝试捡起不存在的物品。" -#: src/client.cpp:1121 +#: src/client.cpp:1124 msgid "Entering game world" msgstr "捡起物品发生不存在的物品。" -#: src/client.cpp:1222 +#: src/client.cpp:1226 msgid "Requesting characters" msgstr "请求角色" -#: src/client.cpp:1257 +#: src/client.cpp:1261 msgid "Connecting to the game server" msgstr "连接到游戏服务器" -#: src/client.cpp:1267 +#: src/client.cpp:1271 msgid "Changing game servers" msgstr "更改游戏服务器" -#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451 +#: src/client.cpp:1314 src/client.cpp:1321 src/client.cpp:1455 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228 @@ -93,218 +97,218 @@ msgstr "更改游戏服务器" msgid "Error" msgstr "错误" -#: src/client.cpp:1326 +#: src/client.cpp:1330 msgid "Requesting registration details" msgstr "请求注册的详细信息" -#: src/client.cpp:1352 +#: src/client.cpp:1356 msgid "Password Change" msgstr "密码更改" -#: src/client.cpp:1353 +#: src/client.cpp:1357 msgid "Password changed successfully!" msgstr "更改密码成功！" -#: src/client.cpp:1372 +#: src/client.cpp:1376 msgid "Email Change" msgstr "更改电子邮件" -#: src/client.cpp:1373 +#: src/client.cpp:1377 msgid "Email changed successfully!" msgstr "更改电子邮件成功！" -#: src/client.cpp:1393 +#: src/client.cpp:1397 msgid "Unregister Successful" msgstr "注销成功" -#: src/client.cpp:1394 +#: src/client.cpp:1398 msgid "Farewell, come back any time..." msgstr "再见，随时欢迎回来... ..." -#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647 -#: src/client.cpp:2079 src/client.cpp:2086 +#: src/client.cpp:1603 src/client.cpp:1636 src/client.cpp:1651 +#: src/client.cpp:2082 src/client.cpp:2089 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s 不存在，并且无法创建！退出。" -#: src/client.cpp:1785 +#: src/client.cpp:1789 #, c-format msgid "Invalid update host: %s" msgstr "无效的更新主机: %s" -#: src/client.cpp:1819 src/client.cpp:1825 +#: src/client.cpp:1823 src/client.cpp:1829 msgid "Error creating updates directory!" msgstr "创建更新目录错误！" -#: src/client.cpp:1846 +#: src/client.cpp:1850 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "错误：%s 不存在并且无法创建！退出。" -#: src/commandhandler.cpp:213 +#: src/commandhandler.cpp:215 msgid "Unknown command." msgstr "未知命令。" -#: src/commandhandler.cpp:333 +#: src/commandhandler.cpp:335 msgid "Cannot send empty whispers!" msgstr "无法发送空白密语！" -#: src/commandhandler.cpp:347 +#: src/commandhandler.cpp:349 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。" -#: src/commandhandler.cpp:367 +#: src/commandhandler.cpp:369 #, c-format msgid "Requesting to join channel %s." msgstr "请求加入频道%s。" -#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "帮会名称缺失。" -#: src/commandhandler.cpp:394 +#: src/commandhandler.cpp:396 msgid "Guild name is missing." msgstr "公会名称是缺少的。" -#: src/commandhandler.cpp:407 src/commandhandler.cpp:524 -#: src/commandhandler.cpp:565 src/commandhandler.cpp:605 +#: src/commandhandler.cpp:409 src/commandhandler.cpp:526 +#: src/commandhandler.cpp:567 src/commandhandler.cpp:607 msgid "Please specify a name." msgstr "请指定一个名称。" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:458 +#: src/commandhandler.cpp:460 msgid "Message closes chat." msgstr "讯息关闭聊天。" -#: src/commandhandler.cpp:469 +#: src/commandhandler.cpp:471 msgid "Return now toggles chat." msgstr "<回车>键现在切换聊天。" -#: src/commandhandler.cpp:475 +#: src/commandhandler.cpp:477 msgid "Message now closes chat." msgstr "讯息现在关闭聊天。" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 msgid "friend" msgstr "朋友" -#: src/commandhandler.cpp:508 +#: src/commandhandler.cpp:510 msgid "disregarded" msgstr "无视" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:515 msgid "neutral" msgstr "中性" -#: src/commandhandler.cpp:532 +#: src/commandhandler.cpp:534 #, c-format msgid "Player already %s!" msgstr "玩家已经%s!" -#: src/commandhandler.cpp:546 +#: src/commandhandler.cpp:548 #, c-format msgid "Player successfully %s!" msgstr "玩家成功%s!" -#: src/commandhandler.cpp:554 +#: src/commandhandler.cpp:556 #, c-format msgid "Player could not be %s!" msgstr "玩家不能为 %s" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:579 msgid "Player wasn't ignored!" msgstr "是不能忽视的！" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:586 msgid "Player no longer ignored!" msgstr "玩家不再被忽略！" -#: src/commandhandler.cpp:586 +#: src/commandhandler.cpp:588 msgid "Player could not be unignored!" msgstr "玩家不能被忽略!" -#: src/commandhandler.cpp:592 +#: src/commandhandler.cpp:594 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:599 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:612 +#: src/commandhandler.cpp:614 msgid "Player already erased!" msgstr "玩家已经被删除!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:625 msgid "Player successfully erased!" msgstr "玩家成功删除！" -#: src/commandhandler.cpp:625 +#: src/commandhandler.cpp:627 msgid "Player could not be erased!" msgstr "玩家无法删除！" -#: src/commandhandler.cpp:938 src/commandhandler.cpp:984 +#: src/commandhandler.cpp:940 src/commandhandler.cpp:986 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:959 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:967 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:975 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:981 +#: src/commandhandler.cpp:983 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1060 +#: src/commandhandler.cpp:1062 msgid "font cache size" msgstr "字体缓存大小" -#: src/commandhandler.cpp:1072 +#: src/commandhandler.cpp:1074 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1076 +#: src/commandhandler.cpp:1078 msgid "Created:" msgstr "创建于：" -#: src/commandhandler.cpp:1078 +#: src/commandhandler.cpp:1080 msgid "Deleted:" msgstr "删除：" -#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243 +#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245 +#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254 msgid "Resource orphaned images:" msgstr "" @@ -374,36 +378,36 @@ msgstr "Pvp等级: %d" msgid "Comment: %s" msgstr "评论: %s" -#: src/gui/botcheckerwindow.cpp:266 +#: src/gui/botcheckerwindow.cpp:267 msgid "Bot Checker" msgstr "挂机检查" -#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:297 src/gui/setup_relations.cpp:65 msgid "Name" msgstr "姓名" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:138 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "攻击" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:297 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "说话" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269 +#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:269 #: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482 #: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826 msgid "Move" msgstr "移动" -#: src/gui/botcheckerwindow.cpp:300 +#: src/gui/botcheckerwindow.cpp:301 msgid "Result" msgstr "结果" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 +#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "重置" @@ -427,7 +431,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776 msgid "+" msgstr "+" @@ -435,7 +439,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788 msgid "-" msgstr "-" @@ -447,8 +451,8 @@ msgid "Quit" msgstr "退出" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 -#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576 +#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806 msgid "Max" msgstr "最大" @@ -651,7 +655,7 @@ msgid "Enter password:" msgstr "输入密码：" #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266 -#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123 +#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123 #: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "删除" @@ -727,7 +731,7 @@ msgstr "彩虹3" #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79 -#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:225 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 @@ -739,12 +743,12 @@ msgstr "？？？" msgid "Chat" msgstr "聊天" -#: src/gui/chatwindow.cpp:653 +#: src/gui/chatwindow.cpp:654 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:1040 +#: src/gui/chatwindow.cpp:1041 #, c-format msgid "Whispering to %s: %s" msgstr "对%s密语到：%s" @@ -843,62 +847,80 @@ msgstr "" msgid "Particle count: %d" msgstr "粒子数：%d个" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 -#: src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303 +#: src/gui/debugwindow.cpp:350 msgid "Target:" msgstr "目标：" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308 +#: src/gui/debugwindow.cpp:351 msgid "Target Id:" msgstr "目标ID：" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 -#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 -msgid "Target Level:" +#: src/gui/debugwindow.cpp:272 +#, fuzzy +msgid "Target level:" msgstr "目标水平：" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 -#: src/gui/debugwindow.cpp:348 -msgid "Target Party:" +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321 +#, fuzzy +msgid "Target race:" +msgstr "目标类型：" + +#: src/gui/debugwindow.cpp:274 +#, fuzzy +msgid "Target party:" msgstr "目标：" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 -#: src/gui/debugwindow.cpp:349 -msgid "Target Guild:" +#: src/gui/debugwindow.cpp:275 +#, fuzzy +msgid "Target guild:" msgstr "目标公会：" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 -#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340 +#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355 msgid "Attack delay:" msgstr "攻击延迟：" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330 +#: src/gui/debugwindow.cpp:356 msgid "Minimal hit:" msgstr "" -#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:352 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332 +#: src/gui/debugwindow.cpp:357 msgid "Maximum hit:" msgstr "" -#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 -#: src/gui/debugwindow.cpp:353 +#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334 +#: src/gui/debugwindow.cpp:358 msgid "Critical hit:" msgstr "" -#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 +#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317 +#: src/gui/debugwindow.cpp:352 +msgid "Target Level:" +msgstr "目标水平：" + +#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353 +msgid "Target Party:" +msgstr "目标：" + +#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354 +msgid "Target Guild:" +msgstr "目标公会：" + +#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397 #, c-format msgid "Ping: %s ms" msgstr "" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:400 #, c-format msgid "In: %d bytes/s" msgstr "输入:%d 字节/" -#: src/gui/debugwindow.cpp:397 +#: src/gui/debugwindow.cpp:402 #, c-format msgid "Out: %d bytes/s" msgstr "" @@ -1390,7 +1412,7 @@ msgstr "" #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729 -#: src/playerrelations.cpp:465 +#: src/playerrelations.cpp:466 msgid "Completely ignore" msgstr "完全忽略" @@ -1653,7 +1675,7 @@ msgstr "显示" msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248 msgid "Copy to chat" msgstr "" @@ -1741,28 +1763,28 @@ msgstr "添加" msgid "Edit" msgstr "编辑" -#: src/gui/serverdialog.cpp:448 +#: src/gui/serverdialog.cpp:444 #, c-format msgid "Downloading server list...%2.2f%%" msgstr "下载服务器列表...%2.2f%%" -#: src/gui/serverdialog.cpp:453 +#: src/gui/serverdialog.cpp:449 msgid "Waiting for server..." msgstr "等待服务器..." -#: src/gui/serverdialog.cpp:457 +#: src/gui/serverdialog.cpp:453 msgid "Preparing download" msgstr "准备下载" -#: src/gui/serverdialog.cpp:461 +#: src/gui/serverdialog.cpp:457 msgid "Error retreiving server list!" msgstr "恢复服务器列表错误！" -#: src/gui/serverdialog.cpp:548 +#: src/gui/serverdialog.cpp:544 msgid "requires a newer version" msgstr "需要较新版本" -#: src/gui/serverdialog.cpp:550 +#: src/gui/serverdialog.cpp:546 #, c-format msgid "requires v%s" msgstr "需要 v%s" @@ -2294,55 +2316,59 @@ msgstr "" msgid "Allow self heal with mouse click" msgstr "" -#: src/gui/setup_relations.cpp:65 +#: src/gui/setup_players.cpp:87 +msgid "Group friends in who is online window" +msgstr "" + +#: src/gui/setup_relations.cpp:66 msgid "Relation" msgstr "关系" -#: src/gui/setup_relations.cpp:70 +#: src/gui/setup_relations.cpp:71 msgid "Neutral" msgstr "中立" -#: src/gui/setup_relations.cpp:71 +#: src/gui/setup_relations.cpp:72 msgid "Friend" msgstr "好友" -#: src/gui/setup_relations.cpp:72 +#: src/gui/setup_relations.cpp:73 msgid "Disregarded" msgstr "被忽视的" -#: src/gui/setup_relations.cpp:73 +#: src/gui/setup_relations.cpp:74 msgid "Ignored" msgstr "忽略" -#: src/gui/setup_relations.cpp:74 +#: src/gui/setup_relations.cpp:75 msgid "Erased" msgstr "已删除" -#: src/gui/setup_relations.cpp:75 +#: src/gui/setup_relations.cpp:76 msgid "Blacklisted" msgstr "" -#: src/gui/setup_relations.cpp:76 +#: src/gui/setup_relations.cpp:77 msgid "Enemy" msgstr "" -#: src/gui/setup_relations.cpp:242 +#: src/gui/setup_relations.cpp:243 msgid "Allow trading" msgstr "允许交易" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Allow whispers" msgstr "允许密语" -#: src/gui/setup_relations.cpp:247 +#: src/gui/setup_relations.cpp:248 msgid "Old" msgstr "旧" -#: src/gui/setup_relations.cpp:249 +#: src/gui/setup_relations.cpp:250 msgid "Relations" msgstr "关系" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "当忽略时：" @@ -2923,50 +2949,50 @@ msgstr "选择n的名称。" msgid "Specials" msgstr "特价商品" -#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 -#: src/gui/statuswindow.cpp:337 +#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280 +#: src/gui/statuswindow.cpp:343 #, c-format msgid "Level: %d" msgstr "等级：%d" -#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 -#: src/gui/statuswindow.cpp:304 +#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266 +#: src/gui/statuswindow.cpp:310 #, c-format msgid "Money: %s" msgstr "金币: %s" -#: src/gui/statuswindow.cpp:151 +#: src/gui/statuswindow.cpp:157 msgid "HP:" msgstr "HP：" -#: src/gui/statuswindow.cpp:158 +#: src/gui/statuswindow.cpp:164 msgid "Exp:" msgstr "经验：" -#: src/gui/statuswindow.cpp:172 +#: src/gui/statuswindow.cpp:178 msgid "MP:" msgstr "MP：" -#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393 #, c-format msgid "Job: %d" msgstr "职业：%d" -#: src/gui/statuswindow.cpp:205 +#: src/gui/statuswindow.cpp:211 msgid "Job:" msgstr "职业：" -#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317 #, c-format msgid "Character points: %d" msgstr "角色可用点: %d" -#: src/gui/statuswindow.cpp:269 +#: src/gui/statuswindow.cpp:275 #, c-format msgid "Level: %d (GM %d)" msgstr "级别:%d (GM %d)" -#: src/gui/statuswindow.cpp:325 +#: src/gui/statuswindow.cpp:331 #, c-format msgid "Correction points: %d" msgstr "" @@ -3283,23 +3309,23 @@ msgstr "家居广场边界" msgid "Road Point" msgstr "路点" -#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608 +#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:618 msgid "Who Is Online - Updating" msgstr "谁在线 - 更新" -#: src/gui/whoisonline.cpp:103 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "更新" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:198 msgid "Who Is Online - " msgstr "谁在线 -" -#: src/gui/whoisonline.cpp:622 +#: src/gui/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "谁在线 - 错误" -#: src/gui/whoisonline.cpp:661 +#: src/gui/whoisonline.cpp:671 msgid "Who Is Online - Update" msgstr "谁在线 - 更新" @@ -4001,438 +4027,438 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:386 +#: src/localplayer.cpp:381 #, c-format msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1436 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1439 msgid "Item is too heavy." msgstr "项目是太重了。" -#: src/localplayer.cpp:1447 +#: src/localplayer.cpp:1442 msgid "Item is too far away." msgstr "物品太远了。" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1445 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1448 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1451 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1459 +#: src/localplayer.cpp:1454 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1483 +#: src/localplayer.cpp:1478 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "你拾起%d[@@%d|%s @@]。" -#: src/localplayer.cpp:1719 +#: src/localplayer.cpp:1714 #, fuzzy msgid "xp" msgstr "经验：" -#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738 +#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733 msgid "job" msgstr "" -#: src/localplayer.cpp:1911 +#: src/localplayer.cpp:1906 msgid "(D) default moves" msgstr "" -#: src/localplayer.cpp:1912 +#: src/localplayer.cpp:1907 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1913 +#: src/localplayer.cpp:1908 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1914 +#: src/localplayer.cpp:1909 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1915 +#: src/localplayer.cpp:1910 msgid "(d) double normal + crazy" msgstr "" -#: src/localplayer.cpp:1916 +#: src/localplayer.cpp:1911 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1938 +#: src/localplayer.cpp:1933 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1938 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1942 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1961 +#: src/localplayer.cpp:1956 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1962 +#: src/localplayer.cpp:1957 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1963 +#: src/localplayer.cpp:1958 msgid "(2) moves to target in distance 2" msgstr "" -#: src/localplayer.cpp:1964 +#: src/localplayer.cpp:1959 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1965 +#: src/localplayer.cpp:1960 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1966 +#: src/localplayer.cpp:1961 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1967 +#: src/localplayer.cpp:1962 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1963 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1964 msgid "(?) move to target" msgstr "(?)移动到目标" -#: src/localplayer.cpp:1988 +#: src/localplayer.cpp:1983 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1989 +#: src/localplayer.cpp:1984 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1990 +#: src/localplayer.cpp:1985 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1991 +#: src/localplayer.cpp:1986 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1992 +#: src/localplayer.cpp:1987 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038 +#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033 msgid "(?) attack" msgstr "(?) 攻击" -#: src/localplayer.cpp:2012 src/localplayer.cpp:2034 +#: src/localplayer.cpp:2007 src/localplayer.cpp:2029 msgid "(D) default attack" msgstr "" -#: src/localplayer.cpp:2013 +#: src/localplayer.cpp:2008 msgid "(s) switch attack without shield" msgstr "" -#: src/localplayer.cpp:2014 +#: src/localplayer.cpp:2009 msgid "(S) switch attack with shield" msgstr "" -#: src/localplayer.cpp:2035 +#: src/localplayer.cpp:2030 msgid "(G) go and attack" msgstr "(G) 去攻击" -#: src/localplayer.cpp:2036 +#: src/localplayer.cpp:2031 msgid "(A) go, attack, pickup" msgstr "" -#: src/localplayer.cpp:2037 +#: src/localplayer.cpp:2032 msgid "(d) without auto attack" msgstr "" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2084 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2085 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2086 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2087 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2088 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2089 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2077 +#: src/localplayer.cpp:2090 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2078 +#: src/localplayer.cpp:2091 msgid "(?) pick up" msgstr "(?)拿起" -#: src/localplayer.cpp:2091 +#: src/localplayer.cpp:2104 msgid "(N) normal map view" msgstr "" -#: src/localplayer.cpp:2092 +#: src/localplayer.cpp:2105 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2093 +#: src/localplayer.cpp:2106 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2094 +#: src/localplayer.cpp:2107 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2108 msgid "(e) empty map view" msgstr "" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2109 msgid "(b) black & white map view" msgstr "" -#: src/localplayer.cpp:2115 +#: src/localplayer.cpp:2128 msgid "(f) use #flar for magic attack" msgstr "" -#: src/localplayer.cpp:2116 +#: src/localplayer.cpp:2129 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/localplayer.cpp:2117 +#: src/localplayer.cpp:2130 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/localplayer.cpp:2118 +#: src/localplayer.cpp:2131 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2132 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2133 msgid "(?) magic attack" msgstr "" -#: src/localplayer.cpp:2139 +#: src/localplayer.cpp:2152 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2140 +#: src/localplayer.cpp:2153 msgid "(f) attack all except friends" msgstr "" -#: src/localplayer.cpp:2141 +#: src/localplayer.cpp:2154 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2155 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2156 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2162 +#: src/localplayer.cpp:2175 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2163 +#: src/localplayer.cpp:2176 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2164 +#: src/localplayer.cpp:2177 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2205 msgid "Away" msgstr "距离" -#: src/localplayer.cpp:2211 +#: src/localplayer.cpp:2224 msgid "(O) on keyboard" msgstr "" -#: src/localplayer.cpp:2212 +#: src/localplayer.cpp:2225 msgid "(A) away" msgstr "" -#: src/localplayer.cpp:2213 src/localplayer.cpp:2228 +#: src/localplayer.cpp:2226 src/localplayer.cpp:2241 msgid "(?) away" msgstr "" -#: src/localplayer.cpp:2226 +#: src/localplayer.cpp:2239 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2227 +#: src/localplayer.cpp:2240 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2252 +#: src/localplayer.cpp:2265 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2253 +#: src/localplayer.cpp:2266 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2254 +#: src/localplayer.cpp:2267 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3772 +#: src/localplayer.cpp:3785 msgid "Follow: " msgstr "跟随:" -#: src/localplayer.cpp:3774 src/localplayer.cpp:3789 +#: src/localplayer.cpp:3787 src/localplayer.cpp:3802 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3781 +#: src/localplayer.cpp:3794 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3783 src/localplayer.cpp:3791 +#: src/localplayer.cpp:3796 src/localplayer.cpp:3804 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:4139 +#: src/localplayer.cpp:4152 msgid "You see " msgstr "你看" -#: src/main.cpp:51 +#: src/main.cpp:55 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:56 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:58 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:59 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:61 msgid "Options:" msgstr "选项：" -#: src/main.cpp:58 +#: src/main.cpp:62 msgid " -l --log-file : Log file to use" msgstr "-l--log-file 日志文件" -#: src/main.cpp:59 +#: src/main.cpp:63 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:64 msgid " -v --version : Display the version" msgstr "-v --version: 显示版本" -#: src/main.cpp:61 +#: src/main.cpp:65 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:66 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:67 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:68 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:69 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:70 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:71 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:72 msgid " --update-host : Use this update host" msgstr "--update-host: 使用此更新主机" -#: src/main.cpp:69 +#: src/main.cpp:73 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:75 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:76 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:78 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:76 +#: src/main.cpp:80 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:77 +#: src/main.cpp:81 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:78 +#: src/main.cpp:82 msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:81 +#: src/main.cpp:85 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4902,152 +4928,152 @@ msgstr "%s已经离开你的帮会。" msgid "An unknown member tried to say: %s" msgstr "一未知成员尝试说：%s" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "你已玩完了。" -#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "很遗憾的告诉您，您的角色在战斗中死亡了" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "你再也不是那样的生机勃勃了。" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." msgstr "" -#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "游戏结束！" -#: src/net/ea/playerhandler.cpp:102 +#: src/net/ea/playerhandler.cpp:103 msgid "Insert coin to continue." msgstr "投入游戏币继续。" -#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." msgstr "不，孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。" -#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" -#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "我猜这进行得并不顺利。" -#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "" -#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "" -#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "被消灭了。" -#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "" -#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You're not dead yet. You're just resting." msgstr "你还没死，你只是在休息" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:130 +#: src/net/ea/playerhandler.cpp:131 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:133 +#: src/net/ea/playerhandler.cpp:134 msgid "You're pining for the fjords." msgstr "" "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\"," "\"false\"用来禁止物品共享。" -#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 -#: src/net/ea/playerhandler.cpp:427 +#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" msgstr "讯息" -#: src/net/ea/playerhandler.cpp:336 +#: src/net/ea/playerhandler.cpp:337 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "你已携带超过半数负重。无法回复健康（体力）" -#: src/net/ea/playerhandler.cpp:346 +#: src/net/ea/playerhandler.cpp:347 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:453 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." msgstr "你捡起了%s" -#: src/net/ea/playerhandler.cpp:459 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." msgstr "你花费 %s." -#: src/net/ea/playerhandler.cpp:505 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" msgstr "不能提升技能!" -#: src/net/ea/playerhandler.cpp:623 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." msgstr "请先装备弓箭。" @@ -5618,19 +5644,19 @@ msgstr "连接到服务器终止。" msgid "%s is not in your party!" msgstr "%s不在你的帮会中！" -#: src/playerrelations.cpp:479 +#: src/playerrelations.cpp:480 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:500 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:543 +#: src/playerrelations.cpp:542 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:546 +#: src/playerrelations.cpp:545 msgid "Floating bubble" msgstr "流动的泡沫" -- cgit v1.2.3-70-g09d2 From 2e84ac20fcf6ec69b40e19c4c6c428db04b70d85 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 17 Feb 2012 02:40:14 +0300 Subject: Add branding option for server list file name. --- data/evol/evol.manaplus | 1 + src/defaults.cpp | 1 + src/gui/serverdialog.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus index 63a963495..9c4743852 100644 --- a/data/evol/evol.manaplus +++ b/data/evol/evol.manaplus @@ -6,6 +6,7 @@