diff options
638 files changed, 11771 insertions, 10283 deletions
@@ -10,19 +10,20 @@ Maarten Vanraes (AL13N) <maarten.vanraes gmail com> Mihail Barer (Necromonger) <> == Translators == +alastrim (pt) Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) Andrei Karas (4144) <akaras inbox ru> (ru) Bernard Hugonnet (Nard) <> (fr) +Candy (jp) Derpella (pl) Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -Mihail Barer (Necromonger) <> (ru) +Mihail Barer (Necromonger) <> (ru, jp) +Nina O'Reilly (Reid) <reidyaro gmail com> (fr) Petr VarkoÄek (pitriss) <> (cs) Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) Yohann Ferreira (Bertram) <bertram cegetel net> (fr) Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) -alastrim -GonzoDark == Art or images contributors == Aline Ferraz de Souza (Freya) <freya.df gmail com> Themes diff --git a/CMakeLists.txt b/CMakeLists.txt index 91d47c3f9..3259f04d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,11 +55,12 @@ ENDIF() If(UNIX) INSTALL(FILES manaplus.desktop DESTINATION share/applications) + INSTALL(FILES manaplustest.desktop DESTINATION share/applications) ENDIF() SET(CPACK_PACKAGE_NAME "manaplus") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaPlus") -SET(CPACK_PACKAGE_VENDOR "Mana Development Team") +SET(CPACK_PACKAGE_VENDOR "ManaPlus Development Team") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus") @@ -1,3 +1,45 @@ +2012-01-22 New release 1.2.1.22 +fix: bad update hosts handling. +fix: possible crashes. +fix: player name checking in logging. +fix: default shortcuts window size. +fix: player and mob hp bar in evol server. +fix: mouse pickup logic. +fix: adding double attributes to status window. +fix: ambient layer drawing in safe opengl mode. +add: increase resize and moving areas in shortcut window and other similar windows. +add: friends tab in social window. +add: load all servers from list in server dialog. + +2012-01-08 New release 1.2.1.8 +fix: -s command line parameter. +fix: restore GL_PACK_ALIGNMENT after creating screenshots in opengl modes +fix: rare crash with reconnecting to different servers. +fix: color for /me messages in wood theme. +fix: crash in char autocomplete if no active tab in chat window. +fix: bold chat/npc text correction. +add: allow close npc dialog if script stopped with error. +add: clear outfit option in outfits context menu. +add: ability to test graphics and sound perfomance and stability. +Shortcut ManaPlus (test). Need close all other ManaPlus instances. +add: chat command /dumpt to dump last test values. +add: addiitional checks for unsecure chars combinations in players nicks. +add: allow use item replacment with empty from value. +This mean replace from any value. +add: remove "> Next" message from npc dialogs. + +2011-12-25 New release 1.1.12.25 +fix: increasing log file if client disconnected from network. +fix: memory leak in evol online list. +fix: enter some chars in inventory input box. +fix: some rare used packets. +fix: dont load move type from configuration file. +fix: create char dialog size. +fix: wrong auto adjusting perfomance after sleep mode. +add: last login time in char selection dialog. +add: update mplus font. +add: move target cursors to themes. + 2011-12-11 New release 1.1.12.11 fix: draw damage part on hp bar. fix: recursive directory creation on windows. diff --git a/Makefile.am b/Makefile.am index 6ef412c71..3347ca06b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,8 @@ SUBDIRS = data docs po src desktopdir = $(datarootdir)/applications -desktop_DATA = manaplus.desktop +desktop_DATA = manaplus.desktop \ + manaplustest.desktop # Extra files to include EXTRA_DIST = $(desktop_DATA) \ @@ -13,6 +14,7 @@ EXTRA_DIST = $(desktop_DATA) \ CMake/Modules/FindENet.cmake \ CMake/Modules/FindLibIntl.cmake \ CMake/Modules/FindSDL_gfx.cmake \ + manaplustest \ manaplus.cbp \ manaplus.menu \ manaplus.spec \ @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.12.11 Date: 2011-12-11 + Version: 1.2.1.22 Date: 2012-01-22 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index c5251f9e4..28a0ddd92 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT
===============
- Version: 1.1.12.11 Date: 2011-12-11
+ Version: 1.2.1.22 Date: 2012-01-22
Development team:
- See AUTHORS file for a list
diff --git a/build/bmakesnapshot b/build/bmakesnapshot index 4736fb8a5..89f465251 100755 --- a/build/bmakesnapshot +++ b/build/bmakesnapshot @@ -2,8 +2,6 @@ cd .. -#need fix: -Wzero-as-null-pointer-constant - dir=`pwd` export PATH=/usr/lib/gcc-snapshot/bin:$PATH @@ -23,12 +21,13 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ -Wcast-align -Wpointer-arith -Wundef \ -Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ -Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ --Wstack-protector -Wshadow -Wunused -Wunused-macros -Wsynth \ +-Wstack-protector -Wshadow -Wunused-macros -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 -Wc++11-compat -std=c++0x \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ --Wvector-operation-performance" +-Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ +-Wnarrowing -Wzero-as-null-pointer-constant" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/packwin b/build/packwin index 077104227..d855cf534 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.12.11" \ + -DPRODUCT_VERSION="1.2.1.22" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/build/pmake b/build/pmake index 7ad12eaec..b51e40734 100755 --- a/build/pmake +++ b/build/pmake @@ -4,8 +4,8 @@ cd .. dir=`pwd` -export CC=gcc-4.5 -export CXX=g++-4.5 +export CC=gcc-4.6 +export CXX=g++-4.6 #-D_GLIBCXX_PROFILE diff --git a/configure.ac b/configure.ac index bc6106248..7b1afbdaf 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.12.11], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.1.22], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus new file mode 100644 index 000000000..af5c1ea1e --- /dev/null +++ b/data/evol/evol.manaplus @@ -0,0 +1,17 @@ +<?xml version="1.0"?> + +<configuration> + <option name="appName" value="Evol Online"/> + <option name="appShort" value="mana"/> + <option name="appIcon" value="icons/manaplus.png"/> + <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/> + <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/> + <option name="defaultServer" value="world.evolonline.org"/> + <option name="defaultPort" value="6901"/> + <option name="defaultServerType" value="evol"/> + <option name="font" value="fonts/dejavusans.ttf" /> + <option name="boldFont" value="fonts/dejavusans-bold.ttf" /> + <option name="theme" value="wood" /> + <option name="wallpapersPath" value="evol/images/" /> + <option name="wallpaperFile" value="loginwallpaper_800x600.png" /> +</configuration> diff --git a/data/evol/images/loginwallpaper_800x600.png b/data/evol/images/loginwallpaper_800x600.png Binary files differnew file mode 100644 index 000000000..a1fe4f83b --- /dev/null +++ b/data/evol/images/loginwallpaper_800x600.png diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt index a46ccfd0e..5a9b0f65b 100644 --- a/data/graphics/CMakeLists.txt +++ b/data/graphics/CMakeLists.txt @@ -1,12 +1,3 @@ ADD_SUBDIRECTORY(gui) ADD_SUBDIRECTORY(images) ADD_SUBDIRECTORY(sprites) - -SET (FILES - target-cursor-in-range-l.png - target-cursor-in-range-m.png - target-cursor-in-range-s.png - target-cursor-normal-l.png - target-cursor-normal-m.png - target-cursor-normal-s.png - ) diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am index d2f93f584..c0e91d050 100644 --- a/data/graphics/Makefile.am +++ b/data/graphics/Makefile.am @@ -1,16 +1,7 @@ graphicsdir = $(pkgdatadir)/data/graphics -graphics_DATA = \ - target-cursor-in-range-l.png \ - target-cursor-in-range-m.png \ - target-cursor-in-range-s.png \ - target-cursor-normal-l.png \ - target-cursor-normal-m.png \ - target-cursor-normal-s.png - EXTRA_DIST = \ - $(graphics_DATA) \ CMakeLists.txt SUBDIRS = gui images sprites diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 2c6e4b933..aba42b39c 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -33,12 +33,12 @@ SET (FILES tab.png tab_hilight.png tabselected.png - target-cursor-blue-l.png - target-cursor-blue-m.png - target-cursor-blue-s.png - target-cursor-red-l.png - target-cursor-red-m.png - target-cursor-red-s.png + target-cursor-in-range-l.png + target-cursor-in-range-m.png + target-cursor-in-range-s.png + target-cursor-normal-l.png + target-cursor-normal-m.png + target-cursor-normal-s.png unknown-item.png vscroll_down_default.png vscroll_down_highlight.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 388d01663..7fb82f545 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -36,12 +36,12 @@ gui_DATA = \ tab.png \ tab_hilight.png \ tabselected.png \ - target-cursor-blue-l.png \ - target-cursor-blue-m.png \ - target-cursor-blue-s.png \ - target-cursor-red-l.png \ - target-cursor-red-m.png \ - target-cursor-red-s.png \ + target-cursor-in-range-l.png \ + target-cursor-in-range-m.png \ + target-cursor-in-range-s.png \ + target-cursor-normal-l.png \ + target-cursor-normal-m.png \ + target-cursor-normal-s.png \ unknown-item.png \ vscroll_down_default.png \ vscroll_down_highlight.png \ diff --git a/data/graphics/gui/target-cursor-blue-l.png b/data/graphics/gui/target-cursor-blue-l.png Binary files differdeleted file mode 100644 index 77cdf4b6d..000000000 --- a/data/graphics/gui/target-cursor-blue-l.png +++ /dev/null diff --git a/data/graphics/gui/target-cursor-blue-m.png b/data/graphics/gui/target-cursor-blue-m.png Binary files differdeleted file mode 100644 index c0107357a..000000000 --- a/data/graphics/gui/target-cursor-blue-m.png +++ /dev/null diff --git a/data/graphics/gui/target-cursor-blue-s.png b/data/graphics/gui/target-cursor-blue-s.png Binary files differdeleted file mode 100644 index 3e81c75de..000000000 --- a/data/graphics/gui/target-cursor-blue-s.png +++ /dev/null diff --git a/data/graphics/target-cursor-in-range-l.png b/data/graphics/gui/target-cursor-in-range-l.png Binary files differindex 77cdf4b6d..77cdf4b6d 100644 --- a/data/graphics/target-cursor-in-range-l.png +++ b/data/graphics/gui/target-cursor-in-range-l.png diff --git a/data/graphics/target-cursor-in-range-m.png b/data/graphics/gui/target-cursor-in-range-m.png Binary files differindex c0107357a..c0107357a 100644 --- a/data/graphics/target-cursor-in-range-m.png +++ b/data/graphics/gui/target-cursor-in-range-m.png diff --git a/data/graphics/target-cursor-in-range-s.png b/data/graphics/gui/target-cursor-in-range-s.png Binary files differindex 3e81c75de..3e81c75de 100644 --- a/data/graphics/target-cursor-in-range-s.png +++ b/data/graphics/gui/target-cursor-in-range-s.png diff --git a/data/graphics/target-cursor-normal-l.png b/data/graphics/gui/target-cursor-normal-l.png Binary files differindex 76d2101b1..76d2101b1 100644 --- a/data/graphics/target-cursor-normal-l.png +++ b/data/graphics/gui/target-cursor-normal-l.png diff --git a/data/graphics/target-cursor-normal-m.png b/data/graphics/gui/target-cursor-normal-m.png Binary files differindex e2ab79c29..e2ab79c29 100644 --- a/data/graphics/target-cursor-normal-m.png +++ b/data/graphics/gui/target-cursor-normal-m.png diff --git a/data/graphics/target-cursor-normal-s.png b/data/graphics/gui/target-cursor-normal-s.png Binary files differindex 09195f440..09195f440 100644 --- a/data/graphics/target-cursor-normal-s.png +++ b/data/graphics/gui/target-cursor-normal-s.png diff --git a/data/graphics/gui/target-cursor-red-l.png b/data/graphics/gui/target-cursor-red-l.png Binary files differdeleted file mode 100644 index 76d2101b1..000000000 --- a/data/graphics/gui/target-cursor-red-l.png +++ /dev/null diff --git a/data/graphics/gui/target-cursor-red-m.png b/data/graphics/gui/target-cursor-red-m.png Binary files differdeleted file mode 100644 index e2ab79c29..000000000 --- a/data/graphics/gui/target-cursor-red-m.png +++ /dev/null diff --git a/data/graphics/gui/target-cursor-red-s.png b/data/graphics/gui/target-cursor-red-s.png Binary files differdeleted file mode 100644 index 09195f440..000000000 --- a/data/graphics/gui/target-cursor-red-s.png +++ /dev/null diff --git a/data/help/es/team.txt b/data/help/es/team.txt index 494b5221c..ca3aac19c 100644 --- a/data/help/es/team.txt +++ b/data/help/es/team.txt @@ -13,18 +13,20 @@ ##9Mihail Barer (Necromonger) <> ##3== Traductores == +##9alastrim (pt) ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) ##9Andrei Karas (4144) <akaras inbox ru> (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr) ##9Petr VarkoÄek (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) ##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) ##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) -##9alastrim -##9GonzoDark ##3== Colaboradores con Artes o Imágenes == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> diff --git a/data/help/fr/team.txt b/data/help/fr/team.txt index ca93d3edd..042b76d0a 100644 --- a/data/help/fr/team.txt +++ b/data/help/fr/team.txt @@ -13,18 +13,20 @@ ##9Mihail Barer (Necromonger) <> ##3== traducteurs == +##9alastrim (pt) ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) ##9Andrei Karas (4144) <akaras inbox ru> (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr) ##9Petr VarkoÄek (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) ##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) ##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) -##9alastrim -##9GonzoDark ##3== Contribution art ou images == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> diff --git a/data/help/ru/team.txt b/data/help/ru/team.txt index 5b2bea822..1b0696405 100644 --- a/data/help/ru/team.txt +++ b/data/help/ru/team.txt @@ -13,17 +13,20 @@ ##9Mihail Barer (Necromonger) <> ##3== Переводчики == +##9alastrim (pt) ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) ##9Andrei Karas (4144) <akaras inbox ru> (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr) ##9Petr VarkoÄek (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) ##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) ##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) -##9alastrim ##3== Художники == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> diff --git a/data/help/team.txt b/data/help/team.txt index 4f2c85826..5411f496c 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -13,18 +13,20 @@ ##9Mihail Barer (Necromonger) <> ##3== Translators == +##9alastrim (jp) ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> (pt, pt_BR) ##9Andrei Karas (4144) <akaras inbox ru> (ru) ##9Bernard Hugonnet (Nard) <> (fr) +##9Candy (jp) +##9Derpella (pl) ##9Maarten Vanraes (AL13N) <maarten.vanraes gmail com> (nl_BE) -##9Mihail Barer (Necromonger) <> (ru) +##9Mihail Barer (Necromonger) <> (ru, jp) +##9Nina O'Reilly (Reid) <reidyaro gmail com> (fr) ##9Petr VarkoÄek (pitriss) <> (cs) ##9Sini Ruohomaa (Byakushin) <sini.ruohomaa iki fi> (fi) ##9Yohann Ferreira (Bertram) <bertram cegetel net> (fr) ##9Antoine Ruck (Jumpy) <antoinebcn hotmail com> (fr,es) ##9Nelson Martell (nelson6e65) <nelson6e65-manaplus yahoo es> (es) -##9alastrim -##9GonzoDark ##3== Art or images contributors == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index ba541fb88..83842b503 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -26,7 +26,7 @@ <color id="PLAYER" color="#003000" /> <color id="WHISPER" color="#00feaf" /> <color id="WHISPER_OFFLINE" color="#000a40" /> - <color id="IS" color="#009000" /> + <color id="IS" color="#006000" /> <color id="SERVER" color="#8415e2" /> <color id="LOGGER" color="#919191" /> <color id="HYPERLINK" color="#e50d0d" /> diff --git a/data/tmw/images/loginwallpaper_800x600.png b/data/tmw/images/loginwallpaper_800x600.png Binary files differnew file mode 100644 index 000000000..e3a6e492d --- /dev/null +++ b/data/tmw/images/loginwallpaper_800x600.png diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus new file mode 100644 index 000000000..47688e1d0 --- /dev/null +++ b/data/tmw/tmw.manaplus @@ -0,0 +1,17 @@ +<?xml version="1.0"?> + +<configuration> + <option name="appName" value="The Mana World"/> + <option name="appShort" value="mana"/> + <option name="appIcon" value="icons/manaplus.png"/> + <option name="loginMusic" value="Magick - Real.ogg"/> + <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/> + <option name="defaultServer" value="server.themanaworld.org"/> + <option name="defaultPort" value="6901"/> + <option name="defaultServerType" value="evol"/> + <option name="font" value="fonts/dejavusans.ttf" /> + <option name="boldFont" value="fonts/dejavusans-bold.ttf" /> + <option name="theme" value="wood" /> + <option name="wallpapersPath" value="tmw/images/" /> + <option name="wallpaperFile" value="loginwallpaper_800x600.png" /> +</configuration> diff --git a/docs/Makefile.am b/docs/Makefile.am index e76af80b8..91cfe1242 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,4 +1,5 @@ -man6_MANS = manaplus.6 +man6_MANS = manaplus.6 \ + manaplustest.6 EXTRA_DIST = $(man6_MANS) \ packages.txt \ diff --git a/docs/example.manaplus b/docs/example.manaplus index 8be9c675e..80d4c9ce3 100644 --- a/docs/example.manaplus +++ b/docs/example.manaplus @@ -9,7 +9,7 @@ filename / path as a command line parameter --> <configuration> - <option name="appName" value="Mana"/> + <option name="appName" value="ManaPlus"/> <option name="appShort" value="mana"/> <option name="appIcon" value="icons/manaplus.png"/> <option name="loginMusic" value="Magick - Real.ogg"/> diff --git a/docs/manaplustest.6 b/docs/manaplustest.6 new file mode 100644 index 000000000..754a3fb31 --- /dev/null +++ b/docs/manaplustest.6 @@ -0,0 +1,14 @@ +.TH "ManaPlusTest" "6" +.SH "NAME" +manaplustest \- ManaPlusTest: test tool for manaplus +.SH "SYNOPSIS" +\fBmanaplustest\fR +.SH "DESCRIPTION" +It start graphics and audio testing and configuring manaplus. + +.SH "AUTHOR" +This manual page was written by Andrei Karas <akaras@inbox.ru> +for the ManaPlus project. +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU General Public License, Version 2 any +later version published by the Free Software Foundation. diff --git a/manaplus.cbp b/manaplus.cbp index 26f3b7c5e..e44f3718d 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -668,6 +668,10 @@ <Unit filename="src\utils\mkdir.cpp" />
<Unit filename="src\utils\mkdir.h" />
<Unit filename="src\utils\mutex.h" />
+ <Unit filename="src\utils\paths.cpp" />
+ <Unit filename="src\utils\paths.h" />
+ <Unit filename="src\utils\process.cpp" />
+ <Unit filename="src\utils\process.h" />
<Unit filename="src\utils\sha256.cpp" />
<Unit filename="src\utils\sha256.h" />
<Unit filename="src\utils\specialfolder.cpp" />
@@ -676,6 +680,10 @@ <Unit filename="src\utils\stringutils.h" />
<Unit filename="src\utils\xml.cpp" />
<Unit filename="src\utils\xml.h" />
+ <Unit filename="src\test\testlauncher.cpp" />
+ <Unit filename="src\test\testlauncher.h" />
+ <Unit filename="src\test\testmain.cpp" />
+ <Unit filename="src\test\testmain.h" />
<Unit filename="src\variabledata.h" />
<Unit filename="src\vector.cpp" />
<Unit filename="src\vector.h" />
diff --git a/manaplus.desktop b/manaplus.desktop index db46d2411..3a9c234e5 100644 --- a/manaplus.desktop +++ b/manaplus.desktop @@ -3,15 +3,45 @@ Version=1.0 Name=ManaPlus Comment=A 2D MMORPG client -Comment[fr]=Un jeu en ligne dans un univers fantastique -Comment[de]=ein Online Fantasy Spiel -Comment[it]=Un gioco fantasy online -Comment[nl]=Een online role playing game -Comment[sv]=Ett fantasyrollspel online -Comment[ru]=Клиент к 2D MMORPG игре Exec=manaplus StartupNotify=false Terminal=false Type=Application Icon=manaplus Categories=Game;AdventureGame; + + +# Translations +Comment[vls]=Nen 2D MMORPG client +Name[vls]=ManaPlus +Icon[vls]=manaplus +Comment[ru]=Клиент к 2D MMORPG игре +Name[ru]=ManaPlus +Icon[ru]=manaplus +Comment[it]=Un gioco fantasy online +Name[it]=ManaPlus +Icon[it]=manaplus +Comment[ja]=2Dã®MMORPGクライアント +Name[ja]=ManaPlus +Icon[ja]=manaplus +Comment[cs]=2D MMORPG klient +Name[cs]=ManaPlus +Icon[cs]=manaplus +Comment[nl_BE]=Een 2D MMORPG client +Name[nl_BE]=ManaPlus +Icon[nl_BE]=manaplus +Comment[de]=ein 2D MMORG Client +Name[de]=ManaPlus +Icon[de]=manaplus +Comment[sv_SE]=Ett fantasyrollspel online +Name[sv_SE]=ManaPlus +Icon[sv_SE]=manaplus +Comment[es]=Un cliente MMORPG 2D +Name[es]=ManaPlus +Icon[es]=manaplus +Comment[fr]=Un jeu en ligne dans un univers fantastique +Name[fr]=ManaPlus +Icon[fr]=manaplus +Comment[nl]=Een online role playing game +Name[nl]=ManaPlus +Icon[nl]=manaplus diff --git a/manaplus.spec.in b/manaplus.spec.in index 3bfb4054c..6e563af68 100644 --- a/manaplus.spec.in +++ b/manaplus.spec.in @@ -45,6 +45,8 @@ diverse interactive world. %install rm -rf %{buildroot} %makeinstall +mkdir -p %{buildroot}%{_bindir}/ +cp -p %{_builddir}/%{name}-%{version}/manaplustest %{buildroot}%{_bindir}/ %find_lang %{name} @@ -54,9 +56,11 @@ rm -rf %{buildroot} %files -f %{name}.lang %attr(-, root, root) %doc AUTHORS ChangeLog COPYING docs/*.txt NEWS README %attr(0755, root, root) %{_bindir}/%{name} +%attr(0755, root, root) %{_bindir}/manaplustest %attr(-, root, root) %{_datadir}/%{name} %attr(-, root, root) %{_datadir}/pixmaps/%{name}.png %attr(-, root, root) %{_datadir}/applications/%{name}.desktop +%attr(-, root, root) %{_datadir}/applications/%{name}test.desktop %attr(-, root, root) %{_mandir}/man6/%{name}* diff --git a/manaplustest b/manaplustest new file mode 100755 index 000000000..12bdc2b8a --- /dev/null +++ b/manaplustest @@ -0,0 +1,5 @@ +#!/bin/sh + +cd $(dirname $(whereis -b manaplus|cut -d " " -f 2)) + +manaplus --tests diff --git a/manaplustest.desktop b/manaplustest.desktop new file mode 100644 index 000000000..f4e822116 --- /dev/null +++ b/manaplustest.desktop @@ -0,0 +1,35 @@ + +[Desktop Entry] +Version=1.0 +Name=ManaPlus (Tests) +Comment=Run tests for ManaPlus +Exec=manaplustest +StartupNotify=false +Terminal=false +Type=Application +Icon=manaplus +Categories=Game;AdventureGame; + + +# Translations +Comment[vls]=Droai wa test'n vo ManaPlus +Name[vls]=ManaPlus (Tests) +Icon[vls]=manaplus +Comment[it]=Testa ManaPlus +Name[it]=ManaPlus (Tests) +Icon[it]=manaplus +Comment[ja]=ManaPlusã®ãƒ†ã‚¹ãƒˆãƒ©ãƒ³ã™ã‚‹ +Name[ja]=ManaPlus (テスト) +Icon[ja]=manaplus +Comment[nl_BE]=Draai enkele testen voor ManaPlus +Name[nl_BE]=ManaPlus (Tests) +Icon[nl_BE]=manaplus +Comment[de]=Testlauf für ManaPlus +Name[de]=ManaPlus (Tests) +Icon[de]=manaplus +Comment[es]=Ejecutar pruebas para ManaPlus +Name[es]=ManaPlus (Pruebas) +Icon[es]=manaplus +Comment[fr]=Lancer le test pour ManaPlus +Name[fr]=ManaPlus (Tests) +Icon[fr]=manaplus diff --git a/nightly/buildlinux.sh b/nightly/buildlinux.sh index 4fcc828f2..b6f3efc77 100755 --- a/nightly/buildlinux.sh +++ b/nightly/buildlinux.sh @@ -28,4 +28,5 @@ then mkdir -p $DSTDIR/bin cp src/manaplus $DSTDIR/bin cp nightly/runme.sh $DSTDIR + cp "nightly/run tests.sh" $DSTDIR fi diff --git a/nightly/run tests.sh b/nightly/run tests.sh new file mode 100755 index 000000000..f72450c58 --- /dev/null +++ b/nightly/run tests.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +DIR=$(dirname "$(readlink -f "$0")") +cd "$DIR" +export LD_LIBRARY_PATH="$DIR"/libs/:$LD_LIBRARY_PATH +./bin/manaplus --tests diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index ebb2002a1..92f653816 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -268,8 +268,6 @@ Section "Core files (required)" SecCore File "${SRCDIR}\README.txt" SetOutPath "$INSTDIR\data\fonts" File "${SRCDIR}\data\fonts\*.ttf" - SetOutPath "$INSTDIR\data\graphics" - File "${SRCDIR}\data\graphics\*.png" SetOutPath "$INSTDIR\data\graphics\gui" File "${SRCDIR}\data\graphics\gui\*.png" File "${SRCDIR}\data\graphics\gui\*.xml" @@ -333,13 +331,15 @@ Section "Create Shortcuts" SecShortcuts CreateShortCut "$SMPROGRAMS\Mana\ManaPlus.lnk" "$INSTDIR\manaplus.exe" CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode + CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests CreateShortCut "$DESKTOP\ManaPlus.lnk" "$INSTDIR\manaplus.exe" + CreateShortCut "$DESKTOP\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings" SectionEnd -Section /o "Music" SecMusic - AddSize 17602 +Section /o "Tmw music" SecTmwMusic + AddSize 25200 CreateDirectory "$INSTDIR\data\music" SetOutPath "$INSTDIR\data\music" NSISdl::download "http://downloads.sourceforge.net/themanaworld/tmwmusic-0.3.tar.gz" "$TEMP\tmwmusic-0.3.tar.gz" @@ -353,6 +353,29 @@ Section /o "Portable" SecPortable File "portable.xml" SectionEnd +Section /o "Evol Online music" SecEvolMusic + AddSize 9787 + CreateDirectory "$INSTDIR\data\music" + SetOutPath "$INSTDIR\data\music" + NSISdl::download "http://downloads.sourceforge.net/project/evolonline/music/evolmusic-beta1-1.tar.gz" "$TEMP\evolmusic-beta1-1.tar.gz" + untgz::extract -j -d "$INSTDIR\data\music" "$TEMP\evolmusic-beta1-1.tar.gz" + Delete "$TEMP\evolmusic-beta1-1.tar.gz" +SectionEnd + +Section "Evol Online shortcuts" SecEvol + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\data\evol" + CreateDirectory "$INSTDIR\data\evol\images" + + SetOutPath "$INSTDIR" + File "${SRCDIR}\data\evol\evol.manaplus" + SetOutPath "$INSTDIR\data\evol\images" + File "${SRCDIR}\data\evol\images\*.png" + + CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' + CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' +SectionEnd + Section "Translations" SecTrans SetOutPath "$INSTDIR" File /nonfatal /r "${SRCDIR}\translations" @@ -362,8 +385,10 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files." !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts and register extensions." - !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background tmw music. (If selected the tmw music will be downloaded from the internet.)" + !insertmacro MUI_DESCRIPTION_TEXT ${SecTmwMusic} "Background tmw music. (If selected the tmw music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)" + !insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online." + !insertmacro MUI_DESCRIPTION_TEXT ${SecEvolMusic} "Background evol music. (If selected the evol music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English." !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -400,11 +425,16 @@ Section Uninstall Delete "$SMPROGRAMS\Mana\Uninstall.lnk" Delete "$DESKTOP\ManaPlus.lnk" + Delete "$DESKTOP\ManaPlus (tests).lnk" Delete "$SMPROGRAMS\Mana\ManaPlus.lnk" Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" Delete "$SMPROGRAMS\Mana\Website.lnk" Delete "$SMPROGRAMS\Mana\Readme.lnk" Delete "$SMPROGRAMS\Mana\FAQ.lnk" + Delete "$SMPROGRAMS\Mana\EvolOnline.lnk" + Delete "$DESKTOP\EvolOnline.lnk" RMDir "$SMPROGRAMS\Mana" @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/" "cs/)\n" "Language: cs\n" @@ -43,113 +43,113 @@ msgstr "" msgid "I" msgstr "" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "NastavenÃ" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Výkon" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Video" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "PÅ™ipojuji se k serveru" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "PÅ™ihlaÅ¡uji se" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Vstupuji do hernÃho svÄ›ta" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Požaduji postavy" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "PÅ™ipojuji se k hernÃmu serveru" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Zaměňuji hernà servery" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Chyba" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Požaduji registraÄnà detaily" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "ZmÄ›na hesla" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Heslo úspěšnÄ› zmÄ›nÄ›no!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "ZmÄ›na emailu" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Email úspěšnÄ› zmÄ›nÄ›n!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "ZruÅ¡enà registrace úspěšné" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Nashledanou, vraÅ¥te se kdykoli..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Neplatný host updatů: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Chyba pÅ™i vytvářenà adresáře s updaty!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Neznámý pÅ™Ãkaz." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Nelze zaslat prázdné Å¡eptánÃ!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,105 +158,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:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Chybà jméno party." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Chybà jméno guildy." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "ProsÃm zadej jméno." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Enter pÅ™epÃná chat." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Zpráva zavÃrá chat." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Enter nynà pÅ™epÃná chat." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Zpráva nynà ukonÄuje chat." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "pÅ™Ãtel" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "pÅ™ehlÞený" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutrálnÃ" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "HrÃ¡Ä je již %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "HrÃ¡Ä byl úspěšnÄ› zaÅ™azen jako %s!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "HrÃ¡Ä nemůže být zaÅ™azen jako %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "HrÃ¡Ä nebyl ignorován!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "HrÃ¡Ä již nenà ignorován!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "HrÃ¡Ä nemůže být odignorován!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "HrÃ¡Ä již byl vymazán!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "HrÃ¡Ä byl úspěšnÄ› vymazán!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "HrÃ¡Ä nemůže být vymazán!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Doba bÄ›hu klienta: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -264,7 +264,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" @@ -272,7 +272,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -280,7 +280,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -288,7 +288,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -296,27 +296,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "velikost chache fontů" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Velikost cache:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "VytvoÅ™eno:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "OdstranÄ›no:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "" @@ -325,43 +325,43 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "SnÃmky obrazovky ukládat jako " -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Ukládánà snÃmku obrazovky selhalo!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "Spojenà se serverem bylo ztraceno." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Chyba sÃtÄ›" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Ignorovat pÅ™Ãchozà žádosti o obchodovánÃ" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Akceptovat pÅ™Ãchozà žádosti o obchodovánÃ" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Nelze naÄÃst mapu" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Chyba pÅ™i naÄÃtánà %s" @@ -396,7 +396,7 @@ msgstr "Jméno" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Útok" @@ -415,7 +415,7 @@ msgstr "" msgid "Result" msgstr "Výsledek" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Vynulovat" @@ -438,16 +438,16 @@ msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "" @@ -459,8 +459,8 @@ msgid "Quit" msgstr "UkonÄit" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "VÅ¡e" @@ -484,14 +484,14 @@ msgstr "Prodej" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "ZruÅ¡it" @@ -523,7 +523,7 @@ msgid "The email address entries mismatch." msgstr "Emailové adresy nesouhlasÃ." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "ZmÄ›nit heslo" @@ -589,8 +589,8 @@ msgstr "ÚÄes:" msgid "Race:" msgstr "Rasa:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "VytvoÅ™it" @@ -632,47 +632,47 @@ msgstr "Jste si jistÃ, že chcete smazat tuto postavu?" msgid "Account and Character Management" msgstr "Správa úÄtu a postavy" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "PÅ™epnout pÅ™ihlášenÃ" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "ZruÅ¡it registraci" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "ZmÄ›nit email" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Å patné heslo" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Zadej heslo pro smazánà postavy" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Zadej heslo:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Smazat" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Vybrat" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "" @@ -746,12 +746,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "PÅ™Ãtomno: %s; %d hráÄů je pÅ™Ãtomno." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Å eptánà pro %s: %s" @@ -915,7 +915,7 @@ msgid "Did You Know?" msgstr "VÃte že ... ?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "ZavÅ™Ãt" @@ -943,8 +943,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Odstranit z vybavenÃ" @@ -986,26 +986,26 @@ msgid "Filter:" msgstr "Filtr:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Vybavit" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "PoužÃt" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Upustit..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "RozdÄ›lit" @@ -1019,17 +1019,17 @@ msgid "Weight:" msgstr "Hmotnost:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Uložit" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "VzÃt" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Upustit" @@ -1254,31 +1254,27 @@ msgstr "stavový řádek" msgid "Need" msgstr "PotÅ™ebujeÅ¡" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "ÄŒeká se na server" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "DalÅ¡Ã" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Odeslat" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Vyprázdnit" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> DalÅ¡Ã" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Komu:" @@ -1297,6 +1293,7 @@ msgid "Outfit: %d" msgstr "Výstroj: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Klávesa: %s" @@ -1380,7 +1377,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "KompletnÄ› ignorovat" @@ -1432,7 +1429,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Svléct" @@ -1484,8 +1481,8 @@ msgstr "HráÄi" msgid "Pick up" msgstr "Sebrat" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Vložit do chatu" @@ -1497,8 +1494,8 @@ msgstr "OznaÄit na mapÄ›" msgid "Rename" msgstr "PÅ™ejmenovat" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Odebrat" @@ -1507,8 +1504,8 @@ msgid "Warp" msgstr "" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "NaÄÃst staré výstroje" +msgid "Clear outfit" +msgstr "" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1546,119 +1543,118 @@ msgstr "Zapnout \"away\"" msgid "Disable away" msgstr "Vypnout \"away\"" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "OdejÃt" #: src/gui/popupmenu.cpp:654 -#, fuzzy msgid "Copy to clipboard" -msgstr "ZkopÃrovat do chatu" +msgstr "" #: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 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:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Jméno: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "HráÄův komentář" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "Komentář: " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "PÅ™idat do transakce" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "PÅ™idat 10 do transakce" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "PÅ™idat polovinu do transakce" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "PÅ™idat vÅ¡e do transakce" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Uschovat 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Uschovat polovinu" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Uschovat vÅ¡echny" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Upustit vÅ¡e" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "VzÃt 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "VzÃt polovinu" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "VzÃt vÅ¡echny" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "NaÄÃst staré zkratky vÄ›cÃ" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "NaÄÃst staré zkratky upuÅ¡tÄ›nÃ" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Skrýt" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Zobrazit" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Resetovat žlutý pruh" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "ZkopÃrovat do chatu" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Posunout nahoru" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Posunout dolů" @@ -1755,11 +1751,11 @@ msgstr "PÅ™ipravuji staženÃ" msgid "Error retreiving server list!" msgstr "Chyba pÅ™i zÃskávánà seznamu serverů!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "potÅ™ebuje novÄ›jÅ¡Ã verzi" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "potÅ™ebuje v%s" @@ -2703,194 +2699,204 @@ msgstr "" msgid "Lvl: %d (%+d)" msgstr "" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gilda" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Pozvali jste %s do gildy %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Požadován odchod z gildy %s." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "ÄŒlen pozval do gildy" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, 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:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Opustit gildu?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, 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:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Parta" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "" -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Prioritnà monstra" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "ÚtoÄit na monstra" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Ignorovat monstra" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "VytvoÅ™it gildu" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "VytvoÅ™it partu" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "SpoleÄenstvÃ" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Pozvat" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "PÅ™ijato pozvánà do party od %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "OdmÃtnuto pÅ™ijetà do party od %s." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "PÅ™ijato pozvánà do gildy od %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "OdmÃtnuto pozvánà do gildy od %s." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "VytvářÃm gildu s názvem %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "VytvářÃm partu s názvem %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Název gildy" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Zvolte jméno vaÅ¡Ã gildy." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 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:1431 +#: src/gui/socialwindow.cpp:1559 #, 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:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "PÅ™Ãlmout pozvánà do gildy" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 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:1463 +#: src/gui/socialwindow.cpp:1591 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:1467 +#: src/gui/socialwindow.cpp:1595 #, 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:1475 +#: src/gui/socialwindow.cpp:1603 #, 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:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "PÅ™ijmout pozvánà do party" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 msgid "Cannot create party. You are already in a party" msgstr "Nemohu vytvoÅ™it partu. Již jste Älenem party." -#: src/gui/socialwindow.cpp:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Jméno party" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Zvolte jméno vaÅ¡Ã party." @@ -3080,33 +3086,33 @@ msgstr "" msgid "Name: %s" msgstr "Jméno: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Aktualizuje se..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "PÅ™ipojuji se..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Hrát" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 Proces aktualizace nenà kompletnÃ." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 silnÄ› doporuÄujeme zkusit" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 aktualizaci pozdÄ›ji" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Hotovo" @@ -3258,23 +3264,23 @@ msgstr "Hranice domácÃho mÃsta" msgid "Road Point" msgstr "Bod cesty" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Kdo je online - Obnovuji" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Obnovit" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Kdo je online - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Kdo je online - chyba" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "" @@ -3981,40 +3987,41 @@ msgstr "" "chovat podivnÄ›." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "Zabil vás " +#, c-format +msgid "You were killed by %s" +msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Snažili jste se sebrat neexistujÃcà pÅ™edmÄ›t." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "PÅ™edmÄ›t je pÅ™ÃliÅ¡ těžký." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "PÅ™edmÄ›t je pÅ™ÃliÅ¡ daleko." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "Inventář je plný." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "Hromada je pÅ™ÃliÅ¡ velká." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "PÅ™edmÄ›t patřà nÄ›komu jinému." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 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:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4022,386 +4029,388 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) výchozà pohyby" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(I) invertované pohyby" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) pohyby s trochou Å¡Ãlených pohybů" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) pohyby s Å¡Ãlenými pohyby" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) dvojité normálnà + Å¡Ãlené" -#: src/localplayer.cpp:1896 -#, fuzzy +#: src/localplayer.cpp:1903 msgid "(?) unknown move" -msgstr "(?) neznámé následovánÃ" +msgstr "" -#: src/localplayer.cpp:1918 -#, fuzzy, c-format +#: src/localplayer.cpp:1925 +#, c-format msgid "(%d) crazy move number %d" -msgstr "(?) Å¡Ãlené pohyby" +msgstr "" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) vlastnà šÃlené pohyby" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) Å¡Ãlené pohyby" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) výchozà pohyb k cÃli" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) pohyb k cÃli do vzdálenosti 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) pohyb k cÃli do vzdálenosti 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) pohyb k cÃli do vzdálenosti 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) pohyb k cÃli do vzdálenosti 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) pohyb k cÃli do vzdálenosti 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) pohyb k cÃli na útoÄný dosah" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) pohyb k cÃli" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) výchozà následovánÃ" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) relativnà následovánÃ" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) zrcadlené následovánÃ" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) neznámé následovánÃ" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) útok" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) výchozà útok" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) pÅ™epÃnat útok bez Å¡tÃtu" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) pÅ™epÃnat útok se Å¡tÃtem" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) jdi a útoÄ" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) jdi, útoÄ, sbÃrej" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) bez automatického útoku" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) malý sbÄ›r 1x1 pole" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) výchozà sbÄ›r 2x1 pole" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) sbÄ›r pÅ™ed 2x3 pole" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) sbÄ›r 3x3 pole" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) jdi a seber do vzdálenosti 4" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(G) jdi a seber do vzdálenosti 8" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) jdi a seber do max. vzdálenosti" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) sbÄ›r" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) Normálnà zobrazenà mapy" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) debug zobrazenà mapy" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) ultra zobrazenà mapy" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) ultra zobrazenà mapy 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) zobrazen prázdné mapy" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) zobrazenà ÄernobÃlé mapy" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) použij #flar pro magický útok" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) použij #chiza pro magický útok" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) použij #ingrav pro magický útok" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) použij #frillyar pro magický útok" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) použij #upmarmu pro magický útok" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) magický útok attack" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) výchozà imitace" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) imitace výstroje" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) imitace" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) u poÄÃtaÄe" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) pryÄ (away)" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) away" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) mód hernà kamery" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) mód volné kamery" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Modifikátory hry jsou zapnuty" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Modifikátory hry jsou vypnuty" -#: src/localplayer.cpp:2234 -#, fuzzy +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" -msgstr "Modifikátory hry jsou zapnuty" +msgstr "" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Následovánà zruÅ¡eno." -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Imitace zruÅ¡ena." -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "VidÃte " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "NastavenÃ:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4459,7 +4468,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Å patné jméno." @@ -4475,15 +4484,19 @@ msgstr "Nesprávný úÄes." msgid "Incorrect slot." msgstr "Nesprávný slot." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "informaceInfo" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Postava odstranÄ›na." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "NepodaÅ™ilo se odstranit postavu." @@ -4528,16 +4541,16 @@ msgstr "" msgid "All whispers unignore failed." msgstr "" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "pÅ™ipojených uživatel: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Hra" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "" @@ -4627,11 +4640,11 @@ msgstr "Neznámá odpovÄ›Ä na pozváku do gildy." msgid "%s has left your guild." msgstr "%s opustil vaÅ¡i gildu." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "Byl jste vykopnut z gildy." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%s byl vykopnut z vaÅ¡Ã gildy." @@ -4760,54 +4773,54 @@ msgstr "Půvonà heslo je nesprávné." msgid "New password too short." msgstr "Nové heslo je pÅ™ÃliÅ¡ krátké." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "Neregistované ID." -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Å patné heslo." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "Platnost úÄtu vyprÅ¡ela." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "OdmÃtnut ze serveru." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Klient je pÅ™ÃliÅ¡ starý." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, 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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Server je pÅ™elidnÄ›ný." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Toto uživatelské jméno je již použÃváno." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Uživatelské jméno bylo trvale odstranÄ›no." @@ -5151,7 +5164,7 @@ msgstr "" msgid "Trade completed." msgstr "" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "SÃla" @@ -5160,7 +5173,7 @@ msgstr "SÃla" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Hbitost" @@ -5169,7 +5182,7 @@ msgstr "Hbitost" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Obratnost" @@ -5178,7 +5191,7 @@ msgstr "Obratnost" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Vitalita" @@ -5187,7 +5200,7 @@ msgstr "Vitalita" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Inteligence" @@ -5519,50 +5532,50 @@ msgstr "" msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Å tÄ›stÃ" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "" @@ -5583,140 +5596,47 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Útok %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Obrana %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Neznámý pÅ™edmÄ›t" - -#~ msgid "(?) move" -#~ msgstr "(?) pohyb" - -#~ msgid "(?) map view" -#~ msgstr "(?) zobrazenà pamy" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(I)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr " (2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" @@ -4,17 +4,18 @@ # # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. -# <clos3rlook@gmail.com>, 2011. +# <clos3rlook@gmail.com>, 2011, 2012. # <der.loisl@gmx.de>, 2011. # <jack@krass.com>, 2011. # <Necromong@inbox.ru>, 2011. +# Rosemarie Tauber <horos@online.de>, 2012. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/" "de/)\n" "Language: de\n" @@ -25,7 +26,7 @@ msgstr "" #: src/actorspritemanager.cpp:1169 msgid "Visible on map" -msgstr "" +msgstr "Sichtbar au der Karte" #: src/being.cpp:553 msgid "dodge" @@ -38,121 +39,121 @@ msgstr "verfehlt" #. TRANSLATORS: this away status writed in player nick #: src/being.cpp:1534 msgid "A" -msgstr "" +msgstr "A" #. TRANSLATORS: this inactive status writed in player nick #: src/being.cpp:1539 msgid "I" -msgstr "" +msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Einstellungen" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" -msgstr "" +msgstr "Leistung" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Video" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Verbinde zum Server" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Anmelden" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Betrete die Spielwelt" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Spielfiguren werden angefragt" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Verbinde zum Charakterserver" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Charakterserver wechseln" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Fehler" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Anfrage der Registrierungsdetails" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Passwort ändern" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Passwort erfolgreich geändert!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "E-Mail ändern" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "E-Mail erfolgreich geändert!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "erfolgreich abgemeldet." -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Leb wohl und komme jeder Zeit wieder..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Ungültiger Updateserver: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Unbekannter Befehl." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Kann keine leeren Nachrichten versenden!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -161,160 +162,160 @@ msgstr "" "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, " "oder du bist es selbst." -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Anfrage den Kanal %s betreten zu dürfen." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Name der Party fehlt." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Name der Gilde fehlt." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Bitte gib einen Namen an." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Nachricht schließt den Chat." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Enter aktiviert jetzt den Chat." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Nachricht schließt jetzt den Chat." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "Freund" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "unbeachtet" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Spieler ist bereits %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Spieler erfolgreich %s!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Spieler konnte nicht %s werden!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Spieler wurde nicht ignoriert!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Spieler wird nicht länger ignoriert!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" -msgstr "" +msgstr "Feind" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Spieler ist bereits gelöscht!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Spieler erfolgreich gelöscht!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Spieler konnte nicht gelöscht werden!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" -msgstr "" +msgstr "Client läuft seit: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d Woche" +msgstr[1] "%d Wochen" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d Tag" +msgstr[1] "%d Tage" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d Stunde" +msgstr[1] "%d Stunden" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d Minute" +msgstr[1] "%d Minuten" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d Sekunde" +msgstr[1] "%d Sekunden" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" -msgstr "" +msgstr "Erstellt:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" -msgstr "" +msgstr "Gelöscht:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "" @@ -324,43 +325,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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Allgemein" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Debug" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Bildschirmfoto gespeichert unter" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Bildschirmfoto konnte nicht gespeichert werden!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "Die Verbindung zum Server wurde getrennt." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Netzwerkfehler" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Ignoriere eingehende Handelsanfragen" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Akzeptiere eingehende Handelsanfragen" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Karte konnte nicht geladen werden." -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Fehler beim Laden von %s" @@ -395,7 +396,7 @@ msgstr "Name" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Angriff" @@ -414,7 +415,7 @@ msgstr "Bewegen" msgid "Result" msgstr "Resultat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Zurücksetzten" @@ -432,21 +433,21 @@ msgstr "Preis: %s / Gesamt: %s" #: src/gui/buydialog.cpp:103 msgid "Amount:" -msgstr "" +msgstr "Menge" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -458,8 +459,8 @@ msgid "Quit" msgstr "Beenden" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Max" @@ -483,14 +484,14 @@ msgstr "Verkaufen" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Abbrechen" @@ -522,7 +523,7 @@ msgid "The email address entries mismatch." msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Passwort ändern" @@ -586,10 +587,10 @@ msgstr "Frisur:" #: src/gui/charcreatedialog.cpp:101 msgid "Race:" -msgstr "" +msgstr "Rasse:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Erstellen" @@ -631,47 +632,47 @@ msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?" msgid "Account and Character Management" msgstr "Account- und Charakterverwaltung" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Login wechseln" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Abmelden" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "E-Mailadresse ändern" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" -msgstr "" +msgstr "Falsches Passwort" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" -msgstr "" +msgstr "Gebe dein Passwort ein, um den Charakter zu löschen" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" -msgstr "" +msgstr "Gib dein Passwort ein:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Löschen" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Wähle" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Level: %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(leer)" @@ -745,12 +746,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Anwesend: %s ;%d Spieler sind anwesend." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Flüsternd zu %s: %s" @@ -780,7 +781,7 @@ msgstr "Karte" #: src/gui/debugwindow.cpp:73 msgid "Target" -msgstr "" +msgstr "Ziel" #: src/gui/debugwindow.cpp:74 msgid "Net" @@ -818,7 +819,7 @@ msgstr "" #: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237 #: src/gui/debugwindow.cpp:256 msgid "Map actors count:" -msgstr "" +msgstr "Anzahl aktiver Mapobjekte:" #: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175 #, c-format @@ -882,39 +883,39 @@ msgstr "" #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 #: src/gui/debugwindow.cpp:351 msgid "Minimal hit:" -msgstr "" +msgstr "Minimaler Treffer" #: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 #: src/gui/debugwindow.cpp:352 msgid "Maximum hit:" -msgstr "" +msgstr "Maximaler Treffer" #: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 #: src/gui/debugwindow.cpp:353 msgid "Critical hit:" -msgstr "" +msgstr "Kritischer Treffer" #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 #, c-format msgid "Ping: %s ms" -msgstr "" +msgstr "Ping: %s ms" #: src/gui/debugwindow.cpp:395 #, c-format msgid "In: %d bytes/s" -msgstr "" +msgstr "Eingehend: %d bytes/s" #: src/gui/debugwindow.cpp:397 #, c-format msgid "Out: %d bytes/s" -msgstr "" +msgstr "Ausgehend: %d bytes/s" #: src/gui/didyouknowwindow.cpp:47 msgid "Did You Know?" -msgstr "" +msgstr "Wusstest du schon?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Schließen" @@ -942,8 +943,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Ablegen" @@ -985,26 +986,26 @@ msgid "Filter:" msgstr "Filter:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Ausrüsten" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Benutzen" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Wegwerfen" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Aufteilen" @@ -1018,17 +1019,17 @@ msgid "Weight:" msgstr "Gewicht:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Aufbewahren" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Abholen" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Wegwerfen" @@ -1080,7 +1081,7 @@ msgstr "Gewicht: %s" #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69 msgid "Kill stats" -msgstr "" +msgstr "Besiegte Gegner Statistik" #: src/gui/killstats.cpp:67 msgid "Reset stats" @@ -1093,7 +1094,7 @@ msgstr "Timer zurücksetzen" #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" -msgstr "" +msgstr "Level: %d bei %f%%" #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format @@ -1155,12 +1156,12 @@ msgstr "" #: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" -msgstr "" +msgstr "Zeit bis zum nächsten Level: %s" #: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" -msgstr "" +msgstr "%s %d?" #: src/gui/killstats.cpp:370 msgid "jacko spawning" @@ -1213,15 +1214,15 @@ msgstr "Wechsle den Server" #: src/gui/ministatuswindow.cpp:59 msgid "health bar" -msgstr "" +msgstr "Gesunfheits Balken" #: src/gui/ministatuswindow.cpp:65 msgid "mana bar" -msgstr "" +msgstr "Mana Balken" #: src/gui/ministatuswindow.cpp:77 msgid "experience bar" -msgstr "" +msgstr "Erfahrungs Balken" #: src/gui/ministatuswindow.cpp:83 msgid "job bar" @@ -1229,53 +1230,49 @@ msgstr "" #: src/gui/ministatuswindow.cpp:92 msgid "weight bar" -msgstr "" +msgstr "Gewichts Balken" #: src/gui/ministatuswindow.cpp:95 msgid "inventory slots bar" -msgstr "" +msgstr "Inventar Steckplatz Balken" #: src/gui/ministatuswindow.cpp:98 msgid "money bar" -msgstr "" +msgstr "Geld Balken" #: src/gui/ministatuswindow.cpp:101 msgid "arrows bar" -msgstr "" +msgstr "Pfeile Balken" #: src/gui/ministatuswindow.cpp:104 msgid "status bar" -msgstr "" +msgstr "Status Balken" #: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336 msgid "Need" msgstr "Muss" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Warte auf Server" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Weiter" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Absenden" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Frei" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Nach:" @@ -1294,6 +1291,7 @@ msgid "Outfit: %d" msgstr "Ausrüstung: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Taste: %s" @@ -1349,7 +1347,7 @@ msgstr "" #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 #: src/gui/popupmenu.cpp:702 msgid "Set as enemy" -msgstr "" +msgstr "Als Feind setzen" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 @@ -1361,7 +1359,7 @@ msgstr "" #: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 #: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 msgid "Erase" -msgstr "" +msgstr "Löschen" #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 #: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 @@ -1377,7 +1375,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "@@ignore|Ignoriere %s komplett@@" @@ -1389,11 +1387,11 @@ msgstr "Folgen" #: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 #: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Imitation" -msgstr "" +msgstr "Imitation" #: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 msgid "Invite to party" -msgstr "" +msgstr "Lade ein zu Party" #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 #: src/gui/popupmenu.cpp:774 @@ -1429,9 +1427,9 @@ msgid "Show Items" msgstr "" #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" -msgstr "" +msgstr "Ausziehen" #: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301 #: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 @@ -1442,12 +1440,12 @@ msgstr "Kommentar hinzufügen" #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 #: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 msgid "Buy (?)" -msgstr "" +msgstr "Kaufen(?)" #: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 #: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Sell (?)" -msgstr "" +msgstr "Verkaufen(?)" #: src/gui/popupmenu.cpp:312 msgid "Kick" @@ -1455,7 +1453,7 @@ msgstr "" #: src/gui/popupmenu.cpp:323 msgid "Remove from attack list" -msgstr "" +msgstr "Entferne aus Angriffsliste" #: src/gui/popupmenu.cpp:328 msgid "Add to priority attack list" @@ -1463,11 +1461,11 @@ msgstr "" #: src/gui/popupmenu.cpp:330 msgid "Add to attack list" -msgstr "" +msgstr "Hinzufügen zur Angriffsliste" #: src/gui/popupmenu.cpp:332 msgid "Add to ignore list" -msgstr "" +msgstr "Hinzufügen zur Ignorierenliste" #: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 msgid "Add name to chat" @@ -1481,30 +1479,30 @@ msgstr "Spieler" msgid "Pick up" msgstr "Aufheben" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Zu Chat hinzufügen" #: src/gui/popupmenu.cpp:566 msgid "Map Item" -msgstr "" +msgstr "Karteneinstellung" #: src/gui/popupmenu.cpp:567 msgid "Rename" msgstr "Umbenennen" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Entfernen" #: src/gui/popupmenu.cpp:573 msgid "Warp" -msgstr "" +msgstr "Warp" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" +msgid "Clear outfit" msgstr "" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 @@ -1533,128 +1531,128 @@ msgstr "" #: src/gui/popupmenu.cpp:642 msgid "Remove name" -msgstr "" +msgstr "Lösche Name" #: src/gui/popupmenu.cpp:644 msgid "Enable away" -msgstr "" +msgstr "Aktiviere abwesend" #: src/gui/popupmenu.cpp:646 msgid "Disable away" -msgstr "" +msgstr "Deaktiviere abwesend" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Verlassen" #: src/gui/popupmenu.cpp:654 msgid "Copy to clipboard" -msgstr "" +msgstr "Kopiere in die Zwischenablage" #: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "Position der Gilde ändern" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Kartenzeichen umbenennen" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Name:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " -msgstr "" +msgstr "Spieler Kommentar " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " -msgstr "" +msgstr "Kommentar: " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" -msgstr "" +msgstr "Zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" -msgstr "" +msgstr "10 zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" -msgstr "" +msgstr "Die hälfte zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" -msgstr "" +msgstr "Allles zum Handeln hinzufügen" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "10 aufbewahren" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Die Hälfte aufbewahren" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Alles aufbewahren" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "10 abholen" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Die Hälfte abholen" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Alles abholen" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" -msgstr "" +msgstr "Lade alte Tastenkombinationen für Objekte" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" -msgstr "" +msgstr "Lade alte Tastenkombinationen zum fallen Lassen" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" -msgstr "" +msgstr "Verstecken" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" -msgstr "" +msgstr "Zeigen" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" -msgstr "" +msgstr "Setze gelben Balken zurück" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" -msgstr "" +msgstr "Kopiere zu Chat" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" -msgstr "" +msgstr "(normal)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "" @@ -1704,7 +1702,7 @@ msgstr "Wähle deinen Server" #: src/gui/serverdialog.cpp:248 msgid "Choose Your Server *** SAFE MODE ***" -msgstr "" +msgstr "Wähle einen Server ***SICHERER MODUS ***" #: src/gui/serverdialog.cpp:253 msgid "Port:" @@ -1712,7 +1710,7 @@ msgstr "Port:" #: src/gui/serverdialog.cpp:257 msgid "Use same ip for game sub servers" -msgstr "" +msgstr "Benutze die selbe IP auf Zweitservern des Spiels" #: src/gui/serverdialog.cpp:271 msgid "Server type:" @@ -1751,11 +1749,11 @@ msgstr "Download wird vorbereitet" msgid "Error retreiving server list!" msgstr "Fehler beim Empfangen der Serverliste!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "benötigt eine neuere Version" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "benötigt v%s" @@ -1824,7 +1822,7 @@ msgstr "Zeige Chatfarben-Liste" #: src/gui/setup_chat.cpp:64 msgid "Commands" -msgstr "" +msgstr "Befehle" #: src/gui/setup_chat.cpp:66 msgid "Allow magic and GM commands in all chat tabs" @@ -1900,7 +1898,7 @@ msgstr "Zeit" #: src/gui/setup_chat.cpp:120 msgid "Use local time" -msgstr "" +msgstr "Benutze lokale Zeit" #: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" @@ -2047,7 +2045,7 @@ msgstr "Angriffsziele der Monster einkreisen" #: src/gui/setup_other.cpp:66 msgid "Show warps particles" -msgstr "" +msgstr "Zeige Warp Partikel" #: src/gui/setup_other.cpp:69 msgid "Highlight map portals" @@ -2063,7 +2061,7 @@ msgstr "Angriffsbereich des Spielers hervorheben" #: src/gui/setup_other.cpp:78 msgid "Show extended minimaps" -msgstr "" +msgstr "Zeige erweiterte Minikarte" #: src/gui/setup_other.cpp:81 msgid "Draw path" @@ -2115,7 +2113,7 @@ msgstr "Eigenen HP-Balken anzeigen" #: src/gui/setup_other.cpp:117 msgid "Enable quick stats" -msgstr "" +msgstr "Aktiviere schnelleres Aufwerten der Spelerattribute" #: src/gui/setup_other.cpp:120 msgid "Cycle player targets" @@ -2131,7 +2129,7 @@ msgstr "" #: src/gui/setup_other.cpp:129 msgid "Afk message" -msgstr "" +msgstr "Abwesend Nachricht" #: src/gui/setup_other.cpp:132 msgid "Show job" @@ -2171,7 +2169,7 @@ msgstr "" #: src/gui/setup_other.cpp:168 msgid "Enable server side attack" -msgstr "" +msgstr "Aktiviere Angriff trotz Verzögerung" #: src/gui/setup_other.cpp:171 msgid "Enable bot checker" @@ -2187,11 +2185,11 @@ msgstr "Debug-Protokoll benutzen" #: src/gui/setup_other.cpp:181 msgid "Low traffic mode" -msgstr "" +msgstr "Niedriger Datenverkehr Modus" #: src/gui/setup_other.cpp:184 msgid "Hide shield sprite" -msgstr "" +msgstr "Zeige das Schild nicht an" #: src/gui/setup_other.cpp:187 msgid "Show background" @@ -2199,7 +2197,7 @@ msgstr "Zeige Hintergrund" #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" -msgstr "" +msgstr "Bessere Leistung (aktiviere für bessere Leistung)" #: src/gui/setup_perfomance.cpp:58 msgid "Auto adjust perfomance" @@ -2207,7 +2205,7 @@ msgstr "" #: src/gui/setup_perfomance.cpp:61 msgid "Hw acceleration" -msgstr "" +msgstr "Hw Beschleunigung" #: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" @@ -2219,7 +2217,7 @@ msgstr "" #: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" -msgstr "" +msgstr "Bessere Qualität (deaktiviere für bessere Leistung)" #: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" @@ -2319,7 +2317,7 @@ msgstr "" #: src/gui/setup_relations.cpp:76 msgid "Enemy" -msgstr "" +msgstr "Feind" #: src/gui/setup_relations.cpp:240 msgid "Allow trading" @@ -2367,39 +2365,39 @@ msgstr "Riesig" #: src/gui/setup_theme.cpp:146 msgid "Chinese (China)" -msgstr "" +msgstr "Chinesisch(China)" #: src/gui/setup_theme.cpp:147 msgid "Czech" -msgstr "" +msgstr "Tschechisch" #: src/gui/setup_theme.cpp:148 msgid "English" -msgstr "" +msgstr "Englisch" #: src/gui/setup_theme.cpp:149 msgid "Finnish" -msgstr "" +msgstr "Finnisch" #: src/gui/setup_theme.cpp:150 msgid "French" -msgstr "" +msgstr "Französisch" #: src/gui/setup_theme.cpp:151 msgid "German" -msgstr "" +msgstr "Deutsch" #: src/gui/setup_theme.cpp:152 msgid "Indonesian" -msgstr "" +msgstr "Indonesisch" #: src/gui/setup_theme.cpp:153 msgid "Polish" -msgstr "" +msgstr "Polnisch" #: src/gui/setup_theme.cpp:154 msgid "Japanese" -msgstr "" +msgstr "Japanisch" #: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" @@ -2407,15 +2405,15 @@ msgstr "" #: src/gui/setup_theme.cpp:156 msgid "Portuguese" -msgstr "" +msgstr "Portugiesisch" #: src/gui/setup_theme.cpp:157 msgid "Portuguese (Brazilian)" -msgstr "" +msgstr "Portugiesisch(Brasilien)" #: src/gui/setup_theme.cpp:158 msgid "Russian" -msgstr "" +msgstr "Russisch" #: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" @@ -2431,7 +2429,7 @@ msgstr "GUI Theme" #: src/gui/setup_theme.cpp:194 msgid "Language" -msgstr "" +msgstr "Sprache" #: src/gui/setup_theme.cpp:195 msgid "Main Font" @@ -2447,7 +2445,7 @@ msgstr "Schrift von Spieleraktionen" #: src/gui/setup_theme.cpp:198 msgid "Help font" -msgstr "" +msgstr "Hilfe Schriftart" #: src/gui/setup_theme.cpp:199 msgid "Secure font" @@ -2455,7 +2453,7 @@ msgstr "" #: src/gui/setup_theme.cpp:200 msgid "Japanese font" -msgstr "" +msgstr "Japanische Schrift" #: src/gui/setup_theme.cpp:237 msgid "Font size" @@ -2599,7 +2597,7 @@ msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft." #: src/gui/setup_video.cpp:514 msgid "Changing to OpenGL" -msgstr "" +msgstr "Wechsle zu OpenGL" #: src/gui/setup_video.cpp:515 msgid "Applying change to OpenGL requires restart." @@ -2627,7 +2625,7 @@ msgstr "" #: src/gui/setup_video.cpp:654 msgid "Particle Effect Settings Changed." -msgstr "" +msgstr "Partikeleffekteinstellungen wurden verändert" #: src/gui/setup_video.cpp:655 msgid "Changes will take effect on map change." @@ -2688,12 +2686,12 @@ msgstr "Fähigkeitspunkte verfügbar: %d" #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" -msgstr "" +msgstr "Fähigkeiten Tab %d" #: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" -msgstr "" +msgstr "Fähigkeit %d" #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format @@ -2703,196 +2701,206 @@ msgstr "Lvl: %d" #: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" -msgstr "" +msgstr "Lvl: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gilde" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "%s in die Gilde %s einladen." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." -msgstr "" +msgstr "Gilde %s Ausstieg angefragt," -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" -msgstr "" +msgstr "Lade Mitglied in die Gilde ein." -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, 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:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Guilde verlassen?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, 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:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Party" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "%s zur Party einladen." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "Partie %s Auflösung beauftragt." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" -msgstr "" +msgstr "Lade Mitglied in die Party ein." -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Wenn willst du zur Party %s einladen?" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "Partie verlassen?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, 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:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Gilde erstellen" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Party erstellen" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Sozial" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Einladen" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Partyeinladung von %s angenommen." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Partyeinladung von %s abgelehnt." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Guildeneinladung von %s angenommen." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Guildeneinladung von %s abgelehnt." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Erstelle der Gilde %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Erstelle die Party \"%s\"" -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Gildenname" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Wähle den Namen deiner Gilde" -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." -msgstr "" +msgstr "Anfrage für eine Party erhalten, es wurde schoneinmal angefragt." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, 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:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Nehme Gildeneinladung an" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 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:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "Du wurdest zu einer Party eingeladen." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." msgstr "Du wurdest zu der Party %s eingeladen." -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s hat dich in seine Party eingeladen." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Nehme Partyeinladung an" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Partyname" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Name deiner Party wählen." @@ -2936,7 +2944,7 @@ msgstr "Job:" #: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 #, c-format msgid "Character points: %d" -msgstr "" +msgstr "Charakterpunkte: %d" #: src/gui/statuswindow.cpp:269 #, c-format @@ -2946,7 +2954,7 @@ msgstr "Level: %d (GM %d)" #: src/gui/statuswindow.cpp:325 #, c-format msgid "Correction points: %d" -msgstr "" +msgstr "Korrekturpunkte: %d" #: src/gui/textcommandeditor.cpp:113 msgid "No Target" @@ -2986,7 +2994,7 @@ msgstr "Astralmagie" #: src/gui/textcommandeditor.cpp:168 msgid "Command Editor" -msgstr "" +msgstr "Kommando Editor" #: src/gui/textcommandeditor.cpp:185 msgid "magic" @@ -3014,7 +3022,7 @@ msgstr "Mana:" #: src/gui/textcommandeditor.cpp:209 msgid "Target Type:" -msgstr "" +msgstr "Art des Anvisierens:" #: src/gui/textcommandeditor.cpp:215 msgid "Icon:" @@ -3030,7 +3038,7 @@ msgstr "Magieschule:" #: src/gui/textcommandeditor.cpp:233 msgid "School level:" -msgstr "" +msgstr "Schul-Level" #: src/gui/textcommandeditor.cpp:238 msgid "Save" @@ -3059,7 +3067,7 @@ msgstr "Handel: Du" #: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167 #, c-format msgid "You get %s" -msgstr "" +msgstr "Du bekommst %s" #: src/gui/tradewindow.cpp:112 msgid "You give:" @@ -3084,33 +3092,33 @@ msgstr "" msgid "Name: %s" msgstr "Name : %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Aktualisiere..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Verbinde..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Los!" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 Update wurde nicht erfolgreich abgeschlossen." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 Es wird dringend empfohlen," #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." -msgstr "" +msgstr "##1 Du versuchts es später erneut." -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Fertig" @@ -3120,19 +3128,19 @@ msgstr "Aktionen" #: src/gui/userpalette.cpp:117 msgid "Friend Names" -msgstr "" +msgstr "Namen der Freunde" #: src/gui/userpalette.cpp:118 msgid "Disregarded Names" -msgstr "" +msgstr "Außer Acht gelassene Namen" #: src/gui/userpalette.cpp:119 msgid "Ignored Names" -msgstr "" +msgstr "Ignorierte Namen" #: src/gui/userpalette.cpp:120 msgid "Erased Names" -msgstr "" +msgstr "Gelöschte Namen" #: src/gui/userpalette.cpp:121 msgid "Other Players' Names" @@ -3152,19 +3160,19 @@ msgstr "NPCs" #: src/gui/userpalette.cpp:126 msgid "Monster HP bar" -msgstr "" +msgstr "Monster HP Leiste" #: src/gui/userpalette.cpp:128 msgid "Monster HP bar (second color)" -msgstr "" +msgstr "Monster HP Leiste (zweite Farbe)" #: src/gui/userpalette.cpp:129 msgid "Party Members" -msgstr "" +msgstr "Mitglieder der Party" #: src/gui/userpalette.cpp:130 msgid "Guild Members" -msgstr "" +msgstr "Mitglieder der Gilde" #: src/gui/userpalette.cpp:131 msgid "Particle Effects" @@ -3180,15 +3188,15 @@ msgstr "Anzeige der Erfahrungspunkte" #: src/gui/userpalette.cpp:134 msgid "Player HP bar" -msgstr "" +msgstr "HP-Leiste des Spielers" #: src/gui/userpalette.cpp:136 msgid "Player HP bar (second color)" -msgstr "" +msgstr "HP-Leiste des Spielers (zweite Farbe)" #: src/gui/userpalette.cpp:137 msgid "Player Hits Monster" -msgstr "" +msgstr "Spieler trifft Monster" #: src/gui/userpalette.cpp:138 msgid "Monster Hits Player" @@ -3196,7 +3204,7 @@ msgstr "Monster trifft Spieler" #: src/gui/userpalette.cpp:140 msgid "Other Player Hits Local Player" -msgstr "" +msgstr "Ein Spieler hat dich getroffen" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" @@ -3204,15 +3212,15 @@ msgstr "Kritischer Treffer" #: src/gui/userpalette.cpp:143 msgid "Local Player Hits Monster" -msgstr "" +msgstr "Spieler trifft Monster" #: src/gui/userpalette.cpp:145 msgid "Local Player Critical Hit" -msgstr "" +msgstr "Spieler trifft Monster stark" #: src/gui/userpalette.cpp:147 msgid "Local Player Miss" -msgstr "" +msgstr "Spieler trifft nicht" #: src/gui/userpalette.cpp:148 msgid "Misses" @@ -3220,7 +3228,7 @@ msgstr "Verfehlt" #: src/gui/userpalette.cpp:149 msgid "Portal Highlight" -msgstr "" +msgstr "Portal hervorheben" #: src/gui/userpalette.cpp:151 msgid "Default collision Highlight" @@ -3236,7 +3244,7 @@ msgstr "" #: src/gui/userpalette.cpp:157 msgid "Walkable Highlight" -msgstr "" +msgstr "Betretbarer Boden" #: src/gui/userpalette.cpp:159 msgid "Local Player Attack Range" @@ -3248,11 +3256,11 @@ msgstr "" #: src/gui/userpalette.cpp:163 msgid "Monster Attack Range" -msgstr "" +msgstr "Monster Angriffsreichweite" #: src/gui/userpalette.cpp:165 msgid "Home Place" -msgstr "" +msgstr "Stammplatz" #: src/gui/userpalette.cpp:167 msgid "Home Place Border" @@ -3260,31 +3268,31 @@ msgstr "" #: src/gui/userpalette.cpp:169 msgid "Road Point" -msgstr "" +msgstr "Wegpunkt" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" -msgstr "" +msgstr "Wer ist Online - Aktualisiere" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" -msgstr "" +msgstr "Aktualisierung" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " -msgstr "" +msgstr "Wer ist Online -" -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" -msgstr "" +msgstr "Wer ist Online - Fehler" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" -msgstr "" +msgstr "Wer ist Online - Aktualisiere" #: src/gui/widgets/battletab.cpp:45 msgid "Battle" -msgstr "" +msgstr "Kampf" #: src/gui/widgets/channeltab.cpp:52 msgid "/users > Lists the users in the current channel" @@ -3384,21 +3392,21 @@ msgstr "Globale Ansage von %s:" #: src/gui/widgets/chattab.cpp:184 #, c-format msgid "%s whispers: %s" -msgstr "" +msgstr "%s flüstert: %s" #: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67 #: src/net/ea/gui/partytab.cpp:83 msgid "Command: /invite <nick>" -msgstr "" +msgstr "Befehl:/invite<nick>" #: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68 msgid "This command invites <nick> to the guild you're in." -msgstr "" +msgstr "Dieser Befehl lädt <nick> in deine Gilde ein." #: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74 #: src/net/ea/gui/partytab.cpp:90 msgid "Command: /leave" -msgstr "" +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." @@ -3447,7 +3455,7 @@ msgstr "Dieser Befehl schließt den aktuellen privaten Tab." #: src/gui/widgets/whispertab.cpp:124 msgid "Command: /ignore" -msgstr "" +msgstr "Befehl:/ignore" #: src/gui/widgets/whispertab.cpp:125 msgid "This command ignores the other player regardless of current relations." @@ -3463,23 +3471,23 @@ msgstr "" #: src/gui/windowmenu.cpp:65 msgid "BC" -msgstr "" +msgstr "BP" #: src/gui/windowmenu.cpp:65 msgid "Bot checker" -msgstr "" +msgstr "Bot Ãœberprüfer" #: src/gui/windowmenu.cpp:67 msgid "ONL" -msgstr "" +msgstr "ONL" #: src/gui/windowmenu.cpp:67 msgid "Who is online" -msgstr "" +msgstr "Wer ist Online" #: src/gui/windowmenu.cpp:69 msgid "KS" -msgstr "" +msgstr "BGS" #: src/gui/windowmenu.cpp:71 msgid "Smilies" @@ -3515,19 +3523,19 @@ msgstr "SOZ" #: src/gui/windowmenu.cpp:94 msgid "SH" -msgstr "" +msgstr "TK" #: src/gui/windowmenu.cpp:94 msgid "Shortcuts" -msgstr "" +msgstr "Tastenkürzel" #: src/gui/windowmenu.cpp:96 msgid "SP" -msgstr "" +msgstr "ZS" #: src/gui/windowmenu.cpp:97 msgid "DR" -msgstr "" +msgstr "WW" #: src/gui/windowmenu.cpp:98 msgid "YK" @@ -3535,11 +3543,11 @@ msgstr "" #: src/gui/windowmenu.cpp:98 msgid "Did you know" -msgstr "" +msgstr "Wusstest du schon" #: src/gui/windowmenu.cpp:100 msgid "SET" -msgstr "" +msgstr "EINST" #: src/gui/worldselectdialog.cpp:77 msgid "Select World" @@ -3551,11 +3559,11 @@ msgstr "Login ändern" #: src/gui/worldselectdialog.cpp:83 msgid "Choose World" -msgstr "" +msgstr "Wähle Welt" #: src/inventory.cpp:251 msgid "Storage" -msgstr "" +msgstr "Lager" #: src/inventory.cpp:253 msgid "Cart" @@ -3587,7 +3595,7 @@ msgstr "Zielen & Angreifen" #: src/keyboardconfig.cpp:52 msgid "Move to Target" -msgstr "" +msgstr "Gehe zu Ziel" #: src/keyboardconfig.cpp:54 msgid "Change Move to Target type" @@ -3595,11 +3603,11 @@ msgstr "" #: src/keyboardconfig.cpp:56 msgid "Move to Home location" -msgstr "" +msgstr "Gehe zu Stammplatz" #: src/keyboardconfig.cpp:58 msgid "Set home location" -msgstr "" +msgstr "Setzte Stammplatz" #: src/keyboardconfig.cpp:60 msgid "Move to navigation point" @@ -3651,7 +3659,7 @@ msgstr "Handeln erlauben/verbieten" #: src/keyboardconfig.cpp:80 msgid "Change Map View Mode" -msgstr "" +msgstr "Wechsle Ansichtsmodus der Karte" #: src/keyboardconfig.cpp:82 msgid "Select OK" @@ -3682,7 +3690,7 @@ msgstr "Kurztaste %d" #: src/keyboardconfig.cpp:128 msgid "Windows Keys" -msgstr "" +msgstr "Fenster Tasten" #: src/keyboardconfig.cpp:129 msgid "Help Window" @@ -3726,7 +3734,7 @@ msgstr "Debugfenster" #: src/keyboardconfig.cpp:149 msgid "Social Window" -msgstr "" +msgstr "Gesellschaftsfenster" #: src/keyboardconfig.cpp:151 msgid "Emote Shortcut Window" @@ -3734,47 +3742,47 @@ msgstr "Kurztasten für Gefühle" #: src/keyboardconfig.cpp:153 msgid "Outfits Window" -msgstr "" +msgstr "Kleidungs Fenster" #: src/keyboardconfig.cpp:155 msgid "Shop Window" -msgstr "" +msgstr "Kauf Fenster" #: src/keyboardconfig.cpp:157 msgid "Quick drop Window" -msgstr "" +msgstr "Schnelles wegwerfen Fenster" #: src/keyboardconfig.cpp:159 msgid "Kill Stats Window" -msgstr "" +msgstr "Besiegte Gegner Fenster" #: src/keyboardconfig.cpp:161 msgid "Commands Window" -msgstr "" +msgstr "Befehls Fenster" #: src/keyboardconfig.cpp:163 msgid "Bot Checker Window" -msgstr "" +msgstr "Bot Prüfer Fenster" #: src/keyboardconfig.cpp:166 msgid "Who Is Online Window" -msgstr "" +msgstr "Wer ist Online Fenster" #: src/keyboardconfig.cpp:168 msgid "Did you know Window" -msgstr "" +msgstr "Wusstest du schon Fenster" #: src/keyboardconfig.cpp:171 msgid "Previous Social Tab" -msgstr "" +msgstr "Vorheriger Gesellschaftstab" #: src/keyboardconfig.cpp:173 msgid "Next Social Tab" -msgstr "" +msgstr "Nächster Gesellschaftstab" #: src/keyboardconfig.cpp:175 msgid "Emotes Keys" -msgstr "" +msgstr "Emotons Tasten" #: src/keyboardconfig.cpp:176 msgid "Smilie" @@ -3825,7 +3833,7 @@ msgstr "" #: src/keyboardconfig.cpp:277 msgid "Chat Keys" -msgstr "" +msgstr "Chat Tasten" #: src/keyboardconfig.cpp:278 msgid "Toggle Chat" @@ -3849,7 +3857,7 @@ msgstr "Nächster Tab" #: src/keyboardconfig.cpp:289 msgid "Close current Chat Tab" -msgstr "" +msgstr "Schließe aktuellen Tab" #: src/keyboardconfig.cpp:291 msgid "Previous chat line" @@ -3865,11 +3873,11 @@ msgstr "" #: src/keyboardconfig.cpp:297 msgid "Deactivate Chat Input" -msgstr "" +msgstr "Deaktiviere Chateingabe" #: src/keyboardconfig.cpp:299 msgid "Other Keys" -msgstr "" +msgstr "Andere Tasten" #: src/keyboardconfig.cpp:300 msgid "Ignore input 1" @@ -3897,7 +3905,7 @@ msgstr "" #: src/keyboardconfig.cpp:310 msgid "Crazy moves" -msgstr "" +msgstr "Verrückte Bewegungen" #: src/keyboardconfig.cpp:312 msgid "Change Crazy Move mode" @@ -3921,15 +3929,15 @@ msgstr "" #: src/keyboardconfig.cpp:322 msgid "Use #itenplz spell" -msgstr "" +msgstr "Benutze #itenplz Spruch" #: src/keyboardconfig.cpp:324 msgid "Use magic attack" -msgstr "" +msgstr "Benutze magische Angriff" #: src/keyboardconfig.cpp:326 msgid "Switch magic attack" -msgstr "" +msgstr "Wechsle magische Angriff" #: src/keyboardconfig.cpp:329 msgid "Switch pvp attack" @@ -3937,7 +3945,7 @@ msgstr "" #: src/keyboardconfig.cpp:330 msgid "Change move type" -msgstr "" +msgstr "Wechsle die Bewegungsart" #: src/keyboardconfig.cpp:332 msgid "Change Attack Weapon Type" @@ -3945,27 +3953,27 @@ msgstr "" #: src/keyboardconfig.cpp:334 msgid "Change Attack Type" -msgstr "" +msgstr "Wechsle Angriffsart" #: src/keyboardconfig.cpp:336 msgid "Change Follow mode" -msgstr "" +msgstr "Wechle Folgenmodus" #: src/keyboardconfig.cpp:338 msgid "Change Imitation mode" -msgstr "" +msgstr "Wechsle Imitierenmodus" #: src/keyboardconfig.cpp:341 msgid "Disable / Enable Game modifier keys" -msgstr "" +msgstr "Aktiviere / Deaktiviere Spielmodifikations Tasten" #: src/keyboardconfig.cpp:342 msgid "On / Off audio" -msgstr "" +msgstr "An/Aus Audio" #: src/keyboardconfig.cpp:344 msgid "Enable / Disable away mode" -msgstr "" +msgstr "Aktiviere/Deaktiviere abwesend Modus" #: src/keyboardconfig.cpp:346 msgid "Emulate right click from keyboard" @@ -3985,428 +3993,435 @@ msgid "" "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " "strange behaviour." msgstr "" +"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder " +"das Spiel lässt sich nicht richtig steuern." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "" +#, c-format +msgid "You were killed by %s" +msgstr "Du wurdest von einem %s getötet" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." -msgstr "" +msgstr "Du versucht einen nicht exitierenden Gegenstand aufzuheben." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." -msgstr "" +msgstr "Gegenstand ist zu schwer" -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." -msgstr "" +msgstr "Gegenstand ist zu weit weg." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." -msgstr "" +msgstr "Inventar ist voll" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." -msgstr "" +msgstr "Stapel ist zu groß" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." -msgstr "" +msgstr "Gegenstand gehört jemand anderem" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben." +msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben." -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" -msgstr "" +msgstr "(D) normale Bewegungen" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" -msgstr "" +msgstr "(I) bewegungen umkehren" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "" -#: src/localplayer.cpp:1896 +#: src/localplayer.cpp:1903 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" -msgstr "" +msgstr "(a) benutzerdefinierte verrückte Bewegung" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" -msgstr "" +msgstr "(?) verrückte Bewegung" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" -msgstr "" +msgstr "(?) Angriff" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" -msgstr "" +msgstr "(D) Normaler Angriff" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" -msgstr "" +msgstr "(G) gehe und greife an" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" -msgstr "" +msgstr "(A) gehe, greife an, hebe auf" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" -msgstr "" +msgstr "(d) ohne automatischen Angriff" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" -msgstr "" +msgstr "(S) kleine aufhebe Zelle 1x1" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" -msgstr "" +msgstr "(D) normale aufhebe Zelle 2x1" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" -msgstr "" +msgstr "(?) aufheben" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" -msgstr "" +msgstr "(N) Normale Kartenansicht" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" -msgstr "" +msgstr "(D) Debug Kartenansicht" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" -msgstr "" +msgstr "(u) Ultra Kartenansicht" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" -msgstr "" +msgstr "(U) Ultra Kartenansicht 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" -msgstr "" +msgstr "(e) Leere Kartenansicht" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" -msgstr "" +msgstr "(b) Schwarz-Weiß Kartenansicht" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" -msgstr "" +msgstr "(f) benutze #flar als magischen Angriff" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" -msgstr "" +msgstr "(c) benutze #chiza als magischen Angriff" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" -msgstr "" +msgstr "(I) benutze #ingrav als magischen Angriff" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" -msgstr "" +msgstr "(F) benutze #frillyar als magischen Angriff" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" -msgstr "" +msgstr "(U) benutze #upmarmu als magischen Angriff" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" -msgstr "" +msgstr "(?) magischer Angriff" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" -msgstr "" +msgstr "(d) greife keine Spieler an" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" -msgstr "" +msgstr "(D) normale Imitation" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" -msgstr "" +msgstr "(?) Imitation" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Abwesend" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" -msgstr "" +msgstr "(O) Anwesend" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" -msgstr "" +msgstr "(A) Abwesend" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" -msgstr "" +msgstr "(?) Abwesend" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" -msgstr "" +msgstr "Spielmodifikatoren sind aktiviert" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" -msgstr "" +msgstr "Spielmodifikatoren sind deaktiviert" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Folgen:" -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" -msgstr "" +msgstr "Folgen abgebrochen" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Du siehst" -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" -msgstr "" +msgstr "manaplus [options] [manaplus-file]" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Optionen:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" -msgstr "" +msgstr "-l --log-file : Log Datei benutzen" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" -msgstr "" +msgstr " -L --chat-log-dir : Verzeichnis für die Chat Log" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Die Version des Spieles anzeigen" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " - --help : Zeigt diesen Hilfstext an" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" -msgstr "" +msgstr " -C --config-dir : zu benutzendes Einstellungsverueichniss" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Mit angegebenem Benutzernamen anmelden" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password : Angegebenes Passwort benutzen" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --charakter : Mit angegebenem Spieler anmelden" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Name oder IP-Adresse des Loginservers" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Port des Loginservers" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" -msgstr "" +msgstr " --update-host : Benutzt diesen Aktualisierungs Host" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Wähle zuletzt benutzten Server und Spieler aus" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Ãœberspringe das Herunterladen von Updates" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" -msgstr "" +msgstr " --screenshot-dir : Verzeichnis um Bildschirmfotos zu speichern" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" +msgstr "--safemode : Starte das Spiel im sicheren Modus" + +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" -msgstr "" +msgstr "--no-opengl : Deaktiviere OpenGL für diese Sitzung" #: src/net/ea/buysellhandler.cpp:163 msgid "Nothing to sell." @@ -4450,17 +4465,17 @@ msgstr "" #: src/net/ea/charserverhandler.cpp:119 msgid "Cannot use this ID." -msgstr "" +msgstr "Kann diese ID nicht verwenden." #: src/net/ea/charserverhandler.cpp:122 msgid "Unknown char-server failure." -msgstr "" +msgstr "Unbekannter char-server Fehler" #: src/net/ea/charserverhandler.cpp:151 msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Falscher Name." @@ -4476,15 +4491,19 @@ msgstr "" msgid "Incorrect slot." msgstr "" -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "Falsche Rasse" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Info" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." -msgstr "" +msgstr "Charakter gelöscht" -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "" @@ -4529,16 +4548,16 @@ msgstr "" msgid "All whispers unignore failed." msgstr "" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" -msgstr "" +msgstr "Benutzer Online: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Spiel" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "" @@ -4548,7 +4567,7 @@ msgstr "Gilde erstellt." #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93 msgid "You are already in guild." -msgstr "" +msgstr "Du bist bereits in der Gilde" #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." @@ -4561,22 +4580,22 @@ msgstr "" #: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" -msgstr "" +msgstr "Gildenname: %s" #: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" -msgstr "" +msgstr "Gilden Meister: %s" #: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" -msgstr "" +msgstr "Gilden Level: %d" #: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" -msgstr "" +msgstr "Mitglieder Online: %d" #: src/net/ea/guildhandler.cpp:187 #, c-format @@ -4605,7 +4624,7 @@ msgstr "" #: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." -msgstr "" +msgstr "Kann Spieler nicht in die Gilde einladen." #: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." @@ -4626,28 +4645,28 @@ msgstr "" #: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." -msgstr "" +msgstr "%s hat Ihre Gilde verlassen." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "" +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "Du wurdest aus der Gilde rausgeworfen" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." -msgstr "" +msgstr "%s wurde aus Ihrer Gilde geworfen." #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" -msgstr "" +msgstr "/invite Lade einen Spieler in deine Party ein" #: src/net/ea/gui/partytab.cpp:71 msgid "/leave > Leave the party you are in" -msgstr "" +msgstr "/leave > verlasse die Party in der du bist" #: src/net/ea/gui/partytab.cpp:72 msgid "/kick > Kick some one from the party you are in" -msgstr "" +msgstr "/kick > werfen jemanden aus deiner Gilde raus" #: src/net/ea/gui/partytab.cpp:73 msgid "/item > Show/change party item sharing options" @@ -4681,7 +4700,7 @@ msgstr "" #: src/net/ea/gui/partytab.cpp:101 msgid "Command: /item" -msgstr "" +msgstr "Befehl: /item" #: src/net/ea/gui/partytab.cpp:102 msgid "This command displays the party's current item sharing policy." @@ -4703,7 +4722,7 @@ msgstr "" #: src/net/ea/gui/partytab.cpp:113 msgid "Command: /exp" -msgstr "" +msgstr "Befehl:/exp" #: src/net/ea/gui/partytab.cpp:114 msgid "This command displays the party's current experience sharing policy." @@ -4747,7 +4766,7 @@ msgstr "" #: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." -msgstr "" +msgstr "Kann nicht Ausrüsten." #: src/net/ea/loginhandler.cpp:131 msgid "Account was not found. Please re-login." @@ -4761,54 +4780,54 @@ msgstr "Altes Passwort fehlerhaft" msgid "New password too short." msgstr "Das neue Passwort ist zu kurz." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "Unbekannte ID" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Falsches Passwort." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "Account abgelaufen." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." -msgstr "" +msgstr "Client zu alt" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, 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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." -msgstr "" +msgstr "Dieser Benutzername ist bereits in Verwendung" -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "" @@ -4838,7 +4857,7 @@ msgstr "" #: src/net/ea/partyhandler.cpp:184 #, c-format msgid "%s is now a member of your party." -msgstr "" +msgstr "%s ist nun ein Mitglied deiner Party" #: src/net/ea/partyhandler.cpp:189 #, c-format @@ -4852,17 +4871,17 @@ msgstr "" #: src/net/ea/partyhandler.cpp:358 msgid "You have left the party." -msgstr "" +msgstr "Du hast die Party verlassen" #: src/net/ea/partyhandler.cpp:371 #, c-format msgid "%s has left your party." -msgstr "" +msgstr "%s hat deine Party verlassen" #: src/net/ea/partyhandler.cpp:448 #, c-format msgid "An unknown member tried to say: %s" -msgstr "" +msgstr "Ein unbekanntes Mitglied hat versucht zu sagen: %s" #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." @@ -4887,7 +4906,7 @@ msgstr "Game Over!" #: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." -msgstr "" +msgstr "Werfe eine Münze ein um Weiterzuspielen." #: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 msgid "" @@ -4934,11 +4953,11 @@ msgstr "" #: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." -msgstr "" +msgstr "Du bist nicht Tod, du ruhst dich nur aus." #: src/net/ea/playerhandler.cpp:121 msgid "You are no more." -msgstr "" +msgstr "Du bit tot." #: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." @@ -4946,7 +4965,7 @@ msgstr "" #: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." -msgstr "" +msgstr "Deine Zeit ist abgelaufen. Zeit deinem Schöpfer gegenüberzutreten." #: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." @@ -4954,19 +4973,21 @@ msgstr "Du bist eine Leiche." #: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." -msgstr "" +msgstr "Deines Lebens beraubt, ruhst du in Frieden." #: src/net/ea/playerhandler.cpp:126 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 msgid "Your metabolic processes are now history." -msgstr "" +msgstr "Deine metabolischen Prozesse sind nun Geschichte." #: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." -msgstr "" +msgstr "Du bist weg vom Fenster." #: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." @@ -4980,11 +5001,11 @@ msgstr "" #: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." -msgstr "" +msgstr "Du bist ein Ex-Spieler" #: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." -msgstr "" +msgstr "Du schmachst an den Fjorden" #: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 #: src/net/ea/playerhandler.cpp:427 @@ -4995,6 +5016,8 @@ msgstr "Nachricht" 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 msgid "You are carrying less than half your weight. You can regain health." @@ -5003,7 +5026,7 @@ msgstr "" #: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." -msgstr "" +msgstr "Du hast %s aufgehoben." #: src/net/ea/playerhandler.cpp:459 #, c-format @@ -5012,27 +5035,27 @@ msgstr "" #: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" -msgstr "" +msgstr "Kann diese Fähigkeit nicht aufwerten!" #: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." -msgstr "" +msgstr "Rüste dich erst mit Pfeilen aus." #: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" -msgstr "" +msgstr "Handeln Fehlgeschlagen" #: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" -msgstr "" +msgstr "Emotion fehlgeschlagen" #: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" -msgstr "" +msgstr "Sitzen Fehlgeschlagen" #: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" -msgstr "" +msgstr "Chat starten fehlgeschlagen." #: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" @@ -5044,7 +5067,7 @@ msgstr "" #: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" -msgstr "" +msgstr "Du hast noch ein zu niedriges Level!" #: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" @@ -5056,39 +5079,39 @@ msgstr "" #: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" -msgstr "" +msgstr "Du hast keine Erinnerungen!" #: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" -msgstr "" +msgstr "Das kannst du im moment nicht machen!" #: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" -msgstr "" +msgstr "Sieht aus, als ob du mehr Geld brauchst....;-)" #: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" -msgstr "" +msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!" #: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" -msgstr "" +msgstr "Du brauchst ein weiteres rotes Juwel" #: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" -msgstr "" +msgstr "Du brauchst ein weiteres blaues Juwel" #: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" -msgstr "" +msgstr "Du trägst zu viel mit dir herum um das zu tun!" #: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" -msgstr "" +msgstr "Huh? Was ist das?" #: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." -msgstr "" +msgstr "Warp fehlgeschlagen..." #: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." @@ -5105,25 +5128,25 @@ msgstr "%s möchte mit dir handeln, stimmst du zu?" #: src/net/ea/tradehandler.cpp:135 msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" +msgstr "Handeln nicht möglich. Handelspartner ist zu weit entfernt." #: src/net/ea/tradehandler.cpp:139 msgid "Trading isn't possible. Character doesn't exist." -msgstr "" +msgstr "Handeln nicht möglich. Handelspartner existiert nicht." #: src/net/ea/tradehandler.cpp:143 msgid "Trade cancelled due to an unknown reason." -msgstr "" +msgstr "Handeln abgebrochen durch eine unbekannte Ursache." #: src/net/ea/tradehandler.cpp:149 #, c-format msgid "Trade: You and %s" -msgstr "" +msgstr "Handeln: Du und %s" #: src/net/ea/tradehandler.cpp:159 #, c-format msgid "Trade with %s cancelled." -msgstr "" +msgstr "Handel mit %s abgebrochen" #: src/net/ea/tradehandler.cpp:172 msgid "Unhandled trade cancel packet." @@ -5136,14 +5159,18 @@ msgstr "" #: src/net/ea/tradehandler.cpp:242 msgid "Failed adding item. Trade partner has no free slot." msgstr "" +"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen Platz in " +"seinem Inventar." #: src/net/ea/tradehandler.cpp:247 msgid "Failed adding item. You can't trade this item." msgstr "" +"Gegenstand hinzufügen fehlgeschlagen. Sie können diesen Gegenstand nicht " +"handeln." #: src/net/ea/tradehandler.cpp:251 msgid "Failed adding item for unknown reason." -msgstr "" +msgstr "Gegenstand hinzufügen aus unbekannten Gründen fehlgeschlagen." #: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." @@ -5153,50 +5180,50 @@ msgstr "Handel abgebrochen." msgid "Trade completed." msgstr "Handel abgeschlossen." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Stärke" #: src/net/manaserv/attributes.cpp:167 #, c-format msgid "Strength %+.1f" -msgstr "" +msgstr "Stärke %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Beweglichkeit" #: src/net/manaserv/attributes.cpp:180 #, c-format msgid "Agility %+.1f" -msgstr "" +msgstr "Beweglichkeit %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Ausdauer" #: src/net/manaserv/attributes.cpp:193 #, c-format msgid "Dexterity %+.1f" -msgstr "" +msgstr "Geschicklichkeit %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Gesundheit" #: src/net/manaserv/attributes.cpp:206 #, c-format msgid "Vitality %+.1f" -msgstr "" +msgstr "Gesunfheit %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Intelligenz" #: src/net/manaserv/attributes.cpp:219 #, c-format msgid "Intelligence %+.1f" -msgstr "" +msgstr "Intelligenz %+.1f" #: src/net/manaserv/attributes.cpp:225 msgid "Willpower" @@ -5205,7 +5232,7 @@ msgstr "Willenskraft:" #: src/net/manaserv/attributes.cpp:232 #, c-format msgid "Willpower %+.1f" -msgstr "" +msgstr "Willenskraft %+.1f" #: src/net/manaserv/beinghandler.cpp:337 msgid "Press OK to respawn." @@ -5258,7 +5285,7 @@ msgstr "" #: src/net/manaserv/charhandler.cpp:178 msgid "Invalid slot number." -msgstr "" +msgstr "Falsche Slotnummer" #: src/net/manaserv/charhandler.cpp:210 msgid "Player deleted." @@ -5266,12 +5293,12 @@ msgstr "Spieler gelöscht" #: src/net/manaserv/charhandler.cpp:222 msgid "Selection out of range." -msgstr "" +msgstr "Auswahl außer Reichweite" #: src/net/manaserv/charhandler.cpp:225 #, c-format msgid "Unknown error (%d)." -msgstr "" +msgstr "Unbekannter Fehler (%d)." #: src/net/manaserv/charhandler.cpp:261 msgid "No gameservers are available." @@ -5460,7 +5487,7 @@ msgstr "" #: src/net/tmwa/buysellhandler.cpp:143 msgid "Unable to sell unsellable item." -msgstr "" +msgstr "Es ist nicht möglich einen unverkäuflichen Gegenstand zu verkaufen." #: src/net/tmwa/generalhandler.cpp:108 #, c-format @@ -5524,52 +5551,52 @@ msgstr "Unbekannter Verbindungsfehler" msgid "Got disconnected from server!" msgstr "Verbindung zum Server unterbrochen!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Glück" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Verteidigung:" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "M.Angriff:" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "M.Verteidigung:" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% Accuracy" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% Evade" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% Critical" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" -msgstr "" +msgstr "Angriffs Verzögerung" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" -msgstr "" +msgstr "Angriffsreichweite" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." -msgstr "" +msgstr "Schaden pro Sek." #: src/net/tmwa/network.cpp:153 msgid "Empty address given to Network::connect()!" @@ -5588,47 +5615,47 @@ msgstr "Verbindung mit Server abgebrochen. " msgid "%s is not in your party!" msgstr "%s ist nicht in Deiner Party!" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Drucke '..'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Blinkender Name" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Schwebende '...' Blase" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Schwebende Blase" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "unbenannt" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Angriff %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Verteidigung %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Unbekannter Gegenstand" @@ -5,16 +5,16 @@ # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. # Jumpy <antoinebcn@hotmail.com>, 2011. -# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011. +# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011, 2012. # Nelson Martell <nelson6eeduardo65@gmail.com>, 2011. # Nelson <nelson6eeduardo65@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-20 19:51+0000\n" -"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" "manaplus/team/es/)\n" "Language: es\n" @@ -45,113 +45,113 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuración" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Rendimiento" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "VÃdeo" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "Temas" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Conectando al servidor" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Accediendo a la cuenta" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Entrando al mundo del juego" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Cargando personajes" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Conectando al servidor del juego" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Cambiando servidores del juego" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Error" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Solicitando detalles de registro" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Cambio de contraseña" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "¡Contraseña cambiada exitosamente!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Cambio de Email" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "¡Email modificado exitosamente!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Registro cancelado" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Adiós, vuelve cuando quieras..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Servidor de actualización inválido: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "¡Error al crear la carpeta de actualizaciones!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Comando desconocido." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "¡No puedes enviar susurros vacÃos!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,160 +160,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:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando la entrada del canal %s." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta el nombre del grupo." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Falta el nombre del Clan." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Por favor, especifique un nombre." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Volver a alternar el chat." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Mensaje cierra la charla." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Volver ahora a cambiar de chat." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Mensaje ahora cierra el chat." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "desatendido" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "¡Jugador ya es %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "¡Jugador %s exitosamente!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "¡Jugador no pudo ser %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "El jugador no estaba ignorado!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "¡El jugador ya no es ignorado!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "¡Al jugador no se le puede dejar de ignorar!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "en la lista negra" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "enemigo" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "¡Jugador ya borrado!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "¡Jugador borrado con éxito!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "¡Jugador no pudo ser borrado!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Tiempo de actividad del cliente: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dÃa" msgstr[1] "%d dÃas" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "tamaño de caché de fuente" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" -msgstr "Tám. caché:" +msgstr "Tam. caché:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Creado:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Borrado:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Imágenes de recurso:" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "Imágenes de recurso huérfano:" @@ -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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "General" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Depurador" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Captura de pantalla guardada como " -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "¡El guardado de la captura de pantalla ha fallado!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "Se ha perdido la conexión con el servidor." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Error de Red" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Ignorando las peticiones de intercambio" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Aceptando las peticiones de intercambio" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "No se pudo cargar el mapa" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Error mientras cargaba %s" @@ -394,7 +394,7 @@ msgstr "Nombre" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" @@ -413,7 +413,7 @@ msgstr "Mover" msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Restablecer" @@ -436,16 +436,16 @@ msgstr "Cantidad:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -457,8 +457,8 @@ msgid "Quit" msgstr "Salir" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Máximo" @@ -482,20 +482,20 @@ msgstr "Vender" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Cancelar" #: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57 msgid "Change Email Address" -msgstr "Cambiar e-mail" +msgstr "Cambiar Dirección de Correo electrónico" #: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55 #, c-format @@ -504,24 +504,24 @@ msgstr "Cuenta: %s" #: src/gui/changeemaildialog.cpp:54 msgid "Type new email address twice:" -msgstr "Escribe el nuevo email dos veces:" +msgstr "Escribe el nuevo correo dos veces:" #: src/gui/changeemaildialog.cpp:132 #, c-format msgid "The new email address needs to be at least %d characters long." -msgstr "El nuevo email debe tener como mÃnimo %d caracteres." +msgstr "El nuevo correo debe tener como mÃnimo %d caracteres." #: src/gui/changeemaildialog.cpp:139 #, c-format msgid "The new email address needs to be less than %d characters long." -msgstr "El nuevo email debe tener como máximo %d caracteres." +msgstr "El nuevo correo debe tener como máximo %d caracteres." #: src/gui/changeemaildialog.cpp:146 msgid "The email address entries mismatch." -msgstr "Los e-mail son distintos." +msgstr "Los correos ingresados no concuerdan." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Cambiar contraseña" @@ -577,7 +577,7 @@ msgstr "<" #: src/gui/charcreatedialog.cpp:92 msgid "Hair color:" -msgstr "Color:" +msgstr "Color de cabello:" #: src/gui/charcreatedialog.cpp:95 msgid "Hair style:" @@ -587,27 +587,27 @@ msgstr "Peinado:" msgid "Race:" msgstr "Race:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Crear" #: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98 msgid "Male" -msgstr "Hombre" +msgstr "Masculino" #: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99 msgid "Female" -msgstr "Mujer" +msgstr "Femenino" #: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312 #, c-format msgid "Please distribute %d points" -msgstr "Por favor distribuya %d puntos" +msgstr "Por favor, distribuye %d puntos" #: src/gui/charcreatedialog.cpp:231 msgid "Your name needs to be at least 4 characters." -msgstr "Su nombre debe de tener como mÃnimo 4 caracteres." +msgstr "Tu nombre debe tener como mÃnimo 4 caracteres." #: src/gui/charcreatedialog.cpp:303 msgid "Character stats OK" @@ -616,7 +616,7 @@ msgstr "Atributos del personaje OK" #: src/gui/charcreatedialog.cpp:317 #, c-format msgid "Please remove %d points" -msgstr "Por favor borre %d puntos" +msgstr "Por favor borra %d puntos" #: src/gui/charselectdialog.cpp:76 msgid "Confirm Character Delete" @@ -630,47 +630,47 @@ msgstr "¿Estás seguro de que deseas borrar este personaje?" msgid "Account and Character Management" msgstr "Administración de la Cuenta y los Personajes" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Volver al Login" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Cancelar Registro" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" -msgstr "Cambiar e-mail" +msgstr "Cambiar Correo Electrónico" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Contraseña incorrecta" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Ingrese la contraseña para borrar el personaje" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Ingrese contraseña:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Borrar" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Seleccionar" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Nivel: %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(vacÃo)" @@ -744,12 +744,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." -msgstr "Presentes: %s; %d jugadores estan presentes." +msgstr "Presentes: %s; %d jugadores están presentes." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Susurrando a %s: %s" @@ -856,22 +856,22 @@ msgstr "Objetivo:" #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 #: src/gui/debugwindow.cpp:346 msgid "Target Id:" -msgstr "Seccionar 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:" -msgstr "Diana de nivel:" +msgstr "Nivel del Objetivo:" #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 #: src/gui/debugwindow.cpp:348 msgid "Target Party:" -msgstr "Grupo de destino:" +msgstr "Grupo del Objetivo:" #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 #: src/gui/debugwindow.cpp:349 msgid "Target Guild:" -msgstr "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 @@ -901,19 +901,19 @@ msgstr "Ping: %s ms" #: src/gui/debugwindow.cpp:395 #, c-format msgid "In: %d bytes/s" -msgstr "In: %d bytes/s" +msgstr "Recibiendo: %d bytes/s" #: src/gui/debugwindow.cpp:397 #, c-format msgid "Out: %d bytes/s" -msgstr "Out: %d bytes/s" +msgstr "Enviando: %d bytes/s" #: src/gui/didyouknowwindow.cpp:47 msgid "Did You Know?" msgstr "¿SabÃas que...?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Cerrar" @@ -941,8 +941,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Quitárselo" @@ -984,26 +984,26 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Tirar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Dividir" @@ -1017,17 +1017,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Almacenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Recuperar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Tirar" @@ -1054,7 +1054,7 @@ msgstr "Seleccione la cantidad de artÃculos a recuperar." #: src/gui/itemamountwindow.cpp:273 msgid "Select amount of items to split." -msgstr "Selecione la cantidad de objetos para dividir." +msgstr "Seleccione la cantidad de objetos para dividir." #: src/gui/itemamountwindow.cpp:276 msgid "Add to buy shop." @@ -1141,13 +1141,13 @@ msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s" #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" -msgstr "Exp de último monstruo eliminado:" +msgstr "Exp de último eliminado:" #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 #: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" -msgstr "Tiempo antes de que jacko desove:" +msgstr "Tiempo antes de que jacko aparezca:" #: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 #: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 @@ -1163,7 +1163,7 @@ msgstr "¿%s %d?" #: src/gui/killstats.cpp:370 msgid "jacko spawning" -msgstr "desove de jacko" +msgstr "jacko apareciendo" #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." @@ -1183,7 +1183,7 @@ msgstr "Saltar" #: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123 msgid "Login" -msgstr "Login" +msgstr "Inicio de sesión" #: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252 #: src/gui/widgets/chattab.cpp:173 @@ -1240,7 +1240,7 @@ msgstr "barra de dinero" #: src/gui/ministatuswindow.cpp:101 msgid "arrows bar" -msgstr "Barra de flechas" +msgstr "barra de flechas" #: src/gui/ministatuswindow.cpp:104 msgid "status bar" @@ -1250,31 +1250,27 @@ msgstr "barra de estado" msgid "Need" msgstr "Necesitas" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Esperando al servidor" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "Dejar de esperar" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Siguiente" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Enviar" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Limpiar" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> Siguiente" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Para:" @@ -1293,6 +1289,7 @@ msgid "Outfit: %d" msgstr "Conjuntos: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Tecla: %s" @@ -1348,7 +1345,7 @@ msgstr "Lista negra" #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 #: src/gui/popupmenu.cpp:702 msgid "Set as enemy" -msgstr "Establecer como enemigo" +msgstr "Fijar como enemigo" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 @@ -1376,7 +1373,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorar completamente" @@ -1428,7 +1425,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Desvestir" @@ -1480,8 +1477,8 @@ msgstr "Jugadores" msgid "Pick up" msgstr "Recoger" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Añadir al chat" @@ -1493,8 +1490,8 @@ msgstr "Mapa Objeto" msgid "Rename" msgstr "Renombrar" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Quitar" @@ -1503,8 +1500,8 @@ msgid "Warp" msgstr "Deformar" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Cargar conjuntos antiguos" +msgid "Clear outfit" +msgstr "Limpiar vestimenta" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1542,119 +1539,118 @@ msgstr "Habilitar ausencia" msgid "Disable away" msgstr "Deshabilitar ausencia" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Dejar" #: src/gui/popupmenu.cpp:654 -#, fuzzy msgid "Copy to clipboard" -msgstr "Copiar al chat" +msgstr "Copiar al portapapeles" #: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "Cambiar posición del Clan" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Renombrar señal del mapa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " -msgstr "Nombre:" +msgstr "Nombre: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "Comentario del jugador " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "Comentario: " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" -msgstr "Agredar al intercambio" +msgstr "Agregar al intercambio" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "Agregar 10 al intercambio" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "Agregar la mitad al intercambio" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Agregar todo al intercambio" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Almacenar 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Almacenar la mitad" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Almacenar todo" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Tirar todo" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Recuperar 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Recuperar la mitad" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Recuperar todo" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Cargar atajos antiguos de artÃculos" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" -msgstr "Cargar atajos antiguos de soltar (drop)" +msgstr "Cargar atajos para tirar antiguos" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Restablecer barra amarilla" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copiar al chat" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(predeterminado)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Subir" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Bajar" @@ -1672,7 +1668,7 @@ msgstr "Confirmar:" #: src/gui/register.cpp:108 msgid "Email:" -msgstr "Email:" +msgstr "Correo:" #: src/gui/register.cpp:176 #, c-format @@ -1700,7 +1696,7 @@ msgstr "Las contraseñas no coinciden." #: src/gui/serverdialog.cpp:237 msgid "Choose Your Server" -msgstr "Escoja tu servidor" +msgstr "Escoge tu servidor" #: src/gui/serverdialog.cpp:248 msgid "Choose Your Server *** SAFE MODE ***" @@ -1749,13 +1745,13 @@ msgstr "Preparando la descarga" #: src/gui/serverdialog.cpp:573 msgid "Error retreiving server list!" -msgstr "Error al recuperar la lista de servers!" +msgstr "¡Error al recuperar la lista de servidores!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" -msgstr "requiere una version mas nueva" +msgstr "requiere una versión mas nueva" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "requiere v%s" @@ -1790,7 +1786,7 @@ msgstr "Audio" #: src/gui/setup_audio.cpp:64 msgid "Sfx volume" -msgstr "Volumen Sfx" +msgstr "Volumen de sfx" #: src/gui/setup_audio.cpp:65 msgid "Music volume" @@ -1934,7 +1930,7 @@ msgstr "Pulso" #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91 #: src/gui/setup_colors.cpp:409 msgid "Rainbow" -msgstr "Arcoiris" +msgstr "Arco iris" #: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93 #: src/gui/setup_colors.cpp:409 @@ -1959,7 +1955,7 @@ msgstr "Azul:" #: src/gui/setup_colors.cpp:314 msgid "Alpha:" -msgstr "Alpha:" +msgstr "Alfa:" #: src/gui/setup.cpp:71 msgid "Apply" @@ -2019,7 +2015,7 @@ msgstr "Conflicto de teclas detectado." #: src/gui/setup_other.cpp:39 msgid "Misc" -msgstr "Misceláneos" +msgstr "Misceláneo" #: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125 msgid "Monsters" @@ -2035,7 +2031,7 @@ msgstr "Eligir automáticamente sólo a los monstruos alcanzables" #: src/gui/setup_other.cpp:53 msgid "Highlight monster attack range" -msgstr "Resaltar el alcanze de ataque de los monstruos" +msgstr "Resaltar el alcance de ataque de los monstruos" #: src/gui/setup_other.cpp:57 msgid "Show monster hp bar" @@ -2063,7 +2059,7 @@ msgstr "Resaltar el alcance de ataque del jugador" #: src/gui/setup_other.cpp:78 msgid "Show extended minimaps" -msgstr "Mostrar minmapas extendidos" +msgstr "Mostrar mini-mapas extendidos" #: src/gui/setup_other.cpp:81 msgid "Draw path" @@ -2091,7 +2087,7 @@ msgstr "En movimiento" #: src/gui/setup_other.cpp:99 msgid "Auto fix position" -msgstr "Corrección automatica de la posición" +msgstr "Corrección automática de la posición" #: src/gui/setup_other.cpp:102 msgid "Attack while moving" @@ -2147,7 +2143,7 @@ msgstr "Habilitar el protocolo de anuncio" #: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" -msgstr "Aceptar solicitudes de compra / venta" +msgstr "Aceptar solicitudes de compra/venta" #: src/gui/setup_other.cpp:147 msgid "Enable shop mode" @@ -2175,7 +2171,7 @@ msgstr "Habilitar el ataque del lado del servidor" #: src/gui/setup_other.cpp:171 msgid "Enable bot checker" -msgstr "Habilitar el control de robot" +msgstr "Habilitar el control de bot" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection (do not disable)" @@ -2191,7 +2187,7 @@ msgstr "Modo de bajo tráfico" #: src/gui/setup_other.cpp:184 msgid "Hide shield sprite" -msgstr "Ocultar los objetos escudos" +msgstr "Ocultar sprite protector" #: src/gui/setup_other.cpp:187 msgid "Show background" @@ -2231,7 +2227,7 @@ msgstr "Mostrar transparencia de criaturas" #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." -msgstr "Habilitar re ordenamiento de sprites." +msgstr "Habilitar re-ordenamiento de sprites." #: src/gui/setup_perfomance.cpp:83 msgid "Small memory (enable for lower memory usage)" @@ -2275,7 +2271,7 @@ msgstr "Intercambios seguros" #: src/gui/setup_players.cpp:75 msgid "Unsecure chars in names" -msgstr "Carácteres inseguros en los nombres" +msgstr "Caracteres inseguros en los nombres" #: src/gui/setup_players.cpp:78 msgid "Show statuses" @@ -2394,9 +2390,8 @@ msgid "Indonesian" msgstr "Indonesio" #: src/gui/setup_theme.cpp:153 -#, fuzzy msgid "Polish" -msgstr "Inglés" +msgstr "Polaco" #: src/gui/setup_theme.cpp:154 msgid "Japanese" @@ -2428,7 +2423,7 @@ msgstr "Tema" #: src/gui/setup_theme.cpp:193 msgid "Gui theme" -msgstr "Tema de interfáz gráfica" +msgstr "Tema de interfaz gráfica" #: src/gui/setup_theme.cpp:194 msgid "Language" @@ -2469,7 +2464,7 @@ msgstr "Tema cambiado" #: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." -msgstr "Reincie el juego para que los cambios tengan efecto." +msgstr "Reinicia el juego para que los cambios tengan efecto." #: src/gui/setup_video.cpp:194 msgid "Software" @@ -2538,7 +2533,7 @@ msgstr "Mostrar aviso al coger algo" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:295 msgid "in chat" -msgstr "en chat" +msgstr "en el chat" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:297 @@ -2627,7 +2622,7 @@ msgstr "Configuración del efecto de las partÃculas cambiado." #: src/gui/setup_video.cpp:655 msgid "Changes will take effect on map change." -msgstr "Los cambios tendran efecto cuando se cambie de mapa." +msgstr "Los cambios tendrán efecto cuando se cambie de mapa." #: src/gui/shopwindow.cpp:75 msgid "Personal Shop" @@ -2644,7 +2639,7 @@ msgstr "Vender artÃculos" #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124 #: src/gui/tradewindow.cpp:89 msgid "Add" -msgstr "Anadir" +msgstr "Añadir" #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126 msgid "Announce" @@ -2701,196 +2696,206 @@ msgstr "Nivel: %d" msgid "Lvl: %d (%+d)" msgstr "Nivel: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Clan" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Invita al jugador %s al clan %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Clan %s pidiendo salir." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "Miembro invitado al clan." -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, 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:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "¿Dejar el clan?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, 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:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupo" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "Jugador %s invitado al grupo." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "Grupo %s requisitado." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "Invitación de un miembro al grupo" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, 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:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "¿Dejar grupo?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, 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:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "Navegación" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Ataque" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Criaturas prioritarias" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "Criaturas atacadas" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Criaturas ignoradas" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Crear Clan" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Crear grupo" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Invitar" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Aceptada la invitación de %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Cancelada la invitación de %s." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Aceptada la invitación al clan de %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Rechazada la invitación al clan de %s." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Creando clan llamado %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Creando grupo llamado %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Nombre del clan" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." -msgstr "Escoja el nombre de su clan." +msgstr "Escoge el nombre de tu clan." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "Recibida petición de creación del clan, pero ya existe." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s te ha invitado al clan %s." -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Aceptar invitación al clan" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Recibida petición de creación del grupo, pero ya existe." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "Fuiste invitado a un grupo." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, 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:1475 +#: src/gui/socialwindow.cpp:1603 #, 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:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Aceptar invitación al grupo" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Nombre del grupo" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." -msgstr "Escoja el nombre del grupo." +msgstr "Escoge el nombre del grupo." #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88 msgid "Specials" @@ -2910,7 +2915,7 @@ msgstr "Dinero: %s" #: src/gui/statuswindow.cpp:151 msgid "HP:" -msgstr "PV:" +msgstr "HP:" #: src/gui/statuswindow.cpp:158 msgid "Exp:" @@ -2918,7 +2923,7 @@ msgstr "Exp:" #: src/gui/statuswindow.cpp:172 msgid "MP:" -msgstr "PM:" +msgstr "MP:" #: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 #, c-format @@ -2966,7 +2971,7 @@ msgstr "Magia de Vida" #: src/gui/textcommandeditor.cpp:122 msgid "War Magic" -msgstr "Magia Bélica" +msgstr "Magia de Guerra" #: src/gui/textcommandeditor.cpp:123 msgid "Transmute Magic" @@ -2974,7 +2979,7 @@ msgstr "Magia de Transmutación" #: src/gui/textcommandeditor.cpp:124 msgid "Nature Magic" -msgstr "Magia de Naturaleza" +msgstr "Magia de la Naturaleza" #: src/gui/textcommandeditor.cpp:125 msgid "Astral Magic" @@ -3080,33 +3085,33 @@ msgstr "" msgid "Name: %s" msgstr "Nombre: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Actualizando..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Jugar" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 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:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" -msgstr "##1 Es altamente recomendado que" +msgstr "##1 Es altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." -msgstr "##1 lo intentes de nuevo más tarde." +msgstr "##1 lo intentes de nuevo más tarde." -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Completado" @@ -3116,19 +3121,19 @@ msgstr "Ser" #: src/gui/userpalette.cpp:117 msgid "Friend Names" -msgstr "Nombres de amigo" +msgstr "Nombres de Amigos" #: src/gui/userpalette.cpp:118 msgid "Disregarded Names" -msgstr "Nombres Desatendidos" +msgstr "Nombres de Desatendidos" #: src/gui/userpalette.cpp:119 msgid "Ignored Names" -msgstr "Nombres Ignorados" +msgstr "Nombres de Ignorados" #: src/gui/userpalette.cpp:120 msgid "Erased Names" -msgstr "Nombres Borrados" +msgstr "Nombres de Borrados" #: src/gui/userpalette.cpp:121 msgid "Other Players' Names" @@ -3196,7 +3201,7 @@ msgstr "Otros Jugadores le pegan al Jugador Local" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" -msgstr "Golpe Critico" +msgstr "Golpe CrÃtico" #: src/gui/userpalette.cpp:143 msgid "Local Player Hits Monster" @@ -3224,11 +3229,11 @@ msgstr "Resaltar colisiones" #: src/gui/userpalette.cpp:153 msgid "Air collision Highlight" -msgstr "Puesta en evidencia de las colisiones: Aere" +msgstr "Resaltado de colisión en el Aire" #: src/gui/userpalette.cpp:155 msgid "Water collision Highlight" -msgstr "Puesta en evidencia de las colisiones: Agua" +msgstr "resaltado de colisión en el Agua" #: src/gui/userpalette.cpp:157 msgid "Walkable Highlight" @@ -3258,23 +3263,23 @@ msgstr "Limites de Lugar de Inicio" msgid "Road Point" msgstr "Mostrar camino" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Quién está conectado - Actualizando" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Actualizar" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Quienes están conectados - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Quienes están conectados - error" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Quienes están conectados - Actualizar" @@ -3284,7 +3289,7 @@ msgstr "Batalla" #: src/gui/widgets/channeltab.cpp:52 msgid "/users > Lists the users in the current channel" -msgstr "/users > Listas de usuarios en el canal" +msgstr "/users > Listar a los usuarios en el canal actual" #: src/gui/widgets/channeltab.cpp:53 msgid "/topic > Set the topic of the current channel" @@ -3328,7 +3333,7 @@ msgstr "Salir del canal." #: src/gui/widgets/channeltab.cpp:78 msgid "If you're the last person in the channel, it will be deleted." -msgstr "Si eres la última persona de este canal , será eliminado." +msgstr "Si eres la última persona de este canal, será eliminado." #: src/gui/widgets/channeltab.cpp:83 msgid "Command: /op <nick>" @@ -3401,19 +3406,19 @@ msgstr "Este comando hace que dejes el clan." #: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135 #: src/net/ea/gui/partytab.cpp:69 msgid "/help > Display this help." -msgstr "/help > Para la ayuda." +msgstr "/help > Mostrar la ayuda." #: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136 msgid "/invite > Invite a player to your guild" -msgstr "/invite > Invita un jugador a tu clan" +msgstr "/invite > Invitar a un jugador a tu clan" #: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137 msgid "/leave > Leave the guild you are in" -msgstr "/leave > Deja el clan en el que estas" +msgstr "/leave > Dejar el clan en el que estás" #: 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 "/kick > Expulsa a alguien del clan en el que estás." +msgstr "/kick > Expulsar a alguien del clan en el que estás." #: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394 msgid "Edit" @@ -3421,15 +3426,15 @@ msgstr "Editar" #: src/gui/widgets/whispertab.cpp:107 msgid "/ignore > Ignore the other player" -msgstr "/ignore > Ignora al jugador" +msgstr "/ignore > Ignorar a otro jugador" #: src/gui/widgets/whispertab.cpp:108 msgid "/unignore > Stop ignoring the other player" -msgstr "/unignore > Parar de ignorar al jugador" +msgstr "/unignore > Dejar de ignorar a otro jugador" #: src/gui/widgets/whispertab.cpp:109 msgid "/close > Close the whisper tab" -msgstr "/close > Cierra la pestaña de mensajes" +msgstr "/close > Cerrar la pestaña de susurro" #: src/gui/widgets/whispertab.cpp:119 msgid "Command: /close" @@ -3479,7 +3484,7 @@ msgstr "KS" #: src/gui/windowmenu.cpp:71 msgid "Smilies" -msgstr "Emoticones" +msgstr "EmotÃconos" #: src/gui/windowmenu.cpp:73 msgid "STA" @@ -3587,15 +3592,15 @@ msgstr "Mover al objetivo" #: src/keyboardconfig.cpp:54 msgid "Change Move to Target type" -msgstr "Cambiar tipos de movimientos hacia la diana" +msgstr "Cambiar Movimiento al tipo de Objetivo" #: src/keyboardconfig.cpp:56 msgid "Move to Home location" -msgstr "Mover hacia la localizacion inicial" +msgstr "Mover hacia la localización Inicial" #: src/keyboardconfig.cpp:58 msgid "Set home location" -msgstr "Fijar localización de hogar" +msgstr "Estableces la localización Inicial" #: src/keyboardconfig.cpp:60 msgid "Move to navigation point" @@ -3603,7 +3608,7 @@ msgstr "Mover al punto de navegación" #: src/keyboardconfig.cpp:63 msgid "Stop Attack" -msgstr "Parar el ataque" +msgstr "Dejar de atacar" #: src/keyboardconfig.cpp:65 msgid "Untarget" @@ -3643,7 +3648,7 @@ msgstr "Imprimir pantalla" #: src/keyboardconfig.cpp:78 msgid "Enable/Disable Trading" -msgstr "Habilitar/Desabilitar intercambios" +msgstr "Habilitar/Deshabilitar Intercambios" #: src/keyboardconfig.cpp:80 msgid "Change Map View Mode" @@ -3702,7 +3707,7 @@ msgstr "Ventana de habilidades" #: src/keyboardconfig.cpp:139 msgid "Minimap Window" -msgstr "Ventana del minimapa" +msgstr "Ventana del Mini-mapa" #: src/keyboardconfig.cpp:141 msgid "Chat Window" @@ -3718,7 +3723,7 @@ msgstr "Ventana de Configuración" #: src/keyboardconfig.cpp:147 msgid "Debug Window" -msgstr "Ventana de Problemas" +msgstr "Ventana de Depurador" #: src/keyboardconfig.cpp:149 msgid "Social Window" @@ -3750,11 +3755,11 @@ msgstr "Ventana de comandos" #: src/keyboardconfig.cpp:163 msgid "Bot Checker Window" -msgstr "Ventana de comprobador de robot" +msgstr "Ventana de Chequeo de Bot" #: src/keyboardconfig.cpp:166 msgid "Who Is Online Window" -msgstr "Ventana de jugadores conectados" +msgstr "Ventana de Jugadores Conectados" #: src/keyboardconfig.cpp:168 msgid "Did you know Window" @@ -3770,7 +3775,7 @@ msgstr "Pestaña Social Siguiente" #: src/keyboardconfig.cpp:175 msgid "Emotes Keys" -msgstr "Teclas de Emoticones" +msgstr "Teclas de Emoticonos" #: src/keyboardconfig.cpp:176 msgid "Smilie" @@ -3841,7 +3846,7 @@ msgstr "Pestaña de Chat Anterior" #: src/keyboardconfig.cpp:286 msgid "Next Chat Tab" -msgstr "Siguiente Pestaña De Chat" +msgstr "Siguiente Pestaña del Chat" #: src/keyboardconfig.cpp:289 msgid "Close current Chat Tab" @@ -3953,7 +3958,7 @@ msgstr "Cambiar modo de Imitación" #: src/keyboardconfig.cpp:341 msgid "Disable / Enable Game modifier keys" -msgstr "Habilitar / Deshabilitar las teclas de modification del juego" +msgstr "Habilitar / Deshabilitar las teclas de modificación del Juego" #: src/keyboardconfig.cpp:342 msgid "On / Off audio" @@ -3981,428 +3986,434 @@ msgid "" "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " "strange behaviour." msgstr "" -"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego " +"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego " "puede presentar un comportamiento raro." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "Fuiste eliminado por " +#, c-format +msgid "You were killed by %s" +msgstr "Fuiste eliminado por %s" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." -msgstr "Intentaste recoger un objeto inexistante." +msgstr "Intentaste recoger un objeto inexistente." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "El artÃculo es muy pesado." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "El artÃculo está muy lejos." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "El inventario está lleno." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "El agrupamiento es demasiado grande." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "El artÃculo pertenece a alguien más." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 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:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." -msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]." -msgstr[1] "Usted Cogió %d [@@%d|%s@@]." +msgstr[0] "Recogiste un %d [@@%d|%s@@]." +msgstr[1] "Recogiste unos %d [@@%d|%s@@]." -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) moverse predeterminado" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(I) moverse invertido" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) moverse con algunos movimientos locos" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) moverse con movimientos locos" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) doble normal + loco" -#: src/localplayer.cpp:1896 +#: src/localplayer.cpp:1903 msgid "(?) unknown move" msgstr "(?) movimiento desconocido" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) movimiento loco número %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) maniobra alocada personalizada" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) maniobra loca" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) moverse por defecto hacia el objetivo" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) moverse al objetivo en distancia 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) moverse al objetivo en distancia 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) moverse al objetivo en distancia 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) moverse al objetivo en distancia 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) moverse al objetivo en distancia 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) desplazarse al objetivo en el rango de ataque" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "(a) rango de ataque de arquero" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) mover al objetivo" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) seguimiento predeterminado" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) seguimiento relativo" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) seguimiento tipo espejo" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) seguimiento como mascota" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" -msgstr "(?) seguimiento desconoicido" +msgstr "(?) seguimiento desconocido" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) atacar" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) ataque predeterminado" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) intercambiar ataque sin escudo" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) intercambiar ataque con escudo" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) ir y atacar" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) ir, atacar, recoger" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) sin atacar automáticamente" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) recoger a 1x1 celdas (pequeño)" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) recoger a 2x1 celdas (predeterminado)" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) recoger interesadamente a 2x3 celda" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) recoger a 3x3 celdas" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) ir y recoger en distancia 4" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(G) ir y recoger en distancia 8" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) ir y recoger a máxima distancia" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) recoger" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) vista normal del mapa" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) vista depurar del mapa" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) ultra vista del mapa" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) ultra vista del mapa 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) vista vacÃa del mapa" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) vista del mapa en blanco y negro" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) usar #flar para ataque mágico" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) usar #chiza para ataque mágico" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) usar #ingrav para ataque mágico" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) usar #frillyar para ataque mágico" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) usar #upmarmu para ataque mágico" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) ataque mágico" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "(a) atacar a todos los jugadores" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "(f) atacar a los que no son amigos" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "(b) atacar a quienes están en malas relaciones" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "(d) no atacar a los jugadores" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "(?) ataque pvp" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) imitación predeterminada" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) imitación de conjuntos" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) imitación" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Fuera del Teclado" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) en el teclado" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) lejos del teclado" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) afuera" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) modo de cámara de juego" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) modo de cámara libre" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Modificadores del juego están habilitados" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Modificadores del juego están deshabilitados" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "Los modificadores del juego son desconocidos" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Seguir: " -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " -msgstr "Imitacion: " +msgstr "Imitación: " -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Imitación cancelada" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Ves " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [options] [manaplus-file]" -#: src/main.cpp:48 +#: src/main.cpp:51 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:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr " usado para establecer parámetros personalizados." -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr " al cliente manaplus." -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Opciones:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Archivo de registro a usar" -#: src/main.cpp:55 +#: src/main.cpp:58 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:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Muestra la versión" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Muestra la ayuda" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Carpeta de Configuración a usar" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Acceder con este nombre de usuario" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password : Acceder con la contraseña" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character : Acceder con este jugador" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login server o IP" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Puerto del servidor" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr " --update-host : Usar este host de actualización" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Escoje el personaje por defecto y el servidor" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Saltarse las actualizaciones" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Carpeta por donde cargar los datos del juego" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Carpeta para usar los datos locales" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Carpeta donde guardar los screenshots" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Iniciar el juego en modo seguro" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" +" -T --tests : Comenzar a probar controladores y auto configurar" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Deshabilita OpenGL en esta sesion" @@ -4444,21 +4455,23 @@ msgstr "Suerte:" #: src/net/ea/charserverhandler.cpp:115 msgid "Access denied. Most likely, there are too many players on this server." -msgstr "Acesso denegado.Probablemente es que alla muchos jugadores." +msgstr "" +"Acceso denegado. Lo más probable es que hayan muchos jugadores en este " +"servidor." #: src/net/ea/charserverhandler.cpp:119 msgid "Cannot use this ID." -msgstr "Imposible usar esta ID." +msgstr "Imposible usar este ID." #: src/net/ea/charserverhandler.cpp:122 msgid "Unknown char-server failure." -msgstr "Error desconocido del char-server." +msgstr "Falla char-server desconocida." #: src/net/ea/charserverhandler.cpp:151 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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Nombre equivocado." @@ -4468,21 +4481,25 @@ msgstr "EstadÃsticas incorrectas." #: src/net/ea/charserverhandler.cpp:161 msgid "Incorrect hair." -msgstr "Cabello incorecto." +msgstr "Cabello incorrecto." #: src/net/ea/charserverhandler.cpp:164 msgid "Incorrect slot." msgstr "Ranura incorrecta." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "Raza incorrecta." + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Información" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Personaje borrado." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "Fallo al borrar el personaje." @@ -4527,18 +4544,18 @@ msgstr "Todos los susurros des-ignorados." msgid "All whispers unignore failed." msgstr "Ignorar todos los susurros ha fallado." -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" -msgstr "Jugadores online: %d" +msgstr "Jugadores conectados: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Juego" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" -msgstr "Petición de salida denegada!" +msgstr "¡Petición de salida denegada!" #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85 msgid "Guild created." @@ -4550,7 +4567,7 @@ msgstr "Ya estás en el clan." #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." -msgstr "La verificación de la guild no se effectuó." +msgstr "La verificación del clan ha fallado." #: src/net/ea/guildhandler.cpp:103 msgid "Unknown server response." @@ -4569,7 +4586,7 @@ msgstr "Maestro del clan: %s" #: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" -msgstr "Nivel en el clan: %d" +msgstr "Nivel del clan: %d" #: src/net/ea/guildhandler.cpp:185 #, c-format @@ -4611,7 +4628,7 @@ msgstr "El jugador ha rechazado la invitación al clan." #: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." -msgstr "El usuario es ahora de tu clan." +msgstr "El usuario es ahora parte de tu clan." #: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." @@ -4626,18 +4643,18 @@ msgstr "Invitación desconocida a un clan." msgid "%s has left your guild." msgstr "%s ha dejado tu clan." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "Usted fue expulsado del clan." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "Fuiste expulsado del clan." -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." -msgstr "%s saco alguien de tu clan." +msgstr "%s ha sido sacado de tu clan." #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" -msgstr "/invite > Invita un jugador a tu grupo" +msgstr "/invite > Invitar a un jugador a tu grupo" #: src/net/ea/gui/partytab.cpp:71 msgid "/leave > Leave the party you are in" @@ -4645,15 +4662,15 @@ msgstr "/leave > Dejar el grupo en el que estás" #: src/net/ea/gui/partytab.cpp:72 msgid "/kick > Kick some one from the party you are in" -msgstr "/kick > Expulsa a alguien del grupo en el que estás" +msgstr "/kick > Expulsar a alguien del grupo en el que estás" #: src/net/ea/gui/partytab.cpp:73 msgid "/item > Show/change party item sharing options" -msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo" +msgstr "/item > Mostrar/Cambiar opciones para compartir objetos en el grupo" #: src/net/ea/gui/partytab.cpp:74 msgid "/exp > Show/change party experience sharing options" -msgstr "/exp > Mostrar/Cambiar el compartir experiencia en el grupo " +msgstr "/exp > Mostrar/Cambiar opciones para compartir experiencia en el grupo" #: src/net/ea/gui/partytab.cpp:84 msgid "This command invites <nick> to party with you." @@ -4719,27 +4736,27 @@ msgstr "" #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285 msgid "Item sharing enabled." -msgstr "Compartir objetos habilitado." +msgstr "Compartir artÃculos habilitado." #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295 msgid "Item sharing disabled." -msgstr "Compartir objetos desabilitado." +msgstr "Compartir artÃculos deshabilitado." #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305 msgid "Item sharing not possible." -msgstr "No es posible el compartir objetos." +msgstr "No se pueden compartir artÃculos." #: src/net/ea/gui/partytab.cpp:157 msgid "Item sharing unknown." -msgstr "Compartir objetos desconocido." +msgstr "Compartir artÃculos desconocido." #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247 msgid "Experience sharing enabled." -msgstr "Compartir experiencia activado." +msgstr "Compartir experiencia habilitado." #: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257 msgid "Experience sharing disabled." -msgstr "Compartir experiencia desactivado ." +msgstr "Compartir experiencia habilitado." #: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267 msgid "Experience sharing not possible." @@ -4751,7 +4768,7 @@ msgstr "Compartir experiencia desconocido." #: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." -msgstr "Fallo al usar el objeto." +msgstr "Fallo al usar el artÃculo." #: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." @@ -4759,68 +4776,68 @@ msgstr "Imposible equipar." #: src/net/ea/loginhandler.cpp:131 msgid "Account was not found. Please re-login." -msgstr "Cuenta no encontrada. Por favor re-conéctate." +msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión." #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." -msgstr "Contrasena antigua incorrecta." +msgstr "Contraseña antigua incorrecta." #: src/net/ea/loginhandler.cpp:137 msgid "New password too short." -msgstr "Nueva contrasena es muy corta." +msgstr "Nueva contraseña es muy corta." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "ID no registrada." -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." -msgstr "Contrasena incorrecta." +msgstr "Contraseña incorrecta." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "La cuenta expiró." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Rechazado del servidor." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -"Has sido baneado permanentemente del juego. Por favor contacta con el equipo " -"GM." +"Has sido proscrito permanentemente del juego. Por favor contacta con el " +"equipo de GM." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." -msgstr "Cliente es demasiado antÃguo." +msgstr "Cliente es demasiado antiguo." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" -"Has sido baneado temporalmente del juego %s.\n" -"Por favor contacta un GM de nuestro equipo via el foro." +"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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Servidor sobrepoblado." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Este nombre de usuario ya está escogido." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Nombre de usuario borrado permanentemente." @@ -4860,7 +4877,7 @@ msgstr "%s no puede unirse a tu grupo porque está completamente lleno." #: src/net/ea/partyhandler.cpp:194 #, c-format msgid "QQQ Unknown invite response for %s." -msgstr "QQQ respuesta desconocida a la invitacion de %s." +msgstr "QQQ Respuesta desconocida a la invitación de %s." #: src/net/ea/partyhandler.cpp:358 msgid "You have left the party." @@ -4878,7 +4895,7 @@ msgstr "Un miembro desconocido intentó decir: %s" #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." -msgstr "Estás muerto" +msgstr "Estás muerto." #: 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." @@ -4886,7 +4903,7 @@ msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate." #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." -msgstr "Ya no estás tan vivo..." +msgstr "Ya no estás tan vivo." #: 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." @@ -4894,7 +4911,7 @@ 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 msgid "Game Over!" -msgstr "Fin Del Juego!" +msgstr "¡Fin del Juego!" #: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." @@ -4913,8 +4930,8 @@ msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" -"¡Parece que tu plan de romper las armas de tus enemigos con tu garganta " -"falló!" +"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 msgid "I guess this did not run too well." @@ -4963,7 +4980,7 @@ msgstr "Eres un cadáver." #: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." -msgstr "Sin vida, descansa en paz." +msgstr "Despojado de la vida, descansas en paz." #: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." @@ -5005,7 +5022,9 @@ msgstr "Mensaje" #: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." -msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM." +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 msgid "You are carrying less than half your weight. You can regain health." @@ -5015,7 +5034,7 @@ msgstr "" #: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." -msgstr "Has cogido %s." +msgstr "Has recogido %s." #: src/net/ea/playerhandler.cpp:459 #, c-format @@ -5060,19 +5079,19 @@ msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!" #: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" -msgstr "PV insuficiente!" +msgstr "¡HP insuficiente!" #: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" -msgstr "SP insuficiente!" +msgstr "¡SP insuficiente!" #: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" -msgstr "No tienes ninguna nota armenzada!" +msgstr "¡No tienes ningún memo!" #: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" -msgstr "No puedes hacer esto ahora mismo!" +msgstr "¡No puedes hacer esto ahora mismo!" #: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" @@ -5084,15 +5103,15 @@ msgstr "¡No puedes usar esta habilidad con este tipo de arma!" #: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" -msgstr "Necesitas otra Gema Roja!" +msgstr "¡Necesitas otra gema roja!" #: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" -msgstr "Necesitas otra Gema Azul!" +msgstr "¡Necesitas otra gema azul!" #: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" -msgstr "Llevas muchas cosas para hacer esto!" +msgstr "¡Estás llevando muchas cosas para hacer esto!" #: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" @@ -5100,7 +5119,7 @@ msgstr "Huh? Qué es eso?" #: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." -msgstr "Fallo al teletransportar..." +msgstr "Warp fallido..." #: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." @@ -5156,7 +5175,7 @@ msgstr "Fallo al agregar artÃculo. No puedes intercambiar este artÃculo." #: src/net/ea/tradehandler.cpp:251 msgid "Failed adding item for unknown reason." -msgstr "Fallo al anadir objeto por una razón desconocida." +msgstr "Fallo al añaadir objeto por una razón desconocida." #: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." @@ -5166,7 +5185,7 @@ msgstr "Intercambio Cancelado." msgid "Trade completed." msgstr "Intercambio Realizado." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Fuerza" @@ -5175,7 +5194,7 @@ msgstr "Fuerza" msgid "Strength %+.1f" msgstr "Fuerza %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Agilidad" @@ -5184,7 +5203,7 @@ msgstr "Agilidad" msgid "Agility %+.1f" msgstr "Agilidad %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Destreza" @@ -5193,7 +5212,7 @@ msgstr "Destreza" msgid "Dexterity %+.1f" msgstr "Destreza %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Vitalidad" @@ -5202,7 +5221,7 @@ msgstr "Vitalidad" msgid "Vitality %+.1f" msgstr "Vitalidad %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Inteligencia" @@ -5281,7 +5300,7 @@ msgstr "Personaje eliminado." #: src/net/manaserv/charhandler.cpp:222 msgid "Selection out of range." -msgstr "Seleccion fuera de rango." +msgstr "Selección fuera de rango." #: src/net/manaserv/charhandler.cpp:225 #, c-format @@ -5296,7 +5315,7 @@ msgstr "No hay servidores disponibles." #: src/net/manaserv/guildhandler.cpp:265 #, c-format msgid "Topic: %s" -msgstr "Tópico: %s" +msgstr "Tema: %s" #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269 msgid "Players in this channel:" @@ -5356,7 +5375,7 @@ msgstr "Error al cambiar estado del miembro." #: src/net/manaserv/loginhandler.cpp:93 msgid "Wrong magic_token." -msgstr "Error de Token-mágico ." +msgstr "magic_token equivocado." #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281 msgid "Already logged in." @@ -5364,7 +5383,7 @@ msgstr "El personaje ya está conectado." #: src/net/manaserv/loginhandler.cpp:99 msgid "Account banned." -msgstr "Cuenta Baneada." +msgstr "Cuenta proscrita." #: src/net/manaserv/loginhandler.cpp:124 msgid "New password incorrect." @@ -5372,19 +5391,19 @@ msgstr "Nueva contraseña incorrecta." #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163 msgid "Account not connected. Please login first." -msgstr "Cuenta no conectada. Por favor conéctate primero." +msgstr "Cuenta no conectada. Por favor, inicia sesión primero." #: src/net/manaserv/loginhandler.cpp:156 msgid "New email address incorrect." -msgstr "Nuevo e-mail incorrecto." +msgstr "Correo nuevo incorrecto." #: src/net/manaserv/loginhandler.cpp:159 msgid "Old email address incorrect." -msgstr "E-mail antiguo incorrecto." +msgstr "Correo antiguo incorrecto." #: src/net/manaserv/loginhandler.cpp:167 msgid "The new email address already exists." -msgstr "El nuevo e-mail ya existe." +msgstr "El nuevo correo ya existe." #: src/net/manaserv/loginhandler.cpp:249 msgid "" @@ -5395,7 +5414,7 @@ msgstr "" #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312 msgid "Client version is too old." -msgstr "La version del cliente es demasiado antigua." +msgstr "La versión del cliente es demasiado antigua." #: src/net/manaserv/loginhandler.cpp:278 msgid "Wrong username or password." @@ -5403,7 +5422,7 @@ msgstr "Nombre de usuario o contraseña incorrectos." #: src/net/manaserv/loginhandler.cpp:284 msgid "Account banned" -msgstr "Cuenta Baneada" +msgstr "Cuenta proscrita" #: src/net/manaserv/loginhandler.cpp:287 msgid "Login attempt too soon after previous attempt." @@ -5411,7 +5430,7 @@ msgstr "Intento de conexión muy pronto tras intento previo." #: src/net/manaserv/loginhandler.cpp:315 msgid "Wrong username, password or email address." -msgstr "E-mail, nombre de usuario o contraseña incorrectos." +msgstr "Correo, nombre de usuario o contraseña incorrectos." #: src/net/manaserv/loginhandler.cpp:318 msgid "Username already exists." @@ -5419,7 +5438,7 @@ msgstr "Usuario ya existe." #: src/net/manaserv/loginhandler.cpp:321 msgid "Email address already exists." -msgstr "El e-mail ya existe." +msgstr "La dirección de correo ya existe." #: src/net/manaserv/loginhandler.cpp:324 msgid "You took too long with the captcha or your response was incorrect." @@ -5508,11 +5527,11 @@ msgstr "Suerte %+d" #: src/net/tmwa/generalhandler.cpp:139 msgid "Authentication failed." -msgstr "Fallo en la autentificación." +msgstr "Fallo en la autenticación." #: src/net/tmwa/generalhandler.cpp:142 msgid "No servers available." -msgstr "Servidores indiponibles." +msgstr "No hay servidores disponibles." #: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." @@ -5528,7 +5547,7 @@ msgstr "Hack de velocidad detectado." #: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." -msgstr "Login duplicado." +msgstr "Inicio de sesión duplicado." #: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." @@ -5538,56 +5557,56 @@ msgstr "Error de conexión desconocido." msgid "Got disconnected from server!" msgstr "¡Desconectado del servidor!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Suerte" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Defensa" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "Ataque M." -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "Defensa M." -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% Precisión" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% Evasión" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% CrÃtico" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Retardo de Ataque" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Retardo de Marcha" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "Alcance de Ataque" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "Daño por segundo." #: src/net/tmwa/network.cpp:153 msgid "Empty address given to Network::connect()!" -msgstr "Adress vacÃa enviada a Network::connect()!" +msgstr "¡Dirección vacÃa enviada a Network::connect()!" #: src/net/tmwa/network.cpp:357 msgid "Unable to resolve host \"" @@ -5595,54 +5614,54 @@ msgstr "No es posible determinar el host \"" #: src/net/tmwa/network.cpp:427 msgid "Connection to server terminated. " -msgstr "Conexión al servidor terminada." +msgstr "Conexión al servidor terminada. " #: src/net/tmwa/partyhandler.cpp:171 #, c-format msgid "%s is not in your party!" -msgstr "%s no está en tu grupo!" +msgstr "¡%s no está en tu grupo!" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Parpadear nombre" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Burbuja '...' flotante" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Burbuja Flotante" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "anónimo" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Ataque %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Defensa %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" -msgstr "PV %+d" +msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" -msgstr "PM %+d" +msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Objeto desconocido" @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -34,120 +34,120 @@ msgstr "huti" #. TRANSLATORS: this away status writed in player nick #: src/being.cpp:1534 msgid "A" -msgstr "" +msgstr "P" #. TRANSLATORS: this inactive status writed in player nick #: src/being.cpp:1539 msgid "I" -msgstr "" +msgstr "-" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Asetukset" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" -msgstr "" +msgstr "Tehokkuus" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Kuva" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" -msgstr "" +msgstr "Teemat" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Yhdistän palvelimeen" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Kirjaudun sisään" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Siirryn pelimaailmaan" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Pyydän hahmoja" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Yhdistän pelipalvelimeen" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Vaihdan pelipalvelinta" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Virhe" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Pyydän rekisteröitymisen yksityiskohtia" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Salasanan vaihto" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Salasana vaihdettu onnistuneesti!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Sähköpostin vaihto" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Sähköpostiosoite vaihdettu onnistuneesti!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Tietojen poisto onnistui" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Näkemisiin, tule pian takaisin..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Epäkelpo päivitysosoite: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Päivityshakemistoa luodessa tapahtui virhe!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Tuntematon komento." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Et voi lähettää tyhjiä kuiskauksia!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -156,160 +156,160 @@ msgstr "" "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai " "käytit omaa nimeäsi." -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Pyyntö liittyä kanavalle %s lähetetty." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ryhmän nimi puuttuu." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Killan nimi puuttuu." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Anna nimi." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Viesti sulkee keskustelun." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Nyt viesti sulkee keskustelun." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "ystävä" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "vaimennettu" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutraali" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Pelaaja on jo %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Pelaaja on nyt %s." -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Pelaajaa ei ollut jätetty huomiotta!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Pelaaja huomioidaan taas." -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Pelaajan uudelleenhuomiointi epäonnistui." -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" -msgstr "" +msgstr "mustalistattu" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" -msgstr "" +msgstr "vihollinen" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Pelaaja on jo pyyhitty!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Pelaaja pyyhitty." -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty." -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Ohjelma ollut käynnissä: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d viikon" msgstr[1] "%d viikkoa" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d päivän" msgstr[1] "%d päivää" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d tunnin" msgstr[1] "%d tuntia" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuutin" msgstr[1] "%d minuuttia" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunnin" msgstr[1] "%d sekuntia" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "kirjasinvälimuistin koko" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Välimuistin koko:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Luotu:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Poistettu:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Resurssikuvat:" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "Orvot resurssikuvat:" @@ -320,43 +320,43 @@ msgstr "" "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti " "\"true\", \"false\", \"1\" tai \"0\"." -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Yleiset" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Debug" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Ruutukaappaus tallennettu nimellä " -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Ruutukaappauksen tallentaminen epäonnistui!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "Yhteys palvelimeen katkesi." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Verkkovirhe" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Et huomioi kaupankäyntipyyntöjä" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Hyväksyt kaupankäyntipyynnöt" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Kartan lataaminen epäonnistui" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Kohdetta %s ladattaessa tapahtui virhe." @@ -379,7 +379,7 @@ msgstr "PvP-taso: %d" #: src/gui/beingpopup.cpp:162 #, c-format msgid "Comment: %s" -msgstr "" +msgstr "Kommentti: %s" #: src/gui/botcheckerwindow.cpp:266 msgid "Bot Checker" @@ -391,7 +391,7 @@ msgstr "Nimi" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Hyökkää" @@ -410,7 +410,7 @@ msgstr "Liiku" msgid "Result" msgstr "Tulos" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Nollaa" @@ -428,21 +428,21 @@ msgstr "Hinta: %s / Kaikkiaan: %s" #: src/gui/buydialog.cpp:103 msgid "Amount:" -msgstr "" +msgstr "Määrä:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -454,8 +454,8 @@ msgid "Quit" msgstr "Sulje" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Max" @@ -479,14 +479,14 @@ msgstr "Myy" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Peru" @@ -518,7 +518,7 @@ msgid "The email address entries mismatch." msgstr "Annetut sähköpostiosoitteet eivät täsmää." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Vaihda salasana" @@ -584,8 +584,8 @@ msgstr "Hiustyyli:" msgid "Race:" msgstr "Rotu: " -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Luo" @@ -627,47 +627,47 @@ msgstr "Oletko varma, että haluat poistaa tämän hahmon?" msgid "Account and Character Management" msgstr "Tilin ja hahmojen hallinta" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Vaihda sisäänkirjautumistietoja" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Poista palvelimelta" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Vaihda sähköpostiosoite" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Väärä salasana" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Anna salasana hahmon poistamiseksi" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Salasana:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Poista" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Valitse" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Taso %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(tyhjä)" @@ -741,12 +741,12 @@ msgstr "???" msgid "Chat" msgstr "Keskustelu" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Läsnä: %s; %d pelaajaa paikalla." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Kuiskaat pelaajalle %s: %s" @@ -893,7 +893,7 @@ msgstr "Kriittinen osuma:" #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 #, c-format msgid "Ping: %s ms" -msgstr "" +msgstr "Ping: %s ms" #: src/gui/debugwindow.cpp:395 #, c-format @@ -907,25 +907,25 @@ msgstr "Ulos: %d tavua/s" #: src/gui/didyouknowwindow.cpp:47 msgid "Did You Know?" -msgstr "" +msgstr "Tiesitkö?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Sulje" #: src/gui/didyouknowwindow.cpp:64 msgid "< Previous" -msgstr "" +msgstr "< Edellinen" #: src/gui/didyouknowwindow.cpp:65 msgid "Next >" -msgstr "" +msgstr "Seuraava >" #: src/gui/didyouknowwindow.cpp:66 msgid "Auto open this window" -msgstr "" +msgstr "Avaa tämä ikkuna automaattisesti" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 @@ -938,8 +938,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Poista varuste käytöstä" @@ -949,23 +949,23 @@ msgstr "Apua" #: src/gui/inventorywindow.cpp:71 msgid "by name" -msgstr "" +msgstr "nimi" #: src/gui/inventorywindow.cpp:72 msgid "by id" -msgstr "" +msgstr "id" #: src/gui/inventorywindow.cpp:73 msgid "by weight" -msgstr "" +msgstr "paino" #: src/gui/inventorywindow.cpp:74 msgid "by amount" -msgstr "" +msgstr "määrä" #: src/gui/inventorywindow.cpp:75 msgid "by type" -msgstr "" +msgstr "tyyppi" #: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 @@ -981,26 +981,26 @@ msgid "Filter:" msgstr "Suodin:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 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:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Käytä" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Pudota..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Jaa" @@ -1014,17 +1014,17 @@ msgid "Weight:" msgstr "Paino:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Varastoi" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Ota" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Pudota" @@ -1089,36 +1089,36 @@ msgstr "Nollaa ajastin" #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" -msgstr "" +msgstr "Taso: %d @ %f%%" #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" -msgstr "" +msgstr "Kokemus: %d/%d, jäljellä: %d" #: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 #: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" -msgstr "" +msgstr "1%% = %d kp, keskim. vastustajaa 1%%:iin: %s" #: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 #: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" -msgstr "" +msgstr "Tappoja: %s, kp kaikkiaan: %s" #: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 #: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" -msgstr "" +msgstr "Keskim. kp: %s, Keskim. vastustajaa seur. tasoon: %s" #: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 #: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" -msgstr "" +msgstr "Tappoa/min: %s, kp/min: %s" #: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 #: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 @@ -1126,41 +1126,41 @@ msgstr "" #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Kokemustahti / %d min: %s" +msgstr[1] "Kokemustahti / %d min: %s<" #: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Aika ensi tasolle %d min perusteella: %s" +msgstr[1] "Aika ensi tasolle %d min perusteella: %s" #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" -msgstr "" +msgstr "Viime tapon kp:" #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 #: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" -msgstr "" +msgstr "Aika jackon resetiin:" #: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 #: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 #: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" -msgstr "" +msgstr " Aika seur. tasolle: %s" #: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" -msgstr "" +msgstr "%s %d?" #: src/gui/killstats.cpp:370 msgid "jacko spawning" -msgstr "" +msgstr "jacko elää!" #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." @@ -1247,31 +1247,27 @@ msgstr "tilapalkki" msgid "Need" msgstr "Tarvitaan" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Odotetaan palvelinta" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "Lakkaa odottamasta" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Seuraava" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Lähetä" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "Ei-pelaajahahmo (NPC)" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Tyhjennä" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> Seuraava" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Vastaanottaja:" @@ -1290,6 +1286,7 @@ msgid "Outfit: %d" msgstr "Asu: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Näppäin: %s" @@ -1337,7 +1334,7 @@ msgstr "Vaimenna" #: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 #: src/gui/popupmenu.cpp:716 msgid "Black list" -msgstr "" +msgstr "Musta lista" #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 #: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 @@ -1345,7 +1342,7 @@ msgstr "" #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 #: src/gui/popupmenu.cpp:702 msgid "Set as enemy" -msgstr "" +msgstr "Aseta viholliseksi" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 @@ -1373,7 +1370,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Jätä täysin huomiotta" @@ -1425,7 +1422,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Riisu" @@ -1433,17 +1430,17 @@ msgstr "Riisu" #: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741 #: src/gui/popupmenu.cpp:830 msgid "Add comment" -msgstr "" +msgstr "Lisää kommentti" #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 #: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 msgid "Buy (?)" -msgstr "" +msgstr "Osta (?)" #: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 #: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Sell (?)" -msgstr "" +msgstr "Myy (?)" #: src/gui/popupmenu.cpp:312 msgid "Kick" @@ -1475,10 +1472,10 @@ msgstr "Pelaajat" #: src/gui/popupmenu.cpp:546 msgid "Pick up" -msgstr "Nosta" +msgstr "Poimi" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Lisää keskusteluun" @@ -1490,18 +1487,18 @@ msgstr "Karttaolio" msgid "Rename" msgstr "Nimeä uudelleen" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Poista" #: src/gui/popupmenu.cpp:573 msgid "Warp" -msgstr "" +msgstr "Warppaa" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Lataa vanhat asut" +msgid "Clear outfit" +msgstr "Poista asu" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1525,7 +1522,7 @@ msgstr "Salli korostus" #: src/gui/popupmenu.cpp:640 msgid "Don't remove name" -msgstr "" +msgstr "Älä poista nimeä" #: src/gui/popupmenu.cpp:642 msgid "Remove name" @@ -1539,118 +1536,118 @@ msgstr "Ota poissaolo käyttöön" msgid "Disable away" msgstr "Poista poissaolo käytöstä" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Eroa" #: src/gui/popupmenu.cpp:654 msgid "Copy to clipboard" -msgstr "" +msgstr "Kopioi leikepöydälle" #: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "Muuta asemaa killassa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Muuta merkin nimeä " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Nimi: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " -msgstr "" +msgstr "Pelaajakommentti " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " -msgstr "" +msgstr "Kommentti: " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "Lisää kauppaan" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "Lisää 10 kauppaan" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "Lisää puolet kauppaan" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Lisää kaikki kauppaan" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Varastoi 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Varastoi puolet" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Varastoi kaikki" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" -msgstr "" +msgstr "Pudota kaikki" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Ota 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Ota puolet" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Ota kaikki" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Lataa vanhat tavarapikavalinnat" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Lataa vanhat pudotuspikavalinnat" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Piilota" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Näytä" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Palauta oletusmuokkaimet (keltainen palkki)" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" -msgstr "" +msgstr "Kopioi keskusteluun" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(oletus)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Siirrä ylös" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Siirrä alas" @@ -1700,7 +1697,7 @@ msgstr "Valitse palvelimesi" #: src/gui/serverdialog.cpp:248 msgid "Choose Your Server *** SAFE MODE ***" -msgstr "" +msgstr "Valitse palvelimesi *** VARMUUSTILA ***" #: src/gui/serverdialog.cpp:253 msgid "Port:" @@ -1747,11 +1744,11 @@ msgstr "Valmistelen latausta" msgid "Error retreiving server list!" msgstr "Palvelinluettelon hakeminen epäonnistui!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "vaatii uudemman version" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "vaatii version %s" @@ -1820,7 +1817,7 @@ msgstr "Näytä keskustelun värilista" #: src/gui/setup_chat.cpp:64 msgid "Commands" -msgstr "" +msgstr "Komennot" #: src/gui/setup_chat.cpp:66 msgid "Allow magic and GM commands in all chat tabs" @@ -1828,7 +1825,7 @@ msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä" #: src/gui/setup_chat.cpp:70 msgid "Limits" -msgstr "" +msgstr "Rajat" #: src/gui/setup_chat.cpp:72 msgid "Limit max chars in chat line" @@ -1840,7 +1837,7 @@ msgstr "Keskusteluvälilehden riviraja" #: src/gui/setup_chat.cpp:79 msgid "Logs" -msgstr "" +msgstr "Lokit" #: src/gui/setup_chat.cpp:81 msgid "Enable chat Log" @@ -1852,7 +1849,7 @@ msgstr "Näytä keskusteluhistoria" #: src/gui/setup_chat.cpp:88 msgid "Messages" -msgstr "" +msgstr "Viestit" #: src/gui/setup_chat.cpp:90 msgid "Hide shop messages" @@ -1860,7 +1857,7 @@ msgstr "Piilota kauppaviestit" #: src/gui/setup_chat.cpp:94 msgid "Tabs" -msgstr "" +msgstr "Välilehdet" #: src/gui/setup_chat.cpp:96 msgid "Put all whispers in tabs" @@ -1892,23 +1889,23 @@ msgstr "Muuta välilehden kokoa tarpeen mukaan" #: src/gui/setup_chat.cpp:118 msgid "Time" -msgstr "" +msgstr "Aika" #: src/gui/setup_chat.cpp:120 msgid "Use local time" -msgstr "" +msgstr "Käytä paikallista aikaa" #: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" -msgstr "" +msgstr "Muu" #: src/gui/setup_chat.cpp:125 msgid "Highlight words (separated by comma)" -msgstr "" +msgstr "Korosta sanat (pilkuin erotettu)" #: src/gui/setup_chat.cpp:128 msgid "Show MVP messages" -msgstr "" +msgstr "Näytä MVP-viestit" #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" @@ -1979,7 +1976,7 @@ msgstr "Ota peliohjain käyttöön" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "" +msgstr "Käytä peliohjainta jos asiakasikkuna ei ole aktiivinen" #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -1991,7 +1988,7 @@ msgstr "Lopeta" #: src/gui/setup_joystick.cpp:149 msgid "Rotate the stick and dont press buttons" -msgstr "" +msgstr "Pyöritä ohjainta, älä paina nappeja" #: src/gui/setup_keyboard.cpp:80 msgid "Keyboard" @@ -2071,19 +2068,19 @@ msgstr "Piirrä siirtymäpikanäppäimet kartalle" #: src/gui/setup_other.cpp:87 msgid "Enable lazy scrolling" -msgstr "" +msgstr "Ota laiska vieritys käyttöön" #: src/gui/setup_other.cpp:90 msgid "Scroll laziness" -msgstr "" +msgstr "Vierityksen laiskuus" #: src/gui/setup_other.cpp:93 msgid "Scroll radius" -msgstr "" +msgstr "Vierityksen säde" #: src/gui/setup_other.cpp:97 msgid "Moving" -msgstr "" +msgstr "Liikkuminen" #: src/gui/setup_other.cpp:99 msgid "Auto fix position" @@ -2103,7 +2100,7 @@ msgstr "Villiliike (a) -ohjelma" #: src/gui/setup_other.cpp:112 msgid "Player" -msgstr "" +msgstr "Pelaaja" #: src/gui/setup_other.cpp:114 msgid "Show own hp bar" @@ -2127,7 +2124,7 @@ msgstr "Näytä pelaajaponnahdusikkunat" #: src/gui/setup_other.cpp:129 msgid "Afk message" -msgstr "" +msgstr "Poissaoloviesti" #: src/gui/setup_other.cpp:132 msgid "Show job" @@ -2139,7 +2136,7 @@ msgstr "Ota käyttöön hyökkäyssuodin" #: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" -msgstr "" +msgstr "Ota käyttöön mainosprotokolla" #: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" @@ -2155,15 +2152,15 @@ msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin" #: src/gui/setup_other.cpp:157 msgid "Bots support" -msgstr "" +msgstr "Bottien tuki" #: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" -msgstr "" +msgstr "Ota käyttöön huutokauppabotin tuki" #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" -msgstr "" +msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä" #: src/gui/setup_other.cpp:168 msgid "Enable server side attack" @@ -2175,7 +2172,7 @@ msgstr "Ota bottitutka käyttöön" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection (do not disable)" -msgstr "" +msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)" #: src/gui/setup_other.cpp:178 msgid "Enable debug log" @@ -2195,11 +2192,11 @@ msgstr "Näytä tausta" #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" -msgstr "" +msgstr "Ota lisätehot käyttöön ;)" #: src/gui/setup_perfomance.cpp:58 msgid "Auto adjust perfomance" -msgstr "" +msgstr "Sopeuta tehokkuusasetukset automaattisesti" #: src/gui/setup_perfomance.cpp:61 msgid "Hw acceleration" @@ -2208,38 +2205,39 @@ msgstr "Rautakiihdytys" #: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" +"Ota käyttöön läpinäkyvyysvälimuisti (ohjelmallinen, voi olla muistisyöppö)" #: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" -msgstr "" +msgstr "Ota käyttöön karttareduktio (ohjelmallinen)" #: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" -msgstr "" +msgstr "Parempi laatu (poista käytöstä jos tarvitset lisätehoa)" #: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" -msgstr "" +msgstr "Ota käyttöön alfakanavan korjaus (ohjelmallinen, voi olla hidas)" #: src/gui/setup_perfomance.cpp:77 msgid "Show beings transparency" -msgstr "" +msgstr "Näytä olioiden läpinäkyvyys" #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." -msgstr "" +msgstr "Ota käyttöön uudelleenjärjestyshahmot" #: src/gui/setup_perfomance.cpp:83 msgid "Small memory (enable for lower memory usage)" -msgstr "" +msgstr "Pieni muisti, käytä vähemmän muistia" #: src/gui/setup_perfomance.cpp:86 msgid "Disable advanced beings caching (Software)" -msgstr "" +msgstr "Poista kehittynyt olentojen välimuisti käytöstä (ohjelmallinen)" #: src/gui/setup_perfomance.cpp:89 msgid "Disable beings caching (Software)" -msgstr "" +msgstr "Poista olentojen välimuisti käytöstä (ohjelmallinen)" #: src/gui/setup_players.cpp:54 msgid "Show gender" @@ -2255,7 +2253,7 @@ msgstr "Näytä oma nimi" #: src/gui/setup_players.cpp:63 msgid "Enable extended mouse targeting" -msgstr "" +msgstr "Ota käyttöön laajennettu kohteen valinta hiirellä" #: src/gui/setup_players.cpp:66 msgid "Target dead players" @@ -2271,19 +2269,19 @@ msgstr "Turvaa kaupat" #: src/gui/setup_players.cpp:75 msgid "Unsecure chars in names" -msgstr "" +msgstr "Turvattomia merkkejä nimissä" #: src/gui/setup_players.cpp:78 msgid "Show statuses" -msgstr "" +msgstr "Näytä tilat" #: src/gui/setup_players.cpp:81 msgid "Show ip addresses on screenshots" -msgstr "" +msgstr "Näytä IP-osoitteet kuvakaappauksissa" #: src/gui/setup_players.cpp:84 msgid "Allow self heal with mouse click" -msgstr "" +msgstr "Salli itsen parantaminen hiiren napsautuksella" #: src/gui/setup_relations.cpp:65 msgid "Relation" @@ -2311,11 +2309,11 @@ msgstr "Pyyhitty" #: src/gui/setup_relations.cpp:75 msgid "Blacklisted" -msgstr "" +msgstr "Mustalla listalla" #: src/gui/setup_relations.cpp:76 msgid "Enemy" -msgstr "" +msgstr "Vihollinen" #: src/gui/setup_relations.cpp:240 msgid "Allow trading" @@ -2331,7 +2329,7 @@ msgstr "Vanha" #: src/gui/setup_relations.cpp:247 msgid "Relations" -msgstr "" +msgstr "Suhteet" #: src/gui/setup_relations.cpp:272 msgid "When ignoring:" @@ -2363,59 +2361,59 @@ msgstr "Jättimäinen (15)" #: src/gui/setup_theme.cpp:146 msgid "Chinese (China)" -msgstr "" +msgstr "Kiina (kiina)" #: src/gui/setup_theme.cpp:147 msgid "Czech" -msgstr "" +msgstr "Tsekki" #: src/gui/setup_theme.cpp:148 msgid "English" -msgstr "" +msgstr "Englanti" #: src/gui/setup_theme.cpp:149 msgid "Finnish" -msgstr "" +msgstr "Suomi" #: src/gui/setup_theme.cpp:150 msgid "French" -msgstr "" +msgstr "Ranska" #: src/gui/setup_theme.cpp:151 msgid "German" -msgstr "" +msgstr "Saksa" #: src/gui/setup_theme.cpp:152 msgid "Indonesian" -msgstr "" +msgstr "Indonesia" #: src/gui/setup_theme.cpp:153 msgid "Polish" -msgstr "" +msgstr "Puola" #: src/gui/setup_theme.cpp:154 msgid "Japanese" -msgstr "" +msgstr "Japani" #: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" -msgstr "" +msgstr "Hollanti (Belgia/fleemi)" #: src/gui/setup_theme.cpp:156 msgid "Portuguese" -msgstr "" +msgstr "Portugali" #: src/gui/setup_theme.cpp:157 msgid "Portuguese (Brazilian)" -msgstr "" +msgstr "Portugali (Brasilia)" #: src/gui/setup_theme.cpp:158 msgid "Russian" -msgstr "" +msgstr "Venäjä" #: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" -msgstr "" +msgstr "Espanja (Kastilli)" #: src/gui/setup_theme.cpp:191 msgid "Theme" @@ -2427,7 +2425,7 @@ msgstr "Käyttöliittymän teema" #: src/gui/setup_theme.cpp:194 msgid "Language" -msgstr "" +msgstr "Kieli" #: src/gui/setup_theme.cpp:195 msgid "Main Font" @@ -2447,11 +2445,11 @@ msgstr "Ohjekirjasin" #: src/gui/setup_theme.cpp:199 msgid "Secure font" -msgstr "" +msgstr "Turvallinen kirjasin" #: src/gui/setup_theme.cpp:200 msgid "Japanese font" -msgstr "" +msgstr "Japanilainen kirjasin" #: src/gui/setup_theme.cpp:237 msgid "Font size" @@ -2528,7 +2526,7 @@ msgstr "Hiukkastehosteet" #: src/gui/setup_video.cpp:293 msgid "Show pickup notification" -msgstr "Näytä ottoviesti" +msgstr "Näytä poimintaviesti" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:295 @@ -2649,7 +2647,7 @@ msgstr "Näytä linkit ilmoituksessa" #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149 msgid "Auction" -msgstr "" +msgstr "Huutokauppa" #: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 @@ -2694,194 +2692,204 @@ msgstr "Taso: %d" msgid "Lvl: %d (%+d)" msgstr "Taso: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Kilta" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Kutsuit käyttäjän %s kiltaan %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Killasta %s eroa pyydetty." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "Jäsenen kutsuminen kiltaan" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Kenet haluaisit kutsua kiltaan %s?" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Eroa killasta?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Haluatko varmasti erota killasta %s?" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Ryhmä" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "Käyttäjä %s kutsuttu ryhmään." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "Ryhmästä %s eroamista pyydetty." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "Jäsenen kutsuminen ryhmään" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Kenet haluaisit kutsua ryhmään %s?" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "Eroa ryhmästä?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Haluatko varmasti erota ryhmästä %s?" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Hyö" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Priorisoidut kohteet" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "Hyökkäyskohteet" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Ohitettavat kohteet" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Luo kilta" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Luo ryhmä" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Suhteet" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Kutsu" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Otit vastaan ryhmäkutsun pelaajalta %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Otit vastaan kiltakutsun pelaajalta %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Kieltäydyit pelaajan %s kiltakutsusta." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Luon killan %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Luon ryhmän %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Killan nimi" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Valitse killallesi nimi." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, 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:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Ota kiltakutsu vastaan" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "Sinut on kutsuttu liittymään ryhmään." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, 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:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s on kutsunut sinut liittymään ryhmäänsä." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Ota ryhmäkutsu vastaan" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Ryhmän nimi" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Anna ryhmällesi nimi." @@ -2995,7 +3003,7 @@ msgstr "Komento:" #: src/gui/textcommandeditor.cpp:200 msgid "Comment:" -msgstr "" +msgstr "Kommentti:" #: src/gui/textcommandeditor.cpp:203 msgid "Mana:" @@ -3071,33 +3079,33 @@ msgstr "Tavaran lisääminen epäonnistui, limittämisongelma." msgid "Name: %s" msgstr "Nimi: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Päivitetään..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Yhdistetään..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Pelaa" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 Päivitysprosessi keskeytyi" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 Suosittelemme vahvasti että" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 yrität myöhemmin uudelleen" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Valmis" @@ -3159,7 +3167,7 @@ msgstr "Hiukkastehosteet" #: src/gui/userpalette.cpp:132 msgid "Pickup Notification" -msgstr "Ottoilmoitus" +msgstr "Poimintailmoitus" #: src/gui/userpalette.cpp:133 msgid "Exp Notification" @@ -3249,23 +3257,23 @@ msgstr "Kotipaikan raja" msgid "Road Point" msgstr "Väyläpiste" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Kuka on linjoila - päivitän" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Päivitä" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Kuka on linjoilla - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Kuka on linjoilla - virhe" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Kuka on linjoilla - päivitä" @@ -3519,11 +3527,11 @@ msgstr "Pu" #: src/gui/windowmenu.cpp:98 msgid "YK" -msgstr "" +msgstr "T?" #: src/gui/windowmenu.cpp:98 msgid "Did you know" -msgstr "" +msgstr "Tiesitkö" #: src/gui/windowmenu.cpp:100 msgid "SET" @@ -3551,7 +3559,7 @@ msgstr "Kärry" #: src/keyboardconfig.cpp:43 msgid "Basic Keys" -msgstr "" +msgstr "Perusnäppäimet" #: src/keyboardconfig.cpp:44 msgid "Move Up" @@ -3599,7 +3607,7 @@ msgstr "Keskeytä hyökkäys" #: src/keyboardconfig.cpp:65 msgid "Untarget" -msgstr "" +msgstr "Poista kohdevalinta" #: src/keyboardconfig.cpp:66 msgid "Target Closest" @@ -3615,11 +3623,11 @@ msgstr "Pelaaja kohteeksi" #: src/keyboardconfig.cpp:71 msgid "Pickup" -msgstr "Nouki" +msgstr "Poimi" #: src/keyboardconfig.cpp:72 msgid "Change Pickup Type" -msgstr "Muuta noston tyyppiä" +msgstr "Muuta poiminnan tyyppiä" #: src/keyboardconfig.cpp:74 msgid "Hide Windows" @@ -3647,7 +3655,7 @@ msgstr "Valitse OK" #: src/keyboardconfig.cpp:85 msgid "Shortcuts Keys" -msgstr "" +msgstr "Pikavalintanäppäimet" #: src/keyboardconfig.cpp:86 msgid "Item Shortcuts Key" @@ -3670,7 +3678,7 @@ msgstr "Tavarapikavalinta %d" #: src/keyboardconfig.cpp:128 msgid "Windows Keys" -msgstr "" +msgstr "Ikkunanäppäimet" #: src/keyboardconfig.cpp:129 msgid "Help Window" @@ -3750,7 +3758,7 @@ msgstr "Kuka on linjoilla -ikkuna" #: src/keyboardconfig.cpp:168 msgid "Did you know Window" -msgstr "" +msgstr "Tiesitkö-ikkuna" #: src/keyboardconfig.cpp:171 msgid "Previous Social Tab" @@ -3762,7 +3770,7 @@ msgstr "Seuraava sos. välilehti" #: src/keyboardconfig.cpp:175 msgid "Emotes Keys" -msgstr "" +msgstr "Elenäppäimet" #: src/keyboardconfig.cpp:176 msgid "Smilie" @@ -3797,7 +3805,7 @@ msgstr "Eleen pikavalinta %d" #: src/keyboardconfig.cpp:270 msgid "Outfits Keys" -msgstr "" +msgstr "Asunäppäimet" #: src/keyboardconfig.cpp:271 msgid "Wear Outfit" @@ -3813,7 +3821,7 @@ msgstr "Kopioi varusteet asuksi" #: src/keyboardconfig.cpp:277 msgid "Chat Keys" -msgstr "" +msgstr "Keskustelunäppäimet" #: src/keyboardconfig.cpp:278 msgid "Toggle Chat" @@ -3837,7 +3845,7 @@ msgstr "Seuraava keskusteluvälilehti" #: src/keyboardconfig.cpp:289 msgid "Close current Chat Tab" -msgstr "" +msgstr "Sulje tämä keskusteluvälilehti" #: src/keyboardconfig.cpp:291 msgid "Previous chat line" @@ -3857,7 +3865,7 @@ msgstr "Poistu keskustelusyötöstä" #: src/keyboardconfig.cpp:299 msgid "Other Keys" -msgstr "" +msgstr "Muut näppäimet" #: src/keyboardconfig.cpp:300 msgid "Ignore input 1" @@ -3921,7 +3929,7 @@ msgstr "Vaihda magiahyökkäystä" #: src/keyboardconfig.cpp:329 msgid "Switch pvp attack" -msgstr "" +msgstr "Vaihda PvP-hyökkäystä" #: src/keyboardconfig.cpp:330 msgid "Change move type" @@ -3965,7 +3973,7 @@ msgstr "Vaihda kameran toimintaa" #: src/keyboardconfig.cpp:350 msgid "Modifier key" -msgstr "" +msgstr "Muokkausnäppäin" #: src/keyboardconfig.cpp:429 #, c-format @@ -3977,427 +3985,430 @@ msgstr "" "ole hyvä ja poista päällekkäisyydet. " #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "Sinut otti hengiltä " +#, c-format +msgid "You were killed by %s" +msgstr "Sinut tappoi %s." -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." -msgstr "Yritit nostaa olemattoman tavaran." +msgstr "Yritit poimia olemattoman tavaran." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "Tavara on liian painava." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "Tavara on liian kaukana." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "Sinulla on liikaa tavaraa ennestään." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "Kasa on liian suuri." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "Tavara kuuluu jollekulle muulle." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." -msgstr "Tuntematon ongelma esti tavaran nostamisen." +msgstr "Tuntematon ongelma esti tavaran poimimisen." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1476 +#: src/localplayer.cpp:1481 #, 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) otettu." -msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu." +msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu." +msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu." -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) oletusliikkeet" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(I) käännetyt liikkeet" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) liikkuu osin villiliikkein" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) liikkuu villiliikkein" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) tuplaa tavallinen + villi" -#: src/localplayer.cpp:1896 -#, fuzzy +#: src/localplayer.cpp:1903 msgid "(?) unknown move" -msgstr "(?) tuntematon seuraaminen" +msgstr "(?) tuntematon liikkumistapa" -#: src/localplayer.cpp:1918 -#, fuzzy, c-format +#: src/localplayer.cpp:1925 +#, c-format msgid "(%d) crazy move number %d" -msgstr "(?) villiliike" +msgstr "(%d) villiliike nro %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) oma villiliike" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) villiliike" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) oletussiirtymä kohteen luo" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) siirry kohteen luo etäisyydellä 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) siirry kohteen luo etäisyydellä 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) siirry kohteen luo etäisyydellä 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) siirry kohteen luo etäisyydellä 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) siirry kohteen luo etäisyydellä 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) siirry kohteen luo hyökkäyskantamalla" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" -msgstr "" +msgstr "(a) jousiampujan hyökkäyskantama" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) siirry kohteen luo" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) oletusseuraaminen" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) suhteellinen seuraaminen" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) peilikuvaseuraaminen" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) lemmikkiseuraaminen" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) tuntematon seuraaminen" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) hyökkäys" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) oletushyökkäys" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) vaihda hyökkäystä, ei kilpeä" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) vaihda hyökkäystä, kilpi mukana" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) mene ja hyökkää" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" -msgstr "(A) mene, hyökkää, nosta" +msgstr "(A) mene, hyökkää, poimi" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) ei automaattista hyökkäystä" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" -msgstr "(S) pieni nosto 1x1 ruutua" +msgstr "(S) pieni poiminta 1x1 ruutua" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" -msgstr "(D) oletusnosto 2x1 ruutua" +msgstr "(D) oletuspoiminta 2x1 ruutua" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" -msgstr "(F) nosto edestä 2x3 ruutua" +msgstr "(F) poiminta edestä 2x3 ruutua" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" -msgstr "(3) nosto 3x3 ruutua" +msgstr "(3) poiminta 3x3 ruutua" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" -msgstr "(g) mene ja nosta etäisyydellä 4" +msgstr "(g) mene ja poimi etäisyydellä 4" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" -msgstr "(G) mene ja nosta etäisyydellä 8" +msgstr "(G) mene ja poimi etäisyydellä 8" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" -msgstr "(A) mene ja nosta maksimietäisyydellä" +msgstr "(A) mene ja poimi maksimietäisyydellä" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" -msgstr "(?) nosta" +msgstr "(?) poiminta" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) normaali karttanäkymä" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) debug-karttanäkymä" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) ultra-karttanäkymä" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) ultra-karttanäkymä 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) tyhjä karttanäkymä" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) mustavalkoinen karttanäkymä" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) #flar taikahyökkäyksenä" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) #chiza taikahyökkäyksenä" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) #ingrav taikahyökkäyksenä" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) #frillyar taikahyökkäyksenä" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) #upmarmu taikahyökkäyksenä" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) taikahyökkäys" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" -msgstr "" +msgstr "(a) hyökkää kaikkien pelaajien kimppuun" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" -msgstr "" +msgstr "(f) säästä ystävät, listi muut" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" -msgstr "" +msgstr "(b) hyökkää jos huonot suhteet" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" -msgstr "" +msgstr "(d) älä hyökkää pelaajien kimppuun" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" -msgstr "" +msgstr "(?) pelaajien kanssa taistelu" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) oletusmatkinta" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) asun matkinta" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) matkinta" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Poissa" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) paikalla" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) poissa" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) poissaolo" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) pelin kameratila" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) vapaa kamera" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Pelimuokkaimet käytössä" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Pelimuokkaimet poissa käytöstä" -#: src/localplayer.cpp:2234 -#, fuzzy +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" -msgstr "Pelimuokkaimet käytössä" +msgstr "Pelimuokkaimet ovat tuntemattomia" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Seuraa: " -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Seuraaminen keskeytetty" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "Matki: " -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Matkiminen keskeytetty" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Näet " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" -msgstr "" +msgstr "manaplus [asetukset] [manaplus-tiedosto]" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" -msgstr "" +msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" -msgstr "" +msgstr " jolla asetetaan erikoisvalitsimia" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." -msgstr "" +msgstr " manaplus-ohjelmalle." -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" -msgstr "Parametrit:" +msgstr "Asetusvivut:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Käytettävä lokitiedosto" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Käytettävä keskustelulokihakemisto" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Näytä versionumero" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Näytä tämä ohje" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Käytä tätä asetushakemistoa" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Käyttäjätunnus sisäänkirjautumiseen" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password : Salasana sisäänkirjautumiseen" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character : Hahmo sisäänkirjautumiseen" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr "" " -s --server : Palvelinnimi tai IP-osoite sisäänkirjautumiseen" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Palvelinportti sisäänkirjautumiseen " -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr " --update-host : Käytä tätä päivityspalvelinta" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Aseta oletushahmopalvelin ja -hahmo" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Ohita päivityslataukset" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Lataa pelidata tästä hakemistosta" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Hakemisto paikallisdatan tallennukseen" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Kuvankaappausten tallennushakemisto" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Käynnistä peli vikasietotilassa" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr " -T --tests : Käynnistä ajuritestaus ja automaattiasetukset" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Poista OpenGL käytöstä tämän session ajaksi" @@ -4453,7 +4464,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Väärä nimi." @@ -4469,15 +4480,19 @@ msgstr "Väärä hiustyyli." msgid "Incorrect slot." msgstr "Väärä paikka." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "Väärä rotu." + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Tietoja" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Hahmo poistettu." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "Hahmon poisto epäonnistui." @@ -4508,30 +4523,30 @@ msgstr "MVP-pelaaja: " #: src/net/ea/chathandler.cpp:370 msgid "All whispers ignored." -msgstr "" +msgstr "Kaikki kuiskaukset jätetään huomiotta." #: src/net/ea/chathandler.cpp:374 msgid "All whispers ignore failed." -msgstr "" +msgstr "Kuiskausten huomiotta jättäminen epäonnistui." #: src/net/ea/chathandler.cpp:385 msgid "All whispers unignored." -msgstr "" +msgstr "Kaikki kuiskaukset huomioidaan taas." #: src/net/ea/chathandler.cpp:389 msgid "All whispers unignore failed." -msgstr "" +msgstr "Kuiskausten huomiointi epäonnistui." -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "Käyttäjiä palvelimella: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Peli" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "Lopetuspyyntö evätty!" @@ -4621,11 +4636,11 @@ msgstr "Tuntematon vastaus kiltakutsuun." msgid "%s has left your guild." msgstr "%s on eronnut killastasi." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "Sinut on potkittu killasta." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "Sinut potkittiin ulos killasta." -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%s on potkittu ulos killastasi." @@ -4759,40 +4774,40 @@ msgstr "Vanha salsana on väärä." msgid "New password too short." msgstr "Uusi salasana on liian lyhyt." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "Rekisteröimätön tunniste." -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Väärä salasana." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "Tili vanhentunut." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Palvelin ei kelpuuttanut yhteydenottoasi." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 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:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Liian vanha asiakasohjelma." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4801,15 +4816,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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Palvelin on täynnä." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Käyttäjätunnus on jo käytössä." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Käyttäjänimi pysyvästi poistettu." @@ -5003,7 +5018,7 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen." #: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." -msgstr "%s nostettu." +msgstr "%s poimittu." #: src/net/ea/playerhandler.cpp:459 #, c-format @@ -5154,7 +5169,7 @@ msgstr "Kaupat peruttu." msgid "Trade completed." msgstr "Kaupat tuli." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Voima" @@ -5163,7 +5178,7 @@ msgstr "Voima" msgid "Strength %+.1f" msgstr "Voima %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Ketteryys" @@ -5172,7 +5187,7 @@ msgstr "Ketteryys" msgid "Agility %+.1f" msgstr "Ketteryys %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Näppäryys" @@ -5181,7 +5196,7 @@ msgstr "Näppäryys" msgid "Dexterity %+.1f" msgstr "Näppäryys %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Elinvoima" @@ -5190,7 +5205,7 @@ msgstr "Elinvoima" msgid "Vitality %+.1f" msgstr "Elinvoima %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Älykkyys" @@ -5526,52 +5541,52 @@ msgstr "Tuntematon yhteysongelma." msgid "Got disconnected from server!" msgstr "Yhteys palvelimeen katkesi!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Tuuri" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Puolustus" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "T.-hyökkäys" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "T.-puolustus" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% Tarkkuus" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% Välttö" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% Täysosuma" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Hyökkäysviive" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Kävelyviive" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "Hyökkäyskantama" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." -msgstr "" +msgstr "Vahinko sekunnissa." #: src/net/tmwa/network.cpp:153 msgid "Empty address given to Network::connect()!" @@ -5590,143 +5605,47 @@ msgstr "Yhteys palvelimeen katkaistu. " msgid "%s is not in your party!" msgstr "%s ei ole ryhmässäsi!" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Tulosta '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Vilkuta nimeä" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Leijuva '...' -puhekupla" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Leijuva puhekupla" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "nimetön" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Hyökkäys %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Puolustus %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "VP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Tuntematon tavara" - -#~ msgid "(?) move" -#~ msgstr "(?) liiku" - -#~ msgid "(?) map view" -#~ msgstr "(?) karttanäkymä" - -#~ msgid "(D) design camera mode" -#~ msgstr "(D) suunnittelukamera" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(I)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" @@ -7,14 +7,15 @@ # <antoinebcn@hotmail.com>, 2011. # Bernard <nard@bh28.net>, 2011. # Jumpy <antoinebcn@hotmail.com>, 2011. -# <reidyaro@gmail.com>, 2011. +# <reidyaro@gmail.com>, 2011, 2012. +# Steel Style <steelstyle@free.fr>, 2012. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-28 21:35+0000\n" -"Last-Translator: reid <reidyaro@gmail.com>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/" "fr/)\n" "Language: fr\n" @@ -45,114 +46,114 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuration" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Vidéo" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "Thèmes" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Connexion au serveur" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Connexion" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Vous entrez dans un nouveau monde" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Téléchargement des personnages" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Connexion au serveur de jeu" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Changement de serveur de jeu" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Erreur" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Demande des paramètres d'inscription" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Changement de mot de passe" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Le mot de passe a été changé avec succès !" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Changer d'e-mail" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "L'adresse e-mail a été changée avec succès !" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Désinscription réussie" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "A bientôt, revenez quand vous voudrez..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Site de mise à jour invalide : %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Impossible de créer le dossier de mise à jour !" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Commande inconnue." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Vous ne pouvez pas envoyer de messages vides." -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -161,161 +162,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:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Demande de rejoindre le canal %s." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Le nom du groupe est manquant." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Le nom de la guilde est manquant." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Veuillez indiquer un nom." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "La touche <entrée> ferme la ligne d'entrée du chat." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Le message ferme la conversation." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "" "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Le message ferme maintenant la conversation." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "ami" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "écarté" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutre" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Joueur déjà %s !" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Joueur %s avec succès!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Le joueur n'a pas pu %s !" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Le joueur n'était pas ignoré !" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Le joueur n'est plus ignoré !" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" -msgstr "sous liste noir" +msgstr "sous liste noire" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "ennemi" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Joueur déjà effacé !" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Joueur éliminé avec succès !" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "le joueur n'a pas pu être effacé !" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Heure de lancement du client : %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondes" msgstr[1] "%d secondes" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "Taille du cache de polices" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Dimension du cache :" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Créé : " -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Effacé :" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Images des ressources :" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "Images des ressources non affectées :" @@ -325,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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Général" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Informations" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Capture d'écran sauvegardée sous" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "La sauvegarde de la capture d'écran a échoué !" -#: src/game.cpp:554 +#: src/game.cpp:558 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:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Erreur Réseau" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Ignorer les requêtes d'échanges entrantes" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Accepter les requêtes d'échanges entrantes" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "La carte n'a pu être chargée" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Erreur durant le chargement %s" @@ -397,7 +398,7 @@ msgstr "Nom" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Attaquer" @@ -416,7 +417,7 @@ msgstr "Déplacement" msgid "Result" msgstr "Résultat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Réinitialiser" @@ -434,21 +435,21 @@ msgstr "Prix : %s / Total : %s" #: src/gui/buydialog.cpp:103 msgid "Amount:" -msgstr "Montant" +msgstr "Montant:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -460,8 +461,8 @@ msgid "Quit" msgstr "Quitter" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Max." @@ -485,14 +486,14 @@ msgstr "Vendre" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Annuler" @@ -524,7 +525,7 @@ msgid "The email address entries mismatch." msgstr "Les deux adresses e-mail ne correspondent pas." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Changer le mot de passe" @@ -590,8 +591,8 @@ msgstr "Coupe :" msgid "Race:" msgstr "Race:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Créer" @@ -633,47 +634,47 @@ msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?" msgid "Account and Character Management" msgstr "Gestion du compte et du personnage" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Changer de compte" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Se désinscrire" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Modifier l'adresse e-mail" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Mot de passe incorrect" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Entrer le mot de passe pour effacer le personnage" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Entrer le mot de passe :" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Supprimer" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Choisir" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Niveau %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(vide)" @@ -747,12 +748,12 @@ msgstr "???" msgid "Chat" msgstr "Conversation" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Présents : %s ; %d joueurs sont présents." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Message envoyé à %s : %s" @@ -916,7 +917,7 @@ msgid "Did You Know?" msgstr "Le saviez-vous ?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fermer" @@ -944,8 +945,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Retirer" @@ -987,26 +988,26 @@ msgid "Filter:" msgstr "Filtre :" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Équiper" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Utiliser" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Jeter..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Partager" @@ -1020,17 +1021,17 @@ msgid "Weight:" msgstr "Poids :" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Entreposer" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Récupérer" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Jeter" @@ -1253,31 +1254,27 @@ msgstr "Barre de Statut" msgid "Need" msgstr "Restant" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Attente du serveur" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "Arrêter d'attendre " + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Suivant" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Soumettre" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "PNJ" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Effacer" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr ">suivant" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "A :" @@ -1296,6 +1293,7 @@ msgid "Outfit: %d" msgstr "Tenue : %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Touche : %s" @@ -1379,7 +1377,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorer complètement" @@ -1431,7 +1429,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Déshabiller" @@ -1483,8 +1481,8 @@ msgstr "Joueurs" msgid "Pick up" msgstr "Ramasser" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Ajouter à la conversation" @@ -1496,8 +1494,8 @@ msgstr "Objet de carte" msgid "Rename" msgstr "Renommer" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Enlever" @@ -1506,8 +1504,8 @@ msgid "Warp" msgstr "Télétransportation" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Charger les anciennes tenues" +msgid "Clear outfit" +msgstr "Nettoyer les tenues" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1545,119 +1543,118 @@ msgstr "Active la fonction Absence" msgid "Disable away" msgstr "Désactive la fonction Absence" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Quitter" #: src/gui/popupmenu.cpp:654 -#, fuzzy msgid "Copy to clipboard" -msgstr "Copier dans la conversation" +msgstr "Copier vers le presse-papier" #: src/gui/popupmenu.cpp:849 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:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Renommer le panneau de carte" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Nom : " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "Le joueur commente " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "Commentaire : " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "Ajouter à la transaction" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "Ajouter 10 dans l'échange" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "Ajouter la moitié dans l'échange" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Ajouter tout dans l'échange" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Entreposer 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Entreposer la moitié" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Entreposer tout" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Jeter tout" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Reprendre 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Reprendre la moitié" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Reprendre tout" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Charger les anciens raccourcis d'objets" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Charger les anciens raccourcis de jets d'objets" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Cacher" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Montrer" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Remise aux valeurs de défaut de la barre jaune" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copier dans la conversation" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(défaut)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Aller vers le haut" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Aller vers le bas" @@ -1754,11 +1751,11 @@ msgstr "Préparation du téléchargement" msgid "Error retreiving server list!" msgstr "Erreur lors du téléchargement de la liste de serveur !" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "requiert une nouvelle version" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "requiert la v%s" @@ -1910,7 +1907,7 @@ msgstr "Autre" #: src/gui/setup_chat.cpp:125 msgid "Highlight words (separated by comma)" -msgstr "Mots en surbrillance (séparer par un coma)" +msgstr "Mots en surbrillance (séparés par une virgule)" #: src/gui/setup_chat.cpp:128 msgid "Show MVP messages" @@ -2161,15 +2158,15 @@ msgstr "Enregistrer les conversations des PNJ" #: src/gui/setup_other.cpp:157 msgid "Bots support" -msgstr "Supports de robot" +msgstr "Aide de bots" #: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" -msgstr "Activer le support pour auction bot" +msgstr "Activer le bot d'enchère" #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" -msgstr "Activer le support pour guild bot et désactiver le support par défault" +msgstr "Activer le bot de guilde et désactiver le support par défault" #: src/gui/setup_other.cpp:168 msgid "Enable server side attack" @@ -2287,11 +2284,11 @@ msgstr "Montrer les Status" #: src/gui/setup_players.cpp:81 msgid "Show ip addresses on screenshots" -msgstr "Montrer les adresses ip sur les photos d'écran" +msgstr "Afficher les adresses ip sur les photos 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 sourie" +msgstr "Autoriser la récupération automatique sur clic droit de la souris" #: src/gui/setup_relations.cpp:65 msgid "Relation" @@ -2398,9 +2395,8 @@ msgid "Indonesian" msgstr "Indonésien" #: src/gui/setup_theme.cpp:153 -#, fuzzy msgid "Polish" -msgstr "Anglais" +msgstr "Polonais" #: src/gui/setup_theme.cpp:154 msgid "Japanese" @@ -2460,7 +2456,7 @@ msgstr "Police sécurisée" #: src/gui/setup_theme.cpp:200 msgid "Japanese font" -msgstr "police japonaise" +msgstr "Police japonaise" #: src/gui/setup_theme.cpp:237 msgid "Font size" @@ -2710,198 +2706,208 @@ msgstr "Niveau : %d" msgid "Lvl: %d (%+d)" msgstr "Niveau : %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guilde" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Le joueur %s a été invité dans la guilde %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Demande pour quitter la guilde %s effectuée." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "Inviter le membre de la guilde" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, 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:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Quitter la guilde ?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, 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:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Groupe" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "/party > Inviter l'utilisateur %s dans le groupe." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "Vous avez demandé à quitter le groupe %s." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "Inviter un joueur dans le groupe" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, 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:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "Quitter le groupe ?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, 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:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Atq" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Monstres prioritaires" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "Attaquer les monstres" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Ignorer les monstres" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Créer une Guilde" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Créer un groupe" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Inviter" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Invitation dans le groupe acceptée de la part de %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Invitation dans le groupe de la part de %s refusée." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Invitation dans la guilde acceptée de la part de %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Invitation dans la guilde de la part de %s refusée." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "La guilde %s a été créée." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Le groupe %s a été créé." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Nom de la guilde" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Choisissez le nom de la guilde." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 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:1431 +#: src/gui/socialwindow.cpp:1559 #, 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:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Accepter l'invitation dans cette guilde" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 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:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "Vous avez été invité à rejoindre un groupe." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, 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:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s vous a invité à rejoindre son groupe." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Accepter l'invitation pour ce groupe" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Nom du groupe" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Choisissez le nom du groupe." @@ -3093,33 +3099,33 @@ msgstr "" msgid "Name: %s" msgstr "Nom : %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Mise à jour en cours..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Connexion..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Jouer" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 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:567 +#: src/gui/updaterwindow.cpp:572 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:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 Essayez à nouveau plus tard" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Terminé" @@ -3271,23 +3277,23 @@ msgstr "Limites de votre position" msgid "Road Point" msgstr "Étape" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Qui est en ligne - Mise à jour" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Mise à jour" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Qui est en ligne - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Qui est en ligne - Erreur" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Qui est en ligne - Mise à jour" @@ -3672,7 +3678,7 @@ msgstr "Sélectionner OK" #: src/keyboardconfig.cpp:85 msgid "Shortcuts Keys" -msgstr "Touches des raccourcies" +msgstr "Touches raccourcis" #: src/keyboardconfig.cpp:86 msgid "Item Shortcuts Key" @@ -4002,431 +4008,438 @@ msgstr "" "touches ou attendez vous à un possible comportement étrange du jeu." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "Vous avez été tué par " +#, c-format +msgid "You were killed by %s" +msgstr "Tu as été tué par %s" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Vous avez essayé de prendre un item qui n'existe pas." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "L'objet est trop lourd." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "L'objet est trop éloigné" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "L'inventaire est plein" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "La pile est trop grande" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "L'objet appartient a quelqu'un d'autre" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 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:1476 +#: src/localplayer.cpp:1481 #, 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:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) Mouvements par défaut" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(I) Mouvements inversés" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) mouvements un peu fous" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) mouvements complètements fous" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) double normal et fou" -#: src/localplayer.cpp:1896 +#: src/localplayer.cpp:1903 msgid "(?) unknown move" msgstr "(?) déplacement inconnue" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) mouvement de fou numerique %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) mouvements fous personnalisés" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) mouvements fous" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) Aller à la cible distante par défaut" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) Aller à la cible en distante de 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) Aller vers la cible jusqu'à 2 de distance" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) Aller à la cible en distante de 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) Aller à la cible en distante de 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) Aller à la cible en distante de 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) Aller à la cible dans le champ d'attaque" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "(a) Portée des attaques des Archéens" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) Aller à la cible" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) Suivre : défaut" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) Suivre: mouvement relatif" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) Suivre effet miroir" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) Suivre comme un toutou" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) Suivre : mode inconnu" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) Attaque" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) Attaque : défaut" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) Attaquer sans protection" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) Attaquer avec protection" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) Se déplacer et attaquer" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) Se déplacer, attaquer et ramasser" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) Sans attaque automatique" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) Ramassage sur 1x1 case" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) Ramassage par défaut sur 2x1 cases" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Ramassage avant sur 2x3 cases" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) Ramassage sur 3x3 cases" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) Aller et ramasser jusqu'à 4 de distance" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(G) Aller et ramasser jusqu'à 8 de distance" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) Aller et ramasser jusqu'à la distance max" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) Ramassage" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) Vue normale du jeu" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) Vue du jeu mode déverminage" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) Vue du jeu mode Ultra 1" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(u) Vue du jeu mode Ultra 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) Vue de la carte vide" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) Vue de la carte en N&B" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) Utiliser #flar comme sort d'attaque" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) Utiliser #chiza comme sort d'attaque" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) Utiliser #ingrav comme sort d'attaque" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) Utiliser #frillyar comme sort d'attaque" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Utiliser #upmarmu comme sort d'attaque" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) Sorts d'attaque" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "(a) attaque tous les joueurs" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "(f) n'attaque pas des amis" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "(b) attaque les mauvaises relations" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "(d) Ne pas attaquer les joueurs" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "(?) attaque en PVP" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) Imitation par défaut" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) Imiter les équipements" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) Imitation" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Inactif" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) Présent sur le jeu" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) Absent" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) Absent" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) Mode camera du jeu" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) Mode camera libre" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Modificateurs de mode de jeu activés" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Modificateurs de mode de jeu désactivés" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "Les modificateurs de jeux sont inconnus" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Suivre : " -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Suivi annulé" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "Imitation: " -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Imitation annulée" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Vous voyez " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [options] [manaplus-file]" -#: src/main.cpp:48 +#: src/main.cpp:51 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:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "utilisé pour définir des paramètres personnalisés" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "pour le client manaplus." -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Options :" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : fichier journal à utiliser" -#: src/main.cpp:55 +#: src/main.cpp:58 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:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Affiche la version" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Montre cette rubrique d'aide" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Répertoire de configuration à utiliser" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Se connecter avec ce nom d'utilisateur" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password : Se connecter avec ce mot de passe" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character : Se connecter avec ce personnage" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nom du serveur (ou IP) pour la connexion" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Port de connexion au serveur" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr "" " --update-host : Utilise cette URL pour les fichiers de mises à jour" -#: src/main.cpp:65 +#: src/main.cpp:68 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:67 +#: src/main.cpp:70 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:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Répertoire des données du jeu à charger" -#: src/main.cpp:70 +#: src/main.cpp:73 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:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Répertoire à utiliser pour les imprime-écrans" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Démarrer le jeu en mode sûr" -#: src/main.cpp:75 +#: src/main.cpp:77 +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 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Désactive l'OpenGL pour cette session" @@ -4484,7 +4497,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Mauvais nom." @@ -4500,15 +4513,19 @@ msgstr "Cheveux incorrects." msgid "Incorrect slot." msgstr "Case incorrecte." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "Race incorrect." + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Informations" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Personnage supprimé." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "La suppression du personnage n'a pu s'effectuer." @@ -4553,16 +4570,16 @@ msgstr "Tous les chuchotements ne sont plus sous silence." msgid "All whispers unignore failed." msgstr "La remise en activité de tout les chuchotements a échoué" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "Joueurs en ligne : %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Jeu" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "Requête de départ refusée !" @@ -4652,11 +4669,11 @@ msgstr "Réponse d'invitation à la guilde inconnue." msgid "%s has left your guild." msgstr "%s a quitté votre guilde." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "Vous avez été renvoyé de la guilde." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "Tu as été viré de la guilde." -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%s a sorti quelqu'un de votre guilde." @@ -4794,41 +4811,41 @@ msgstr "Ancien mot de passe incorrect." 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:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "Id non enregistrée." -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Mauvais mot de passe." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "Le compte a expiré." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Rejeté par le serveur." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 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:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Client trop ancien." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4837,15 +4854,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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Serveur surpeuplé." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Ce nom d'utilisateur est déjà utilisé." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Le nom de l'utilisateur a été éliminé de façon permanente." @@ -5203,7 +5220,7 @@ msgstr "Échange annulé." msgid "Trade completed." msgstr "Échange finalisé." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Force" @@ -5212,7 +5229,7 @@ msgstr "Force" msgid "Strength %+.1f" msgstr "Force %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Agilité" @@ -5221,7 +5238,7 @@ msgstr "Agilité" msgid "Agility %+.1f" msgstr "Agilité %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Dextérité" @@ -5230,7 +5247,7 @@ msgstr "Dextérité" msgid "Dexterity %+.1f" msgstr "Dextérité %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Vitalité" @@ -5239,7 +5256,7 @@ msgstr "Vitalité" msgid "Vitality %+.1f" msgstr "Vitalité %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Intelligence" @@ -5579,50 +5596,50 @@ msgstr "Erreur de connexion inconnue." msgid "Got disconnected from server!" msgstr "Vous avez été déconnecté du serveur !" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Chance" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Défense" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "Attaque M." -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "Défense M." -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% Précision" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% Esquive" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% Coup critique" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Temps de l'attaque" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Temps de déplacement" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "Portée de l'attaque" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "Dommage par s." @@ -5643,47 +5660,47 @@ 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:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Affiche '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Fais clignoter le nom" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Bulle flottante '...'" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Bulle flottante" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "anonyme" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Attaque %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Défense %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "PV %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "PM %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Objet inconnu" @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/" "id/)\n" "Language: id\n" @@ -43,113 +43,113 @@ msgstr "A" msgid "I" msgstr "l" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Pengaturan" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Video" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Terhubung dengan server" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Masuk" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Memasuki arena permainan" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Pemilihan karakter" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "terhubung dengan server" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Pergantian server" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Kesalahan" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Meminta detail registrasi" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Ubah sandi" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Perubahan sandi berhasil" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Perubahan email" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Perubahan email berhasil" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Telah tidak terdaftar" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Selamat tinggal, datang kembali setiap saat" -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Gagal mengupdate host: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Gagal membuat direktori update!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Perintah tidak dikenal." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Tidak dapat mengirimkan pesan tanpa nama" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,155 +158,155 @@ msgstr "" "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, " "atau nama anda sendiri" -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Meminta untuk masuk ke channel %s." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Nama kelompok tidak dapat di temukan" -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Nama organisasi tidak ditemukan." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Tetapkan sebuah nama" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Kembalikan pengalihan obrolan" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Tutup pesan obrolan" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Kembalikan sekarang pengalihan obrolan" -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Pesan menutup obrolan" -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "Teman" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "Diabaikan" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "netral" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Pemain telah %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Pemain telah berhasil %s!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Pemain tidak bisa %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Pemain tidak diabaikan!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Pemain tidak lagi diabaikan!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Pemain tidak dapat diabaikan" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Pemain telah terhapus" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Pemain telah berhasil dihapus" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Pemain tidak dapat dihapus" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "Ukuran jenis huruf cache" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Ukuran Cache:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Buat" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Hapus" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Sumber gambar" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "" @@ -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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Umum" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Debug" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Screenshot disimpan sebagai" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Gagal menyimpan screenshot!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "Koneksi ke server terputus" -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Kesalahan jaringan" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Abaikan permohonan transaksi" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Terima permohonan transaksi" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Tidak dapat menampilkan peta" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Error ketika menunggu %s" @@ -387,7 +387,7 @@ msgstr "Nama" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Pukul" @@ -406,7 +406,7 @@ msgstr "Jalan" msgid "Result" msgstr "Hasil" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Reset" @@ -429,16 +429,16 @@ msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -450,8 +450,8 @@ msgid "Quit" msgstr "Keluar" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Max" @@ -475,14 +475,14 @@ msgstr "Jual" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Batal" @@ -514,7 +514,7 @@ msgid "The email address entries mismatch." msgstr "Pengisian alamat email tidak cocok" #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Ganti sandi" @@ -580,8 +580,8 @@ msgstr "Gaya rambut" msgid "Race:" msgstr "Ras:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Buat" @@ -623,47 +623,47 @@ msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?" msgid "Account and Character Management" msgstr "Manajemen Akun dan Karakter" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Ubah Login" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Tidak jadi mendaftar" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Ganti email" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Sandi tidak benar" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Masukan Sandi untuk menghapus karakter" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Masukkan sandi" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Hapus" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Pilih" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Level %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(kosong)" @@ -737,12 +737,12 @@ msgstr "???" msgid "Chat" msgstr "Obrolan" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Kehadiran: %s; %d pemain yang hadir." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Berbisik ke %s: %s" @@ -906,7 +906,7 @@ msgid "Did You Know?" msgstr "Apakah kamu tahu?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Tutup" @@ -934,8 +934,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Lepaskan" @@ -977,26 +977,26 @@ msgid "Filter:" msgstr "Penyaring:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Pakai" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Gunakan" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Buang..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Pecah" @@ -1010,17 +1010,17 @@ msgid "Weight:" msgstr "Berat" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Simpan" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Kembalikan" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Buang" @@ -1241,31 +1241,27 @@ msgstr "" msgid "Need" msgstr "Butuh" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Menunggu ke server" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Berikutnya" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Masukan" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Hapus" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Kepada:" @@ -1284,6 +1280,7 @@ msgid "Outfit: %d" msgstr "Setelan: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Kunci: %s" @@ -1367,7 +1364,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "" @@ -1419,7 +1416,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Tanggalkan pakaian" @@ -1471,8 +1468,8 @@ msgstr "Pemain" msgid "Pick up" msgstr "Ambil" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Ambil ke obrolan" @@ -1484,8 +1481,8 @@ msgstr "Daftar barang" msgid "Rename" msgstr "Ganti nama" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Hapus" @@ -1494,8 +1491,8 @@ msgid "Warp" msgstr "" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Memuat setelan lama" +msgid "Clear outfit" +msgstr "" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1533,119 +1530,118 @@ msgstr "" msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "" #: src/gui/popupmenu.cpp:654 -#, fuzzy msgid "Copy to clipboard" -msgstr "Pindahkan ke chat" +msgstr "" #: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "Ubah posisi Organisasi" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Ubah nama tanda peta" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Nama:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "Komentar pemain" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "komentar" -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Tambahkan semua ke Penukaran" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Masukkan 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Masukkan setengah" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Masukkan semua" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Buang semuanya" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Ambil 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Ambil setengah" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Ambil semua" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Muat jalan pintas iItem lama" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Muat jalan pintas Buang yang lama" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Sembunyikan" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Tampilkan" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Atur ulang bar kuning" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Pindahkan ke chat" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(kembalikan)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Bergerak keatas" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Bergerak kebawah" @@ -1742,11 +1738,11 @@ msgstr "Menyiapkan pengunduhan" msgid "Error retreiving server list!" msgstr "Gagal mengunduh data server!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "Membutuhkan versi terbaru" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "Membutuhkan v%s" @@ -2686,194 +2682,204 @@ msgstr "Level: %d" msgid "Lvl: %d (%+d)" msgstr "Level: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Organisasi" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Pengguna yang diajak %s ke organisasi %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Permintaan %s keluar dari Organisasi " -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Tinggalkan organisasi?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Kelompok" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "Pengguna yang diajak %s ke kelompok" -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "Mengundang pengguna ke kelompok" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Sedang meninggalkan keyboard" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "mob prioritas" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "serang mob" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Abaikan mobs" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "" -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "" -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "" -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." msgstr "" -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "" -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "" -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, c-format msgid "%s has invited you to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 msgid "Cannot create party. You are already in a party" msgstr "" -#: src/gui/socialwindow.cpp:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "" @@ -3063,33 +3069,33 @@ msgstr "" msgid "Name: %s" msgstr "Nama: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Mengupdate..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Menyambung..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Main" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "" @@ -3241,23 +3247,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "" @@ -3962,425 +3968,428 @@ msgid "" msgstr "" #: src/localplayer.cpp:384 -msgid "You were killed by " +#, c-format +msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Mencoba mengambil item yang tidak lagi ada" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "item terlalu berat" -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "barang terlalu jauh" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "Perbekalan sudah penuh" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "Barang milik orang lain." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) jalan normal" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) normal ganda + mode gila" -#: src/localplayer.cpp:1896 -#, fuzzy +#: src/localplayer.cpp:1903 msgid "(?) unknown move" -msgstr "(?) jalan" +msgstr "" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) jalan ke target di jarak 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?)bergerak ke target" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?)serangan" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) pukulan normal" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) ganti pukulan tanpa pelindung" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) pukulan dengan pelindung" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) jalan dan serang" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) jalan, serang, ambil" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) tanpa penyerangan otomatis" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?)mengambil" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) penampilan peta normal" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) penampilan peta kosong" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b)penampilan peta hitam & putih" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) gunakan #flar untuk serangan magic" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) gunakan #chiza untuk serangan magic" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(l) gunakan #ingrav untuk serangan magic" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) gunakan #frillyar untuk serangan magic" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gunakan #upmarmu untuk serangan magic" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) serangan magic" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) pada keyboard" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) pergi" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) pergi" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Perombakan game diperbolehkan" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Perombakan game tidak diperbolehkan" -#: src/localplayer.cpp:2234 -#, fuzzy +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" -msgstr "Perombakan game diperbolehkan" +msgstr "" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Ikuti:" -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Batal mengikuti" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "Tirukan:" -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Batal menirukan" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "" -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4436,7 +4445,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "" @@ -4452,15 +4461,19 @@ msgstr "" msgid "Incorrect slot." msgstr "" -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "" -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "" @@ -4505,16 +4518,16 @@ msgstr "" msgid "All whispers unignore failed." msgstr "" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "" @@ -4604,11 +4617,11 @@ msgstr "" msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4737,54 +4750,54 @@ msgstr "" msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Versi yang digunakan sudah kadaluarsa." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, 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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Server kepenuhan." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Username dihapus permanen." @@ -5124,7 +5137,7 @@ msgstr "" msgid "Trade completed." msgstr "" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "" @@ -5133,7 +5146,7 @@ msgstr "" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "" @@ -5142,7 +5155,7 @@ msgstr "" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "" @@ -5151,7 +5164,7 @@ msgstr "" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "" @@ -5160,7 +5173,7 @@ msgstr "" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "" @@ -5492,50 +5505,50 @@ msgstr "" msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "" @@ -5556,134 +5569,47 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Serangan %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Pertahanan %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(l)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" @@ -4,16 +4,16 @@ # # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. -# <guglielmo__@hotmail.it>, 2011. +# <guglielmo__@hotmail.it>, 2011, 2012. # <reidyaro@gmail.com>, 2011. # WildX <guglielmo__@hotmail.it>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-12 00:23+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,135 +21,135 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1171 +#: src/actorspritemanager.cpp:1169 msgid "Visible on map" msgstr "" -#: src/being.cpp:551 +#: src/being.cpp:553 msgid "dodge" msgstr "Schivato" -#: src/being.cpp:551 +#: src/being.cpp:553 msgid "miss" msgstr "Mancato" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1530 +#: src/being.cpp:1534 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1535 +#: src/being.cpp:1539 msgid "I" msgstr "" -#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Impostazioni" -#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:881 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Video" -#: src/client.cpp:886 +#: src/client.cpp:964 msgid "Themes" msgstr "" -#: src/client.cpp:968 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Connessione al server" -#: src/client.cpp:999 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Accesso all'account" -#: src/client.cpp:1032 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Accesso al gioco" -#: src/client.cpp:1132 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Caricamento personaggi" -#: src/client.cpp:1163 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Connessione al server del gioco" -#: src/client.cpp:1173 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Cambiamento server del gioco" -#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154 -#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Errore" -#: src/client.cpp:1232 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Richiesta dettagli di registrazione" -#: src/client.cpp:1258 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Cambia password" -#: src/client.cpp:1259 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Password modificata con successo!" -#: src/client.cpp:1278 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Cambia Email" -#: src/client.cpp:1279 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Email cambiata con successo!" -#: src/client.cpp:1299 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Annullamento registrazione effettuato con successo" -#: src/client.cpp:1300 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Addio, torna quando vuoi..." -#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544 -#: src/client.cpp:1969 src/client.cpp:1976 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s non esiste e non può essere creato! Uscita in corso." -#: src/client.cpp:1675 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Invalido aggiornamento host: %s" -#: src/client.cpp:1709 src/client.cpp:1715 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Errore durante la creazione della directory degli aggiornamenti" -#: src/client.cpp:1736 +#: src/client.cpp:1831 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso." -#: src/commandhandler.cpp:209 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Comando sconosciuto." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Impossibile inviare un sussurro vuoto!" -#: src/commandhandler.cpp:343 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is" @@ -158,207 +158,207 @@ msgstr "" "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già , oppure " "sei tu." -#: src/commandhandler.cpp:363 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Richiesta per accedere al canale %s." -#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Manca il nome del party." -#: src/commandhandler.cpp:390 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Manca il nome della gilda." -#: src/commandhandler.cpp:403 src/commandhandler.cpp:521 -#: src/commandhandler.cpp:562 src/commandhandler.cpp:602 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Prego specificare un nome." -#: src/commandhandler.cpp:455 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Attiva/disattiva la chat." -#: src/commandhandler.cpp:455 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "I messaggi chiudono la conversazione." -#: src/commandhandler.cpp:466 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Attiva/disattiva la chat adesso." -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "I messaggi adesso chiudono la chat." -#: src/commandhandler.cpp:500 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "Amico" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "Disprezzato" -#: src/commandhandler.cpp:510 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "Neutrale" -#: src/commandhandler.cpp:529 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Il giocatore è già %s!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Il giocatore è stato %s con successo!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Il giocatore non può essere %s!" -#: src/commandhandler.cpp:574 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Il giocatore non era ignorato!" -#: src/commandhandler.cpp:581 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Giocatore non più ignorato!" -#: src/commandhandler.cpp:583 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Impossibile annullare l'ignoro!" -#: src/commandhandler.cpp:589 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:594 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:609 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Il giocatore è già cancellato!" -#: src/commandhandler.cpp:620 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Giocatore cancellato dal tuo schermo con successo!" -#: src/commandhandler.cpp:622 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Il giocatore non può essere cancellato!" -#: src/commandhandler.cpp:929 src/commandhandler.cpp:975 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:939 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:948 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:956 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:964 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:972 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1051 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1063 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1067 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1069 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "" -#: src/commandhandler.h:40 +#: src/commandhandler.h:34 #, c-format msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" " "(falso), \"1\", \"0\"." -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Generale" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Debug" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Screenshot salvato come" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Salvataggio immagine fallito!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "La connessione al server è caduta." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Errore di rete" -#: src/game.cpp:1332 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno ignorate" -#: src/game.cpp:1342 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno accettate" -#: src/game.cpp:1750 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Impossibile caricare la mappa." -#: src/game.cpp:1751 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Errore durante il caricamento di %s" @@ -391,20 +391,20 @@ msgstr "Bot Checker" msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 +#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Attacco" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Parla" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264 -#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459 -#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789 +#: 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 msgid "Move" msgstr "Movimento" @@ -412,13 +412,13 @@ msgstr "Movimento" msgid "Result" msgstr "Risultato" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Reimposta" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276 -#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 +#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750 msgid "Buy" msgstr "Compra" @@ -435,16 +435,16 @@ msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -456,8 +456,8 @@ msgid "Quit" msgstr "Esci" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Massimo" @@ -466,29 +466,29 @@ msgstr "Massimo" msgid "Shop" msgstr "Negozio" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281 +#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" msgstr "Vendi" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 -#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 +#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344 -#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500 -#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550 -#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581 -#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829 -#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803 -#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978 -#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Annulla" @@ -520,7 +520,7 @@ msgid "The email address entries mismatch." msgstr "Gli indirizzi email immessi non coincidono." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Cambia la Password" @@ -551,68 +551,68 @@ msgstr "La nuova password deve essere più corta di %d caratteri." msgid "The new password entries mismatch." msgstr "Le password immesse non coincidono." -#: src/gui/charcreatedialog.cpp:58 +#: src/gui/charcreatedialog.cpp:59 msgid "Create Character" msgstr "Crea Personaggio" -#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94 +#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94 #: src/gui/register.cpp:75 msgid "Name:" msgstr "Nome:" #. TRANSLATORS: This is a narrow symbol used to denote 'next'. #. You may change this symbol if your language uses another. -#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84 -#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85 +#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93 +#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85 msgid ">" msgstr ">" #. TRANSLATORS: This is a narrow symbol used to denote 'previous'. #. You may change this symbol if your language uses another. -#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85 -#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84 +#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94 +#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84 msgid "<" msgstr "<" -#: src/gui/charcreatedialog.cpp:83 +#: src/gui/charcreatedialog.cpp:92 msgid "Hair color:" msgstr "Colore dei capelli:" -#: src/gui/charcreatedialog.cpp:86 +#: src/gui/charcreatedialog.cpp:95 msgid "Hair style:" msgstr "Taglio di capelli:" -#: src/gui/charcreatedialog.cpp:92 +#: src/gui/charcreatedialog.cpp:101 msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Crea" -#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98 +#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98 msgid "Male" msgstr "Maschio" -#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99 +#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99 msgid "Female" msgstr "Femmina" -#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303 +#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312 #, c-format msgid "Please distribute %d points" msgstr "Distribuire %d punti" -#: src/gui/charcreatedialog.cpp:222 +#: src/gui/charcreatedialog.cpp:231 msgid "Your name needs to be at least 4 characters." msgstr "Il tuo nome deve contenere almeno 4 caratteri." -#: src/gui/charcreatedialog.cpp:294 +#: src/gui/charcreatedialog.cpp:303 msgid "Character stats OK" msgstr "Statistiche personaggio OK" -#: src/gui/charcreatedialog.cpp:308 +#: src/gui/charcreatedialog.cpp:317 #, c-format msgid "Please remove %d points" msgstr "Rimuovere %d punti" @@ -629,126 +629,126 @@ msgstr "Sei sicuro di voler cancellare questo personaggio?" msgid "Account and Character Management" msgstr "Gestione dell'account e del personaggio" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Cambia login" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Cancella registrazione" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Cambia email" -#: src/gui/charselectdialog.cpp:253 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "" -#: src/gui/charselectdialog.cpp:286 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "" -#: src/gui/charselectdialog.cpp:286 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Elimina" -#: src/gui/charselectdialog.cpp:468 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Scegli" -#: src/gui/charselectdialog.cpp:471 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Livello %d" -#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(vuoto)" -#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 +#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "Predefinito" -#: src/gui/chatwindow.cpp:113 +#: src/gui/chatwindow.cpp:117 msgid "black" msgstr "Nero" -#: src/gui/chatwindow.cpp:114 +#: src/gui/chatwindow.cpp:118 msgid "red" msgstr "Rosso" -#: src/gui/chatwindow.cpp:115 +#: src/gui/chatwindow.cpp:119 msgid "green" msgstr "Verde" -#: src/gui/chatwindow.cpp:116 +#: src/gui/chatwindow.cpp:120 msgid "blue" msgstr "Blu" -#: src/gui/chatwindow.cpp:117 +#: src/gui/chatwindow.cpp:121 msgid "gold" msgstr "Oro" -#: src/gui/chatwindow.cpp:118 +#: src/gui/chatwindow.cpp:122 msgid "yellow" msgstr "Giallo" -#: src/gui/chatwindow.cpp:119 +#: src/gui/chatwindow.cpp:123 msgid "pink" msgstr "Rosa" -#: src/gui/chatwindow.cpp:120 +#: src/gui/chatwindow.cpp:124 msgid "purple" msgstr "Viola" -#: src/gui/chatwindow.cpp:121 +#: src/gui/chatwindow.cpp:125 msgid "grey" msgstr "Grigio" -#: src/gui/chatwindow.cpp:122 +#: src/gui/chatwindow.cpp:126 msgid "brown" msgstr "Marrone" -#: src/gui/chatwindow.cpp:123 +#: src/gui/chatwindow.cpp:127 msgid "rainbow 1" msgstr "Arcobaleno 1" -#: src/gui/chatwindow.cpp:124 +#: src/gui/chatwindow.cpp:128 msgid "rainbow 2" msgstr "Arcobaleno 2" -#: src/gui/chatwindow.cpp:125 +#: src/gui/chatwindow.cpp:129 msgid "rainbow 3" msgstr "Arcobaleno 3" -#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 +#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" -#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48 +#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48 msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:615 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Presente: %s; %d giocatori sono presenti." -#: src/gui/chatwindow.cpp:1002 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Sussurra a %s: %s" @@ -761,13 +761,13 @@ msgstr "Sì" msgid "No" msgstr "No" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391 -#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408 -#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648 -#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665 -#: src/gui/popupmenu.cpp:679 +#: 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 msgid "Ignore" msgstr "Ignora" @@ -912,8 +912,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 +#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Chiudi" @@ -934,14 +934,14 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74 +#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74 msgid "Equipment" msgstr "Equipaggiamento" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 +#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829 -#: src/gui/popupmenu.cpp:1874 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Togli" @@ -983,31 +983,31 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739 -#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Equipaggia" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743 -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835 -#: src/gui/popupmenu.cpp:1880 +#: 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 msgid "Use" msgstr "Usa" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840 -#: src/gui/popupmenu.cpp:1885 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Lascia..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757 -#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Dividi" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:588 msgid "Outfits" msgstr "Attrezzatura" @@ -1016,17 +1016,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852 -#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Magazzino" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Recupera" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753 -#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Lascia" @@ -1211,23 +1211,23 @@ msgstr "Cambia server" #: src/gui/ministatuswindow.cpp:59 msgid "health bar" -msgstr "" +msgstr "Barra HP" #: src/gui/ministatuswindow.cpp:65 msgid "mana bar" -msgstr "" +msgstr "Barra Mana" #: src/gui/ministatuswindow.cpp:77 msgid "experience bar" -msgstr "" +msgstr "Barra dell'esperienza" #: src/gui/ministatuswindow.cpp:83 msgid "job bar" -msgstr "" +msgstr "Barra dei punti lavoro" #: src/gui/ministatuswindow.cpp:92 msgid "weight bar" -msgstr "" +msgstr "Barra del peso" #: src/gui/ministatuswindow.cpp:95 msgid "inventory slots bar" @@ -1235,7 +1235,7 @@ msgstr "" #: src/gui/ministatuswindow.cpp:98 msgid "money bar" -msgstr "" +msgstr "Barra dei soldi" #: src/gui/ministatuswindow.cpp:101 msgid "arrows bar" @@ -1243,37 +1243,33 @@ msgstr "" #: src/gui/ministatuswindow.cpp:104 msgid "status bar" -msgstr "" +msgstr "Barra dello stato" #: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336 msgid "Need" msgstr "Bisogno" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "In attesa del server" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Prossimo" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Invia" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Cancella" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "A:" @@ -1292,6 +1288,7 @@ msgid "Outfit: %d" msgstr "Outfit: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Chiave: %s" @@ -1304,347 +1301,355 @@ msgstr "Rimuovi prima" msgid "Away outfit" msgstr "Away outfit" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Commercia" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640 +#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:682 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390 -#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407 -#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434 -#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655 -#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155 -#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392 -#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657 -#: src/gui/popupmenu.cpp:680 +#: 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:148 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658 -#: src/gui/popupmenu.cpp:666 +#: 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 msgid "Set as enemy" msgstr "" -#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184 -#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416 -#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429 -#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659 -#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673 -#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686 +#: 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 msgid "Erase" msgstr "" -#: 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:406 -#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420 -#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433 -#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685 -#: src/gui/popupmenu.cpp:690 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435 -#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692 -#: src/playerrelations.cpp:446 +#: 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/playerrelations.cpp:465 msgid "Completely ignore" -msgstr "" +msgstr "Ignora completamente." -#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443 -#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465 +#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444 -#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780 +#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 +#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733 +#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455 -#: src/gui/popupmenu.cpp:738 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 +#: src/gui/popupmenu.cpp:774 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240 -#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755 +#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 +#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 -#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760 +#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 +#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485 -#: src/gui/popupmenu.cpp:769 +#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:805 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:261 +#: src/gui/popupmenu.cpp:265 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:263 +#: src/gui/popupmenu.cpp:267 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703 -#: src/gui/popupmenu.cpp:792 +#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:828 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704 -#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047 +#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297 -#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:794 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493 -#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799 +#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 +#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494 -#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800 +#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 +#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:312 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:319 +#: src/gui/popupmenu.cpp:323 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:324 +#: src/gui/popupmenu.cpp:328 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:326 +#: src/gui/popupmenu.cpp:330 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:328 +#: src/gui/popupmenu.cpp:332 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497 +#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:522 +#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 +msgid "Players" +msgstr "Giocatori" + +#: src/gui/popupmenu.cpp:546 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773 -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Aggiungi alla chat" -#: src/gui/popupmenu.cpp:540 +#: src/gui/popupmenu.cpp:566 msgid "Map Item" msgstr "Oggetto mappa" -#: src/gui/popupmenu.cpp:541 +#: src/gui/popupmenu.cpp:567 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008 -#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:547 +#: src/gui/popupmenu.cpp:573 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:560 -msgid "Load old outfits" +#: src/gui/popupmenu.cpp:589 +msgid "Clear outfit" msgstr "" -#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Spells" -#: src/gui/popupmenu.cpp:577 +#: src/gui/popupmenu.cpp:609 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:578 +#: src/gui/popupmenu.cpp:610 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:602 +#: src/gui/popupmenu.cpp:636 msgid "Disable highlight" msgstr "Disabilita highlight" -#: src/gui/popupmenu.cpp:604 +#: src/gui/popupmenu.cpp:638 msgid "Enable highlight" msgstr "Abilita highlight" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:640 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:608 +#: src/gui/popupmenu.cpp:642 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:610 +#: src/gui/popupmenu.cpp:644 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:612 +#: src/gui/popupmenu.cpp:646 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" +msgstr "Lascia" + +#: src/gui/popupmenu.cpp:654 +msgid "Copy to clipboard" msgstr "" -#: src/gui/popupmenu.cpp:813 +#: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "Cambia posizione nella gilda" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Rinomina mappa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Nome:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1338 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1340 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1711 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" -msgstr "" +msgstr "Aggiungi allo scambio" -#: src/gui/popupmenu.cpp:1715 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1716 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1717 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Salva 10" -#: src/gui/popupmenu.cpp:1728 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Salva metà " -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Salva tutto" -#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841 -#: src/gui/popupmenu.cpp:1886 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1768 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Ritira 10" -#: src/gui/popupmenu.cpp:1769 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Ritira metà " -#: src/gui/popupmenu.cpp:1770 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Ritira tutto" -#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Carica vecchie scorciatoie oggetti" -#: src/gui/popupmenu.cpp:1902 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Carica vecchie scorciatoie drop" -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" -msgstr "" +msgstr "Nascondi" -#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" -msgstr "" +msgstr "Mostra" -#: src/gui/popupmenu.cpp:1975 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "" @@ -1741,11 +1746,11 @@ msgstr "Preparazione download" msgid "Error retreiving server list!" msgstr "Errore nel ricevimento della lista sei server!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "Richiede una versione più nuova" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "Richiede v%s" @@ -2033,11 +2038,11 @@ msgstr "Mostra la barra hp dei nemici, punti vita" #: src/gui/setup_other.cpp:60 msgid "Cycle monster targets" -msgstr "" +msgstr "Ciclo di target sui nemici" #: src/gui/setup_other.cpp:66 msgid "Show warps particles" -msgstr "" +msgstr "Mostra le particelle per le transizioni di mappa" #: src/gui/setup_other.cpp:69 msgid "Highlight map portals" @@ -2109,11 +2114,11 @@ msgstr "Abilita statistiche veloci" #: src/gui/setup_other.cpp:120 msgid "Cycle player targets" -msgstr "" +msgstr "Ciclo di target sui giocatori" #: src/gui/setup_other.cpp:123 msgid "Show job exp messages" -msgstr "" +msgstr "Mostra messaggi riguardo all'esperienza - punti lavoro" #: src/gui/setup_other.cpp:126 msgid "Show players popups" @@ -2235,10 +2240,6 @@ msgstr "" msgid "Disable beings caching (Software)" msgstr "" -#: src/gui/setup_players.cpp:48 -msgid "Players" -msgstr "Giocatori" - #: src/gui/setup_players.cpp:54 msgid "Show gender" msgstr "Mostra il sesso" @@ -2388,74 +2389,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Tema" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Tema Gui" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Font principale" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Font in grassetto" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Font con particelle" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Help font" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Dimensione caratteri" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Tema cambiato" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Per applicare le modifiche, è necessario riavviare il client." @@ -2605,15 +2610,17 @@ msgstr "Nuova risoluzione: " #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623 msgid "Screen Resolution Changed" -msgstr "" +msgstr "RIsoluzione schermo cambiata" #: src/gui/setup_video.cpp:621 msgid "Some windows may be moved to fit the lowered resolution." msgstr "" +"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione " +"ridotta" #: src/gui/setup_video.cpp:654 msgid "Particle Effect Settings Changed." -msgstr "" +msgstr "Impostazioni effetti particelle cambiate." #: src/gui/setup_video.cpp:655 msgid "Changes will take effect on map change." @@ -2621,15 +2628,15 @@ msgstr "I cambi saranno effettuati al cambio della mappa." #: src/gui/shopwindow.cpp:75 msgid "Personal Shop" -msgstr "" +msgstr "Negozio personale" #: src/gui/shopwindow.cpp:118 msgid "Buy items" -msgstr "" +msgstr "Compra oggetti" #: src/gui/shopwindow.cpp:119 msgid "Sell items" -msgstr "" +msgstr "Vendi oggetti" #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124 #: src/gui/tradewindow.cpp:89 @@ -2638,11 +2645,11 @@ msgstr "Aggiungi" #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126 msgid "Announce" -msgstr "" +msgstr "Annuncia" #: src/gui/shopwindow.cpp:127 msgid "Show links in announce" -msgstr "" +msgstr "Mostra link nell'annuncio" #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149 msgid "Auction" @@ -2656,7 +2663,7 @@ msgstr "Richiesta di commercio" #: src/gui/shopwindow.cpp:749 #, c-format msgid "%s wants to %s %s do you accept?" -msgstr "" +msgstr "%s vuole %s %s accetti?" #: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81 msgid "Skills" @@ -2669,486 +2676,232 @@ msgstr "Su" #: src/gui/skilldialog.cpp:341 #, c-format msgid "Skill points available: %d" -msgstr "" +msgstr "Punti abilità disponibili: %d" #: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" -msgstr "" +msgstr "Abilità impostata %d" #: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" -msgstr "" +msgstr "Abilità %d" #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" -msgstr "" +msgstr "Lvl: %d" #: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" -msgstr "" +msgstr "Lvl: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gilda" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." -msgstr "" +msgstr "Invitato utente %s alla gilda %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." -msgstr "" +msgstr "Abbandono gilda %s richiesto." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" -msgstr "" +msgstr "invita qualcuno nel gruppo" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" -msgstr "" +msgstr "Chi vorresti invitare alla gilda %s?" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" -msgstr "" +msgstr "Lasciare la gilda?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" -msgstr "" +msgstr "Sei sicuro di voler lasciare la gilda %s?" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Party" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." -msgstr "" +msgstr "Invitato utente al gruppo %s" -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." -msgstr "" +msgstr "Abbandono gruppo %s richiesto" -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" -msgstr "" +msgstr "Invita qualcuno nel gruppo" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" -msgstr "" +msgstr "Chi vorresti invitare al gruppo %s?" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" -msgstr "" +msgstr "Lasciare il gruppo?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" -msgstr "" +msgstr "Sei sicuro di voler lasciare il gruppo %s?" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" -msgstr "" +msgstr "Nav" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Crea una Gilda" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" -msgstr "" +msgstr "Crea gruppo" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" -msgstr "" +msgstr "Sociale" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" +msgstr "Invita" + +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" msgstr "" -#: src/gui/socialwindow.cpp:1286 +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." -msgstr "" +msgstr "Accettato invito al gruppo da parte di %s" -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." -msgstr "" +msgstr "Rifiutato invito al gruppo da parte di %s" -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." -msgstr "" +msgstr "Accettato invito alla gilda da parte di %s" -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." -msgstr "" +msgstr "Rifiutato invito alla gilda da parte di %s" -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." -msgstr "" +msgstr "Stai creando una gilda chiamata %s" -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." -msgstr "" +msgstr "Stai creando un party chiamato %s" -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" -msgstr "" +msgstr "Nome della gilda" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." -msgstr "" +msgstr "Scegli un nome per la tua gilda" -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." -msgstr "" +msgstr "Ricevuto invito ad una gilda, ma ne hai già una." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." -msgstr "" +msgstr "%s ti ha invitato ad entrare nella gilda %s" -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" -msgstr "" +msgstr "Accetta invito alla gilda" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Ricevuta richiesta di party, ma ne esiste già una." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." -msgstr "" +msgstr "Sei stato invitato ad entrare in un party" -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." -msgstr "" +msgstr "Sei stato invitato ad entrare nel gruppo %s" -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s ti ha invitato ad unirti al suo party." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s ti ha invitato ad unirti al party %s." -#: src/gui/socialwindow.cpp:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Accetta invito nel party" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 msgid "Cannot create party. You are already in a party" -msgstr "" +msgstr "Impossibile creare un party, sei già in un party" -#: src/gui/socialwindow.cpp:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" -msgstr "" +msgstr "Nome del gruppo" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." -msgstr "" +msgstr "Scegli un nome per il tuo party" #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88 msgid "Specials" -msgstr "" - -#: src/gui/statuspopup.cpp:204 -msgid "(D) default moves" -msgstr "" - -#: src/gui/statuspopup.cpp:209 -msgid "(I) invert moves" -msgstr "" - -#: src/gui/statuspopup.cpp:214 -msgid "(c) moves with some crazy moves" -msgstr "" - -#: src/gui/statuspopup.cpp:219 -msgid "(C) moves with crazy moves" -msgstr "" - -#: src/gui/statuspopup.cpp:224 -msgid "(d) double normal + crazy" -msgstr "" - -#: src/gui/statuspopup.cpp:229 -msgid "(?) move" -msgstr "" - -#: src/gui/statuspopup.cpp:247 -msgid "(a) custom crazy move" -msgstr "" - -#: src/gui/statuspopup.cpp:251 -msgid "(?) crazy move" -msgstr "" - -#: src/gui/statuspopup.cpp:261 -msgid "(0) default moves to target" -msgstr "" - -#: src/gui/statuspopup.cpp:266 -msgid "(1) moves to target in distance 1" -msgstr "" - -#: src/gui/statuspopup.cpp:271 -msgid "(2) moves to target in distance 2" -msgstr "" - -#: src/gui/statuspopup.cpp:276 -msgid "(3) moves to target in distance 3" -msgstr "" - -#: src/gui/statuspopup.cpp:281 -msgid "(5) moves to target in distance 5" -msgstr "" - -#: src/gui/statuspopup.cpp:286 -msgid "(7) moves to target in distance 7" -msgstr "" - -#: src/gui/statuspopup.cpp:291 -msgid "(A) moves to target in attack range" -msgstr "" - -#: src/gui/statuspopup.cpp:296 -msgid "(a) archer attack range" -msgstr "" - -#: src/gui/statuspopup.cpp:301 -msgid "(?) move to target" -msgstr "" - -#: src/gui/statuspopup.cpp:309 -msgid "(D) default follow" -msgstr "" - -#: src/gui/statuspopup.cpp:313 -msgid "(R) relative follow" -msgstr "" - -#: src/gui/statuspopup.cpp:317 -msgid "(M) mirror follow" -msgstr "" - -#: src/gui/statuspopup.cpp:321 -msgid "(P) pet follow" -msgstr "" - -#: src/gui/statuspopup.cpp:325 -msgid "(?) unknown follow" -msgstr "" - -#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357 -msgid "(D) default attack" -msgstr "" - -#: src/gui/statuspopup.cpp:339 -msgid "(s) switch attack without shield" -msgstr "" - -#: src/gui/statuspopup.cpp:344 -msgid "(S) switch attack with shield" -msgstr "" - -#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373 -msgid "(?) attack" -msgstr "" - -#: src/gui/statuspopup.cpp:361 -msgid "(G) go and attack" -msgstr "" - -#: src/gui/statuspopup.cpp:365 -msgid "(A) go, attack, pickup" -msgstr "" - -#: src/gui/statuspopup.cpp:369 -msgid "(d) without auto attack" -msgstr "" - -#: src/gui/statuspopup.cpp:387 -msgid "(S) small pick up 1x1 cells" -msgstr "" - -#: src/gui/statuspopup.cpp:391 -msgid "(D) default pick up 2x1 cells" -msgstr "" - -#: src/gui/statuspopup.cpp:395 -msgid "(F) forward pick up 2x3 cells" -msgstr "" - -#: src/gui/statuspopup.cpp:399 -msgid "(3) pick up 3x3 cells" -msgstr "" - -#: src/gui/statuspopup.cpp:403 -msgid "(g) go and pick up in distance 4" -msgstr "" - -#: src/gui/statuspopup.cpp:407 -msgid "(G) go and pick up in distance 8" -msgstr "" - -#: src/gui/statuspopup.cpp:411 -msgid "(A) go and pick up in max distance" -msgstr "" - -#: src/gui/statuspopup.cpp:415 -msgid "(?) pick up" -msgstr "" - -#: src/gui/statuspopup.cpp:424 -msgid "(N) normal map view" -msgstr "" - -#: src/gui/statuspopup.cpp:428 -msgid "(D) debug map view" -msgstr "" - -#: src/gui/statuspopup.cpp:432 -msgid "(u) ultra map view" -msgstr "" - -#: src/gui/statuspopup.cpp:436 -msgid "(U) ultra map view 2" -msgstr "" - -#: src/gui/statuspopup.cpp:440 -msgid "(e) empty map view" -msgstr "" - -#: src/gui/statuspopup.cpp:444 -msgid "(b) black & white map view" -msgstr "" - -#: src/gui/statuspopup.cpp:448 -msgid "(?) map view" -msgstr "" - -#: src/gui/statuspopup.cpp:456 -msgid "(f) use #flar for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:461 -msgid "(c) use #chiza for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:466 -msgid "(I) use #ingrav for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:471 -msgid "(F) use #frillyar for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:476 -msgid "(U) use #upmarmu for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:480 -msgid "(?) magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:489 -msgid "(a) attack all players" -msgstr "" - -#: src/gui/statuspopup.cpp:493 -msgid "(f) attack not friends" -msgstr "" - -#: src/gui/statuspopup.cpp:497 -msgid "(b) attack bad relations" -msgstr "" - -#: src/gui/statuspopup.cpp:501 -msgid "(d) dont attack players" -msgstr "" - -#: src/gui/statuspopup.cpp:505 -msgid "(?) pvp attack" -msgstr "" - -#: src/gui/statuspopup.cpp:514 -msgid "(D) default imitation" -msgstr "" - -#: src/gui/statuspopup.cpp:518 -msgid "(O) outfits imitation" -msgstr "" - -#: src/gui/statuspopup.cpp:522 -msgid "(?) imitation" -msgstr "" - -#: src/gui/statuspopup.cpp:531 -msgid "(O) on keyboard" -msgstr "" - -#: src/gui/statuspopup.cpp:534 -msgid "(A) away" -msgstr "" - -#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557 -msgid "(?) away" -msgstr "" - -#: src/gui/statuspopup.cpp:545 -msgid "(G) game camera mode" -msgstr "" - -#: src/gui/statuspopup.cpp:549 -msgid "(F) free camera mode" -msgstr "" - -#: src/gui/statuspopup.cpp:553 -msgid "(D) design camera mode" -msgstr "" - -#: src/gui/statuspopup.cpp:564 -msgid "Game modifiers are disabled" -msgstr "" - -#: src/gui/statuspopup.cpp:569 -msgid "Game modifiers are enabled" -msgstr "" +msgstr "Speciali" #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 #: src/gui/statuswindow.cpp:337 @@ -3191,198 +2944,68 @@ msgstr "" #: src/gui/statuswindow.cpp:269 #, c-format msgid "Level: %d (GM %d)" -msgstr "" +msgstr "Livello: %d (GM:%d)" #: src/gui/statuswindow.cpp:325 #, c-format msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717 -#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753 -#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847 -#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889 -msgid "(D)" -msgstr "" - -#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778 -msgid "(I)" -msgstr "" - -#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775 -msgid "(c)" -msgstr "" - -#: src/gui/statuswindow.cpp:658 -msgid "(C)" -msgstr "" - -#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762 -#: src/gui/statuswindow.cpp:803 -msgid "(d)" -msgstr "" - -#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678 -#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729 -#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765 -#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806 -#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862 -#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892 -#: src/gui/statuswindow.cpp:905 -msgid "(?)" -msgstr "" - -#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707 -#: src/gui/statuswindow.cpp:794 -msgid "(a)" -msgstr "" - -#: src/gui/statuswindow.cpp:686 -msgid "(0)" -msgstr "" - -#: src/gui/statuswindow.cpp:689 -msgid "(1)" -msgstr "" - -#: src/gui/statuswindow.cpp:692 -msgid "(2)" -msgstr "" - -#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824 -msgid "(3)" -msgstr "" - -#: src/gui/statuswindow.cpp:698 -msgid "(5)" -msgstr "" - -#: src/gui/statuswindow.cpp:701 -msgid "(7)" -msgstr "" - -#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759 -#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902 -msgid "(A)" -msgstr "" - -#: src/gui/statuswindow.cpp:720 -msgid "(R)" -msgstr "" - -#: src/gui/statuswindow.cpp:723 -msgid "(M)" -msgstr "" - -#: src/gui/statuswindow.cpp:726 -msgid "(P)" -msgstr "" - -#: src/gui/statuswindow.cpp:740 -msgid "(s)" -msgstr "" - -#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815 -msgid "(S)" -msgstr "" - -#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830 -#: src/gui/statuswindow.cpp:883 -msgid "(G)" -msgstr "" - -#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797 -msgid "(f)" -msgstr "" - -#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821 -#: src/gui/statuswindow.cpp:886 -msgid "(F)" -msgstr "" - -#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853 -msgid "(U)" -msgstr "" - -#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859 -msgid "(b)" -msgstr "" - -#: src/gui/statuswindow.cpp:827 -msgid "(g)" -msgstr "" - -#: src/gui/statuswindow.cpp:844 -msgid "(N)" -msgstr "" - -#: src/gui/statuswindow.cpp:850 -msgid "(u)" -msgstr "" - -#: src/gui/statuswindow.cpp:856 -msgid "(e)" -msgstr "" - -#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899 -msgid "(O)" -msgstr "" - #: src/gui/textcommandeditor.cpp:113 msgid "No Target" -msgstr "" +msgstr "Nessun target" #: src/gui/textcommandeditor.cpp:114 msgid "Allow Target" -msgstr "" +msgstr "Permetti target" #: src/gui/textcommandeditor.cpp:115 msgid "Need Target" -msgstr "" +msgstr "Target richiesto" #: src/gui/textcommandeditor.cpp:120 msgid "General Magic" -msgstr "" +msgstr "Magia" #: src/gui/textcommandeditor.cpp:121 msgid "Life Magic" -msgstr "" +msgstr "Magia della vita" #: src/gui/textcommandeditor.cpp:122 msgid "War Magic" -msgstr "" +msgstr "Magia della guerra" #: src/gui/textcommandeditor.cpp:123 msgid "Transmute Magic" -msgstr "" +msgstr "Magia della transmutazione" #: src/gui/textcommandeditor.cpp:124 msgid "Nature Magic" -msgstr "" +msgstr "Magia della natura" #: src/gui/textcommandeditor.cpp:125 msgid "Astral Magic" -msgstr "" +msgstr "Magia astrale" #: src/gui/textcommandeditor.cpp:168 msgid "Command Editor" -msgstr "" +msgstr "Editor dei comandi" #: src/gui/textcommandeditor.cpp:185 msgid "magic" -msgstr "" +msgstr "magia" #: src/gui/textcommandeditor.cpp:189 msgid "other" -msgstr "" +msgstr "altro" #: src/gui/textcommandeditor.cpp:194 msgid "Symbol:" -msgstr "" +msgstr "Simbolo:" #: src/gui/textcommandeditor.cpp:197 msgid "Command:" -msgstr "" +msgstr "Comando:" #: src/gui/textcommandeditor.cpp:200 msgid "Comment:" @@ -3390,31 +3013,31 @@ msgstr "" #: src/gui/textcommandeditor.cpp:203 msgid "Mana:" -msgstr "" +msgstr "Mana:" #: src/gui/textcommandeditor.cpp:209 msgid "Target Type:" -msgstr "" +msgstr "Tipo di target:" #: src/gui/textcommandeditor.cpp:215 msgid "Icon:" -msgstr "" +msgstr "Icona:" #: src/gui/textcommandeditor.cpp:221 msgid "Magic level:" -msgstr "" +msgstr "Livello magico:" #: src/gui/textcommandeditor.cpp:227 msgid "Magic School:" -msgstr "" +msgstr "Scuola di magia:" #: src/gui/textcommandeditor.cpp:233 msgid "School level:" -msgstr "" +msgstr "Livello scuola:" #: src/gui/textcommandeditor.cpp:238 msgid "Save" -msgstr "" +msgstr "Salva" #: src/gui/tradewindow.cpp:60 msgid "Propose trade" @@ -3439,7 +3062,7 @@ msgstr "Commercia: Tu" #: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167 #, c-format msgid "You get %s" -msgstr "" +msgstr "Ottieni %s" #: src/gui/tradewindow.cpp:112 msgid "You give:" @@ -3465,33 +3088,33 @@ msgstr "" msgid "Name: %s" msgstr "Nome: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Aggiornamento..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Connessione..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Gioca" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 L'aggiornamento è stato completato." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 È fortemente raccomandato" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." -msgstr "" +msgstr "##1 riprova più tardi" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Completato" @@ -3501,19 +3124,19 @@ msgstr "Essere" #: src/gui/userpalette.cpp:117 msgid "Friend Names" -msgstr "" +msgstr "Nomi amici" #: src/gui/userpalette.cpp:118 msgid "Disregarded Names" -msgstr "" +msgstr "Nomi disprezzati" #: src/gui/userpalette.cpp:119 msgid "Ignored Names" -msgstr "" +msgstr "Nomi ignorati" #: src/gui/userpalette.cpp:120 msgid "Erased Names" -msgstr "" +msgstr "Nomi cancellati" #: src/gui/userpalette.cpp:121 msgid "Other Players' Names" @@ -3533,19 +3156,19 @@ msgstr "NPCs" #: src/gui/userpalette.cpp:126 msgid "Monster HP bar" -msgstr "" +msgstr "Barra HP dei nemici" #: src/gui/userpalette.cpp:128 msgid "Monster HP bar (second color)" -msgstr "" +msgstr "Barra HP dei nemici (secondo colore)" #: src/gui/userpalette.cpp:129 msgid "Party Members" -msgstr "" +msgstr "Membri del gruppo" #: src/gui/userpalette.cpp:130 msgid "Guild Members" -msgstr "" +msgstr "Membri della gilda" #: src/gui/userpalette.cpp:131 msgid "Particle Effects" @@ -3553,7 +3176,7 @@ msgstr "Effetti particelle" #: src/gui/userpalette.cpp:132 msgid "Pickup Notification" -msgstr "" +msgstr "Notifica oggetti raccolti" #: src/gui/userpalette.cpp:133 msgid "Exp Notification" @@ -3561,23 +3184,23 @@ msgstr "Notifica Esperienza" #: src/gui/userpalette.cpp:134 msgid "Player HP bar" -msgstr "" +msgstr "Barra HP del giocatore" #: src/gui/userpalette.cpp:136 msgid "Player HP bar (second color)" -msgstr "" +msgstr "Barra HP del giocatore (secondo colore)" #: src/gui/userpalette.cpp:137 msgid "Player Hits Monster" -msgstr "" +msgstr "Il giocatore colpisce il nemico" #: src/gui/userpalette.cpp:138 msgid "Monster Hits Player" -msgstr "" +msgstr "Il nemico colpisce il giocatore" #: src/gui/userpalette.cpp:140 msgid "Other Player Hits Local Player" -msgstr "" +msgstr "Altro giocatore colpisce giocatore vicino" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" @@ -3585,15 +3208,15 @@ msgstr "Colpo critico" #: src/gui/userpalette.cpp:143 msgid "Local Player Hits Monster" -msgstr "" +msgstr "Il giocatore colpisce il nemico" #: src/gui/userpalette.cpp:145 msgid "Local Player Critical Hit" -msgstr "" +msgstr "Il giocatore infligge un colpo critico" #: src/gui/userpalette.cpp:147 msgid "Local Player Miss" -msgstr "" +msgstr "Il giocatore manca il nemico" #: src/gui/userpalette.cpp:148 msgid "Misses" @@ -3601,7 +3224,7 @@ msgstr "Perde" #: src/gui/userpalette.cpp:149 msgid "Portal Highlight" -msgstr "" +msgstr "Evidenzia portali" #: src/gui/userpalette.cpp:151 msgid "Default collision Highlight" @@ -3621,15 +3244,15 @@ msgstr "" #: src/gui/userpalette.cpp:159 msgid "Local Player Attack Range" -msgstr "" +msgstr "Raggio d'attacco del giocatore" #: src/gui/userpalette.cpp:161 msgid "Local Player Attack Range Border" -msgstr "" +msgstr "Raggio d'attacco del nemico" #: src/gui/userpalette.cpp:163 msgid "Monster Attack Range" -msgstr "" +msgstr "Raggio d'attacco del nemico" #: src/gui/userpalette.cpp:165 msgid "Home Place" @@ -3643,29 +3266,29 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" -msgstr "" +msgstr "Chi è online - Aggiornamento in corso" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:113 msgid "Update" -msgstr "" +msgstr "Aggiornamento" -#: src/gui/whoisonline.cpp:302 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " -msgstr "" +msgstr "Chi è online - " -#: src/gui/whoisonline.cpp:493 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" -msgstr "" +msgstr "Chi è online - errore" -#: src/gui/whoisonline.cpp:525 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" -msgstr "" +msgstr "Chi è online - aggiornamento" #: src/gui/widgets/battletab.cpp:45 msgid "Battle" -msgstr "" +msgstr "Battaglia" #: src/gui/widgets/channeltab.cpp:52 msgid "/users > Lists the users in the current channel" @@ -3763,7 +3386,7 @@ msgstr "Annuncio generale da %s:" #: src/gui/widgets/chattab.cpp:184 #, c-format msgid "%s whispers: %s" -msgstr "" +msgstr "%s sussurra: %s " #: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67 #: src/net/ea/gui/partytab.cpp:83 @@ -3806,11 +3429,11 @@ msgstr "Modifica" #: src/gui/widgets/whispertab.cpp:107 msgid "/ignore > Ignore the other player" -msgstr "" +msgstr "/ignore > Ignora l'altro giocatore" #: src/gui/widgets/whispertab.cpp:108 msgid "/unignore > Stop ignoring the other player" -msgstr "" +msgstr "/unignore > Smetti di ignorare l'altro giocatore" #: src/gui/widgets/whispertab.cpp:109 msgid "/close > Close the whisper tab" @@ -3826,11 +3449,12 @@ msgstr "Questo comando chiude la scheda del sussurro attiva." #: src/gui/widgets/whispertab.cpp:124 msgid "Command: /ignore" -msgstr "" +msgstr "Comando: /ignore" #: src/gui/widgets/whispertab.cpp:125 msgid "This command ignores the other player regardless of current relations." msgstr "" +"Questo comando ignora l'altro giocatore, senza tenere conto delle relazioni" #: src/gui/widgets/whispertab.cpp:130 msgid "Command: /unignore <player>" @@ -3840,26 +3464,28 @@ msgstr "Comando: /unignore <giocatore>" msgid "" "This command stops ignoring the other player if they are being ignored." msgstr "" +"Questo comando smette di ignorare l'altro giocatore se è stato ignorato in " +"precedenza" #: src/gui/windowmenu.cpp:65 msgid "BC" -msgstr "" +msgstr "BC" #: src/gui/windowmenu.cpp:65 msgid "Bot checker" -msgstr "" +msgstr "Bot checker" #: src/gui/windowmenu.cpp:67 msgid "ONL" -msgstr "" +msgstr "ONL" #: src/gui/windowmenu.cpp:67 msgid "Who is online" -msgstr "" +msgstr "Chi è online" #: src/gui/windowmenu.cpp:69 msgid "KS" -msgstr "" +msgstr "KS" #: src/gui/windowmenu.cpp:71 msgid "Smilies" @@ -3867,7 +3493,7 @@ msgstr "" #: src/gui/windowmenu.cpp:73 msgid "STA" -msgstr "" +msgstr "STA" #: src/gui/windowmenu.cpp:73 msgid "Status" @@ -3875,39 +3501,39 @@ msgstr "Stato" #: src/gui/windowmenu.cpp:74 msgid "EQU" -msgstr "" +msgstr "EQU" #: src/gui/windowmenu.cpp:76 msgid "INV" -msgstr "" +msgstr "INV" #: src/gui/windowmenu.cpp:81 msgid "SKI" -msgstr "" +msgstr "SKI" #: src/gui/windowmenu.cpp:88 msgid "SPE" -msgstr "" +msgstr "SPE" #: src/gui/windowmenu.cpp:93 msgid "SOC" -msgstr "" +msgstr "SOC" #: src/gui/windowmenu.cpp:94 msgid "SH" -msgstr "" +msgstr "SH" #: src/gui/windowmenu.cpp:94 msgid "Shortcuts" -msgstr "" +msgstr "Shortcuts" #: src/gui/windowmenu.cpp:96 msgid "SP" -msgstr "" +msgstr "SP" #: src/gui/windowmenu.cpp:97 msgid "DR" -msgstr "" +msgstr "DR" #: src/gui/windowmenu.cpp:98 msgid "YK" @@ -3919,19 +3545,19 @@ msgstr "" #: src/gui/windowmenu.cpp:100 msgid "SET" -msgstr "" +msgstr "SET" #: src/gui/worldselectdialog.cpp:77 msgid "Select World" -msgstr "" +msgstr "Seleziona parola" #: src/gui/worldselectdialog.cpp:82 msgid "Change Login" -msgstr "" +msgstr "Cambia login" #: src/gui/worldselectdialog.cpp:83 msgid "Choose World" -msgstr "" +msgstr "Scegli parola" #: src/inventory.cpp:251 msgid "Storage" @@ -3967,7 +3593,7 @@ msgstr "Mirino e attacco" #: src/keyboardconfig.cpp:52 msgid "Move to Target" -msgstr "" +msgstr "Muovi all'obbiettivo" #: src/keyboardconfig.cpp:54 msgid "Change Move to Target type" @@ -3995,7 +3621,7 @@ msgstr "" #: src/keyboardconfig.cpp:66 msgid "Target Closest" -msgstr "" +msgstr "Seleziona il più vicino" #: src/keyboardconfig.cpp:68 msgid "Target NPC" @@ -4011,7 +3637,7 @@ msgstr "Raccogli" #: src/keyboardconfig.cpp:72 msgid "Change Pickup Type" -msgstr "" +msgstr "Cambia modo di raccogliere" #: src/keyboardconfig.cpp:74 msgid "Hide Windows" @@ -4031,7 +3657,7 @@ msgstr "Abilita/Disabilita Scambi" #: src/keyboardconfig.cpp:80 msgid "Change Map View Mode" -msgstr "" +msgstr "Cambia visualiz. mappa" #: src/keyboardconfig.cpp:82 msgid "Select OK" @@ -4341,11 +3967,11 @@ msgstr "" #: src/keyboardconfig.cpp:342 msgid "On / Off audio" -msgstr "" +msgstr "On / Off audio" #: src/keyboardconfig.cpp:344 msgid "Enable / Disable away mode" -msgstr "" +msgstr "Abilita / Disabilita modalità away" #: src/keyboardconfig.cpp:346 msgid "Emulate right click from keyboard" @@ -4365,161 +3991,433 @@ msgid "" "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " "strange behaviour." msgstr "" +"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare " +"inconvenienti" -#: src/localplayer.cpp:389 -msgid "You were killed by " +#: src/localplayer.cpp:384 +#, c-format +msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." -msgstr "" +msgstr "L'oggetto è troppo pesante" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "" #: src/localplayer.cpp:1448 msgid "Inventory is full." -msgstr "" +msgstr "L'inventario è pieno" -#: src/localplayer.cpp:1450 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1453 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1456 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1480 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Hai raccolto %d [@@%d|%s@@]." +msgstr[1] "Hai raccolto %d [@@%d|%s@@]." -#: src/localplayer.cpp:3206 +#: src/localplayer.cpp:1898 +msgid "(D) default moves" +msgstr "" + +#: src/localplayer.cpp:1899 +msgid "(I) invert moves" +msgstr "" + +#: src/localplayer.cpp:1900 +msgid "(c) moves with some crazy moves" +msgstr "" + +#: src/localplayer.cpp:1901 +msgid "(C) moves with crazy moves" +msgstr "" + +#: src/localplayer.cpp:1902 +msgid "(d) double normal + crazy" +msgstr "" + +#: src/localplayer.cpp:1903 +msgid "(?) unknown move" +msgstr "" + +#: src/localplayer.cpp:1925 +#, c-format +msgid "(%d) crazy move number %d" +msgstr "" + +#: src/localplayer.cpp:1930 +msgid "(a) custom crazy move" +msgstr "" + +#: src/localplayer.cpp:1934 +msgid "(?) crazy move" +msgstr "" + +#: src/localplayer.cpp:1948 +msgid "(0) default moves to target" +msgstr "" + +#: src/localplayer.cpp:1949 +msgid "(1) moves to target in distance 1" +msgstr "" + +#: src/localplayer.cpp:1950 +msgid "(2) moves to target in distance 2" +msgstr "" + +#: src/localplayer.cpp:1951 +msgid "(3) moves to target in distance 3" +msgstr "" + +#: src/localplayer.cpp:1952 +msgid "(5) moves to target in distance 5" +msgstr "" + +#: src/localplayer.cpp:1953 +msgid "(7) moves to target in distance 7" +msgstr "" + +#: src/localplayer.cpp:1954 +msgid "(A) moves to target in attack range" +msgstr "" + +#: src/localplayer.cpp:1955 +msgid "(a) archer attack range" +msgstr "" + +#: src/localplayer.cpp:1956 +msgid "(?) move to target" +msgstr "" + +#: src/localplayer.cpp:1975 +msgid "(D) default follow" +msgstr "" + +#: src/localplayer.cpp:1976 +msgid "(R) relative follow" +msgstr "" + +#: src/localplayer.cpp:1977 +msgid "(M) mirror follow" +msgstr "" + +#: src/localplayer.cpp:1978 +msgid "(P) pet follow" +msgstr "" + +#: src/localplayer.cpp:1979 +msgid "(?) unknown follow" +msgstr "" + +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 +msgid "(?) attack" +msgstr "" + +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 +msgid "(D) default attack" +msgstr "" + +#: src/localplayer.cpp:2000 +msgid "(s) switch attack without shield" +msgstr "" + +#: src/localplayer.cpp:2001 +msgid "(S) switch attack with shield" +msgstr "" + +#: src/localplayer.cpp:2022 +msgid "(G) go and attack" +msgstr "" + +#: src/localplayer.cpp:2023 +msgid "(A) go, attack, pickup" +msgstr "" + +#: src/localplayer.cpp:2024 +msgid "(d) without auto attack" +msgstr "" + +#: src/localplayer.cpp:2058 +msgid "(S) small pick up 1x1 cells" +msgstr "" + +#: src/localplayer.cpp:2059 +msgid "(D) default pick up 2x1 cells" +msgstr "" + +#: src/localplayer.cpp:2060 +msgid "(F) forward pick up 2x3 cells" +msgstr "" + +#: src/localplayer.cpp:2061 +msgid "(3) pick up 3x3 cells" +msgstr "" + +#: src/localplayer.cpp:2062 +msgid "(g) go and pick up in distance 4" +msgstr "" + +#: src/localplayer.cpp:2063 +msgid "(G) go and pick up in distance 8" +msgstr "" + +#: src/localplayer.cpp:2064 +msgid "(A) go and pick up in max distance" +msgstr "" + +#: src/localplayer.cpp:2065 +msgid "(?) pick up" +msgstr "" + +#: src/localplayer.cpp:2078 +msgid "(N) normal map view" +msgstr "" + +#: src/localplayer.cpp:2079 +msgid "(D) debug map view" +msgstr "" + +#: src/localplayer.cpp:2080 +msgid "(u) ultra map view" +msgstr "" + +#: src/localplayer.cpp:2081 +msgid "(U) ultra map view 2" +msgstr "" + +#: src/localplayer.cpp:2082 +msgid "(e) empty map view" +msgstr "" + +#: src/localplayer.cpp:2083 +msgid "(b) black & white map view" +msgstr "" + +#: src/localplayer.cpp:2102 +msgid "(f) use #flar for magic attack" +msgstr "" + +#: src/localplayer.cpp:2103 +msgid "(c) use #chiza for magic attack" +msgstr "" + +#: src/localplayer.cpp:2104 +msgid "(I) use #ingrav for magic attack" +msgstr "" + +#: src/localplayer.cpp:2105 +msgid "(F) use #frillyar for magic attack" +msgstr "" + +#: src/localplayer.cpp:2106 +msgid "(U) use #upmarmu for magic attack" +msgstr "" + +#: src/localplayer.cpp:2107 +msgid "(?) magic attack" +msgstr "" + +#: src/localplayer.cpp:2126 +msgid "(a) attack all players" +msgstr "" + +#: src/localplayer.cpp:2127 +msgid "(f) attack not friends" +msgstr "" + +#: src/localplayer.cpp:2128 +msgid "(b) attack bad relations" +msgstr "" + +#: src/localplayer.cpp:2129 +msgid "(d) dont attack players" +msgstr "" + +#: src/localplayer.cpp:2130 +msgid "(?) pvp attack" +msgstr "" + +#: src/localplayer.cpp:2149 +msgid "(D) default imitation" +msgstr "" + +#: src/localplayer.cpp:2150 +msgid "(O) outfits imitation" +msgstr "" + +#: src/localplayer.cpp:2151 +msgid "(?) imitation" +msgstr "" + +#: src/localplayer.cpp:2179 msgid "Away" +msgstr "Assente" + +#: src/localplayer.cpp:2198 +msgid "(O) on keyboard" msgstr "" -#: src/localplayer.cpp:3541 +#: src/localplayer.cpp:2199 +msgid "(A) away" +msgstr "" + +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 +msgid "(?) away" +msgstr "" + +#: src/localplayer.cpp:2213 +msgid "(G) game camera mode" +msgstr "" + +#: src/localplayer.cpp:2214 +msgid "(F) free camera mode" +msgstr "" + +#: src/localplayer.cpp:2239 +msgid "Game modifiers are enabled" +msgstr "" + +#: src/localplayer.cpp:2240 +msgid "Game modifiers are disabled" +msgstr "" + +#: src/localplayer.cpp:2241 +msgid "Game modifiers are unknown" +msgstr "" + +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3543 src/localplayer.cpp:3558 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3550 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3552 src/localplayer.cpp:3560 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3908 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "" -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Opzioni" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4535,71 +4433,75 @@ msgstr "Grazie per l'acquisto." msgid "Unable to buy." msgstr "Impossibile acquistare." -#: src/net/ea/charserverhandler.cpp:63 +#: src/net/ea/charserverhandler.cpp:66 msgid "Strength:" msgstr "" -#: src/net/ea/charserverhandler.cpp:64 +#: src/net/ea/charserverhandler.cpp:67 msgid "Agility:" msgstr "" -#: src/net/ea/charserverhandler.cpp:65 +#: src/net/ea/charserverhandler.cpp:68 msgid "Vitality:" msgstr "" -#: src/net/ea/charserverhandler.cpp:66 +#: src/net/ea/charserverhandler.cpp:69 msgid "Intelligence:" msgstr "" -#: src/net/ea/charserverhandler.cpp:67 +#: src/net/ea/charserverhandler.cpp:70 msgid "Dexterity:" msgstr "" -#: src/net/ea/charserverhandler.cpp:68 +#: src/net/ea/charserverhandler.cpp:71 msgid "Luck:" msgstr "" -#: src/net/ea/charserverhandler.cpp:102 +#: src/net/ea/charserverhandler.cpp:115 msgid "Access denied. Most likely, there are too many players on this server." msgstr "" -#: src/net/ea/charserverhandler.cpp:106 +#: src/net/ea/charserverhandler.cpp:119 msgid "Cannot use this ID." msgstr "" -#: src/net/ea/charserverhandler.cpp:109 +#: src/net/ea/charserverhandler.cpp:122 msgid "Unknown char-server failure." msgstr "" -#: src/net/ea/charserverhandler.cpp:138 +#: src/net/ea/charserverhandler.cpp:151 msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "" -#: src/net/ea/charserverhandler.cpp:145 +#: src/net/ea/charserverhandler.cpp:158 msgid "Incorrect stats." msgstr "" -#: src/net/ea/charserverhandler.cpp:148 +#: src/net/ea/charserverhandler.cpp:161 msgid "Incorrect hair." msgstr "" -#: src/net/ea/charserverhandler.cpp:151 +#: src/net/ea/charserverhandler.cpp:164 msgid "Incorrect slot." msgstr "" -#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Informazioni" -#: src/net/ea/charserverhandler.cpp:166 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "" -#: src/net/ea/charserverhandler.cpp:172 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "" @@ -4644,16 +4546,16 @@ msgstr "" msgid "All whispers unignore failed." msgstr "" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "" @@ -4743,11 +4645,11 @@ msgstr "" msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4824,15 +4726,15 @@ msgstr "" msgid "This command displays the party's current experience sharing policy." msgstr "" -#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284 +#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285 msgid "Item sharing enabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294 +#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295 msgid "Item sharing disabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304 +#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305 msgid "Item sharing not possible." msgstr "" @@ -4840,15 +4742,15 @@ msgstr "" msgid "Item sharing unknown." msgstr "" -#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246 +#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247 msgid "Experience sharing enabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256 +#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257 msgid "Experience sharing disabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266 +#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267 msgid "Experience sharing not possible." msgstr "" @@ -4870,60 +4772,60 @@ msgstr "" #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." -msgstr "" +msgstr "La vecchia password è sbagliata." #: src/net/ea/loginhandler.cpp:137 msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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 "" +msgstr "Errore sconosciuto." -#: src/net/ea/loginhandler.cpp:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, 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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "" @@ -4965,16 +4867,16 @@ msgstr "" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:357 +#: src/net/ea/partyhandler.cpp:358 msgid "You have left the party." msgstr "" -#: src/net/ea/partyhandler.cpp:370 +#: src/net/ea/partyhandler.cpp:371 #, c-format msgid "%s has left your party." msgstr "" -#: src/net/ea/partyhandler.cpp:447 +#: src/net/ea/partyhandler.cpp:448 #, c-format msgid "An unknown member tried to say: %s" msgstr "" @@ -4998,7 +4900,7 @@ msgstr "Le fredde mani della morte stanno afferrando la tua anima." #: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" -msgstr "" +msgstr "Game Over!" #: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." @@ -5026,7 +4928,7 @@ msgstr "Suppongo non sia andata troppo bene." #: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" -msgstr "" +msgstr "Vuoi che i tuoi beni siano identificati?" #: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." @@ -5044,6 +4946,8 @@ msgstr "" msgid "" "You screwed up again, dump your body down the tubes and get you another one." msgstr "" +"Hai combinato un altro disastro, getta il tuo corpo nelle fogne e prenditene" +" uno nuovo." #: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." @@ -5267,103 +5171,103 @@ msgstr "Scambio cancellato." msgid "Trade completed." msgstr "Scambio completato." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Forza" #: src/net/manaserv/attributes.cpp:167 #, c-format msgid "Strength %+.1f" -msgstr "" +msgstr "Forza %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Agilità " #: src/net/manaserv/attributes.cpp:180 #, c-format msgid "Agility %+.1f" -msgstr "" +msgstr "Agilità %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Destrezza" #: src/net/manaserv/attributes.cpp:193 #, c-format msgid "Dexterity %+.1f" -msgstr "" +msgstr "Destrezza %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Vitalità " #: src/net/manaserv/attributes.cpp:206 #, c-format msgid "Vitality %+.1f" -msgstr "" +msgstr "Vitalità %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Intelligenza" #: src/net/manaserv/attributes.cpp:219 #, c-format msgid "Intelligence %+.1f" -msgstr "" +msgstr "Intelligenza %+.1f" #: src/net/manaserv/attributes.cpp:225 msgid "Willpower" -msgstr "" +msgstr "Forza di volontà " #: src/net/manaserv/attributes.cpp:232 #, c-format msgid "Willpower %+.1f" -msgstr "" +msgstr "Forza di volontà %+.1f" #: src/net/manaserv/beinghandler.cpp:337 msgid "Press OK to respawn." -msgstr "" +msgstr "Premi OK per resuscitare." #: src/net/manaserv/beinghandler.cpp:338 msgid "You Died" -msgstr "" +msgstr "Sei morto" #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219 msgid "Not logged in." -msgstr "" +msgstr "Non registrato" #: src/net/manaserv/charhandler.cpp:148 msgid "No empty slot." -msgstr "" +msgstr "Nessuno spazio libero" #: src/net/manaserv/charhandler.cpp:151 msgid "Invalid name." -msgstr "" +msgstr "Nome non valido." #: src/net/manaserv/charhandler.cpp:154 msgid "Character's name already exists." -msgstr "" +msgstr "Il nome del personaggio esiste già ." #: src/net/manaserv/charhandler.cpp:157 msgid "Invalid hairstyle." -msgstr "" +msgstr "Pettinatura non valida." #: src/net/manaserv/charhandler.cpp:160 msgid "Invalid hair color." -msgstr "" +msgstr "Colore dei capelli non valido." #: src/net/manaserv/charhandler.cpp:163 msgid "Invalid gender." -msgstr "" +msgstr "Genere non valido." #: src/net/manaserv/charhandler.cpp:166 msgid "Character's stats are too high." -msgstr "" +msgstr "Le statistiche del personaggio sono troppo alte." #: src/net/manaserv/charhandler.cpp:169 msgid "Character's stats are too low." -msgstr "" +msgstr "Le statistiche del personaggio sono troppo basse." #: src/net/manaserv/charhandler.cpp:172 #, c-format @@ -5372,11 +5276,11 @@ msgstr "" #: src/net/manaserv/charhandler.cpp:178 msgid "Invalid slot number." -msgstr "" +msgstr "Numero dello slot non valido." #: src/net/manaserv/charhandler.cpp:210 msgid "Player deleted." -msgstr "" +msgstr "Personaggio cancellato." #: src/net/manaserv/charhandler.cpp:222 msgid "Selection out of range." @@ -5385,7 +5289,7 @@ msgstr "" #: src/net/manaserv/charhandler.cpp:225 #, c-format msgid "Unknown error (%d)." -msgstr "" +msgstr "Errore sconosciuto (%d)." #: src/net/manaserv/charhandler.cpp:261 msgid "No gameservers are available." @@ -5395,11 +5299,11 @@ msgstr "Nessun gameserver è disponibile." #: src/net/manaserv/guildhandler.cpp:265 #, c-format msgid "Topic: %s" -msgstr "" +msgstr "Argomento: %s" #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269 msgid "Players in this channel:" -msgstr "" +msgstr "Giocatori su questo canale:" #: src/net/manaserv/chathandler.cpp:208 msgid "Error joining channel." @@ -5411,27 +5315,27 @@ msgstr "" #: src/net/manaserv/chathandler.cpp:226 msgid "End of channel list." -msgstr "" +msgstr "Fine della lista dei canali." #: src/net/manaserv/chathandler.cpp:299 #, c-format msgid "%s entered the channel." -msgstr "" +msgstr "%s è entrato nel canale." #: src/net/manaserv/chathandler.cpp:304 #, c-format msgid "%s left the channel." -msgstr "" +msgstr "%s ha lasciato il canale." #: src/net/manaserv/chathandler.cpp:320 #, c-format msgid "%s has set mode %s on user %s." -msgstr "" +msgstr "%s ha impostato la modalità %s sul giocatore %s." #: src/net/manaserv/chathandler.cpp:331 #, c-format msgid "%s has kicked %s." -msgstr "" +msgstr "%s ha scacciato %s." #: src/net/manaserv/chathandler.cpp:337 msgid "Unknown channel event." @@ -5447,11 +5351,11 @@ msgstr "Invito spedito." #: src/net/manaserv/guildhandler.cpp:207 msgid "Member was promoted successfully." -msgstr "" +msgstr "Membro promosso con successo." #: src/net/manaserv/guildhandler.cpp:212 msgid "Failed to promote member." -msgstr "" +msgstr "Promozione membro fallita." #: src/net/manaserv/loginhandler.cpp:93 msgid "Wrong magic_token." @@ -5463,27 +5367,27 @@ msgstr "" #: src/net/manaserv/loginhandler.cpp:99 msgid "Account banned." -msgstr "" +msgstr "Account bannato." #: src/net/manaserv/loginhandler.cpp:124 msgid "New password incorrect." -msgstr "" +msgstr "La nuova password è sbagliata." #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163 msgid "Account not connected. Please login first." -msgstr "" +msgstr "L'account non è connesso. Connettere prima." #: src/net/manaserv/loginhandler.cpp:156 msgid "New email address incorrect." -msgstr "" +msgstr "Il nuovo indirizzo email è sbagliato." #: src/net/manaserv/loginhandler.cpp:159 msgid "Old email address incorrect." -msgstr "" +msgstr "Il vecchio indirizzo email è sbagliato." #: src/net/manaserv/loginhandler.cpp:167 msgid "The new email address already exists." -msgstr "" +msgstr "Il nuovo indirizzo email esiste già ." #: src/net/manaserv/loginhandler.cpp:249 msgid "" @@ -5496,27 +5400,28 @@ msgstr "" #: src/net/manaserv/loginhandler.cpp:278 msgid "Wrong username or password." -msgstr "" +msgstr "Username o password sbagliati." #: src/net/manaserv/loginhandler.cpp:284 msgid "Account banned" -msgstr "" +msgstr "Account bannato." #: src/net/manaserv/loginhandler.cpp:287 msgid "Login attempt too soon after previous attempt." msgstr "" +"Il tentativo di login è stato fatto troppo presto dopo l'ultimo tentativo." #: src/net/manaserv/loginhandler.cpp:315 msgid "Wrong username, password or email address." -msgstr "" +msgstr "Username, password o indirizzo email sbagliati." #: src/net/manaserv/loginhandler.cpp:318 msgid "Username already exists." -msgstr "" +msgstr "Username già in uso." #: src/net/manaserv/loginhandler.cpp:321 msgid "Email address already exists." -msgstr "" +msgstr "L'indirizzo email esiste già ." #: src/net/manaserv/loginhandler.cpp:324 msgid "You took too long with the captcha or your response was incorrect." @@ -5524,7 +5429,7 @@ msgstr "" #: src/net/manaserv/partyhandler.cpp:90 msgid "Joined party." -msgstr "" +msgstr "Iscritto al gruppo." #: src/net/manaserv/partyhandler.cpp:108 #, c-format @@ -5534,7 +5439,7 @@ msgstr "%s si è unito al party." #: src/net/manaserv/partyhandler.cpp:126 #, c-format msgid "%s rejected your invite." -msgstr "" +msgstr "%s ha riggettato il tuo invito." #: src/net/manaserv/tradehandler.cpp:107 msgid "Accepting incoming trade requests." @@ -5567,11 +5472,11 @@ msgstr "Impossibile vendere." #: src/net/tmwa/buysellhandler.cpp:140 msgid "Unable to sell while trading." -msgstr "" +msgstr "Impossibile vendere durante uno scambio." #: src/net/tmwa/buysellhandler.cpp:143 msgid "Unable to sell unsellable item." -msgstr "" +msgstr "Impossibile vendere oggetti non vendibili." #: src/net/tmwa/generalhandler.cpp:108 #, c-format @@ -5605,80 +5510,80 @@ msgstr "Fortuna %+d" #: src/net/tmwa/generalhandler.cpp:139 msgid "Authentication failed." -msgstr "" +msgstr "Autenticazione fallita." #: src/net/tmwa/generalhandler.cpp:142 msgid "No servers available." -msgstr "" +msgstr "Nessun server disponibile." #: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." -msgstr "" +msgstr "Qualcun altro sta provando ad usare questo account." #: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." -msgstr "" +msgstr "Questo account è già registrato." #: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." -msgstr "" +msgstr "Rilevato speed hack." #: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." -msgstr "" +msgstr "Accesso duplicato" #: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." -msgstr "" +msgstr "Errore di connessione sconosciuto." #: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Disconnesso dal server!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Fortuna" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" -msgstr "" +msgstr "Difesa." -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" -msgstr "" +msgstr "Attacco magico." -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" -msgstr "" +msgstr "Difesa Magica." -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" -msgstr "" +msgstr "% Accuratezza" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" -msgstr "" +msgstr "% Evasione" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" -msgstr "" +msgstr "% Colpo critico" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "" @@ -5699,48 +5604,48 @@ msgstr "" msgid "%s is not in your party!" msgstr "%s non è nel tuo party!" -#: src/playerrelations.cpp:460 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:480 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:524 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:527 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" -msgstr "" +msgstr "senza nome" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Attacco %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Difesa %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "PF %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "PM %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Oggetto sconosciuto" @@ -4,6 +4,7 @@ # # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. +# <HarajukuCupcakes@gmail.com>, 2011, 2012. # Necromonger <Necromong@inbox.ru>, 2011. # <Necromong@inbox.ru>, 2011. # sn0w75 <ibenrunnin@gmail.com>, 2011. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/" "ja/)\n" "Language: ja\n" @@ -24,7 +25,7 @@ msgstr "" #: src/actorspritemanager.cpp:1169 msgid "Visible on map" -msgstr "" +msgstr "マップã«è¡¨ç¤ºã•ã›ã‚‹" #: src/being.cpp:553 msgid "dodge" @@ -37,351 +38,350 @@ msgstr "ミス" #. TRANSLATORS: this away status writed in player nick #: src/being.cpp:1534 msgid "A" -msgstr "" +msgstr "A" #. TRANSLATORS: this inactive status writed in player nick #: src/being.cpp:1539 msgid "I" -msgstr "" +msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "è¨å®š" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" -msgstr "" +msgstr "パフォーマンス" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "ビデオ" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" -msgstr "" +msgstr "テーマ" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" -msgstr "サーãƒãƒ¼é€šä¿¡ä¸â€¦" +msgstr "サーãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" -msgstr "ãƒã‚°ã‚¤ãƒ³ä¸â€¦" +msgstr "ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" -msgstr "ゲームã®ä¸–ç•Œã«å…¥ã‚‹ä¸" +msgstr "ゲームã®ä¸–ç•Œã«ç§»å‹•ã—ã¦ã„ã¾ã™" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" -msgstr "æœï¼šï¼…d" +msgstr "ã‚ャラクターを呼ã³å‡ºã—ã¦ã„ã¾ã™" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" -msgstr "ゲームサーãƒãƒ¼é€šä¿¡ä¸â€¦" +msgstr "ゲームサーãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" -msgstr "サーãƒãƒ¼ã‚’入り替ãˆä¸â€¦" +msgstr "ゲームサーãƒãƒ¼ã‚’変更ã—ã¦ã„ã¾ã™" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "エラー" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" -msgstr "登録細目をè¦è«‹ä¸" +msgstr "登録内容を呼ã³å‡ºã—ã¦ã„ã¾ã™" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "パスワード変更" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" -msgstr "パスワード変更æˆåŠŸï¼" +msgstr "パスワードを変更ã—ã¾ã—ãŸ" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" -msgstr "メール変更" +msgstr "メールアドレス変更" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" -msgstr "メール変更æˆåŠŸï¼" +msgstr "メールアドレスを変更ã—ã¾ã—ãŸ" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" -msgstr "登録解除æˆåŠŸ" +msgstr "登録を解除ã—ã¾ã—ãŸ" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." -msgstr "ã•ã‚ˆãªã‚‰ã€ã„ã¤ã§ã‚‚戻ã£ã¦ã..." +msgstr "ã•ã‚ˆã†ãªã‚‰ã€€ã¾ãŸä¼šã„ã¾ã—ょã†" -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, c-format msgid "%s doesn't exist and can't be created! Exiting." -msgstr "%s ã¯å˜åœ¨ã—ãªã„ã®ã§ä½œæˆã™ã‚‹ã“ã¨ãŒä¸å¯èƒ½ï¼çµ‚了ä¸â€¦" +msgstr "%sã¯å˜åœ¨ã—ãªã„為ã€ä½œæˆã§ãã¾ã›ã‚“" -#: src/client.cpp:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" -msgstr "無効ãªã‚¢ãƒƒãƒ—デートホスト: %s" +msgstr "無効ãªã‚¢ãƒƒãƒ—デートホスト:%s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "更新フォルダã®ä½œæˆã‚¨ãƒ©ãƒ¼" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." -msgstr "エラー： %s ã¯å˜åœ¨ã—ãªã„ã®ã§ä½œæˆã™ã‚‹ã“ã¨ãŒä¸å¯èƒ½ï¼çµ‚了ä¸â€¦" +msgstr "エラー: %s ã¯å˜åœ¨ã—ãªã„為ã€ä½œæˆã§ãã¾ã›ã‚“" -#: src/commandhandler.cpp:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." -msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰" +msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ã§ã™" -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" -msgstr "空ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" +msgstr "空ã®ã•ã•ã‚„ãã‚’é€ä¿¡ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "" -"%sã¨è¨€ã†ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚¿ãƒ–ã®ä½œæˆãŒã§ãã¾ã›ã‚“ï¼ãã‚Œã¯ã‚‚ã†æ—¢ã«å˜åœ¨ã—ã¦ã„ã‚‹ã‹ã€è‡ªåˆ†" -"ã§ã™ã€‚" +"%sã¸ã®ã•ã•ã‚„ãタブã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ãã®ã‚¿ãƒ–ã¯æ—¢ã«é–‹ã„ã¦ã„ã‚‹ã€ã‚‚ã—ãã¯è‡ª" +"分宛ã¦ã§ã™" -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." -msgstr "%sã¨ã„ã†ãƒãƒ£ãƒ³ãƒãƒ«ã¸ã®å‚åŠ ã‚’è¦æ±‚ã—ã¦ã„ã¾ã™ã€‚" +msgstr "%sãƒãƒ£ãƒ³ãƒãƒ«ã¸ã®å‚åŠ ã‚’ãƒªã‚¯ã‚¨ã‚¹ãƒˆä¸" -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." -msgstr "パーティåãŒãªã„。" +msgstr "パーティåãŒã‚ã‚Šã¾ã›ã‚“" -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." -msgstr "ギルドåãŒãªã„。" +msgstr "ギルドåãŒã‚ã‚Šã¾ã›ã‚“" -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." -msgstr "åå‰ã‚’æ•™ãˆã¦ãã ã•ã„。" +msgstr "åå‰ã‚’入力ã—ã¦ãã ã•ã„" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." -msgstr "リターンã¯ãƒãƒ£ãƒƒãƒˆã‚’ç•™ã‚ã¦ãŠãã¾ã™ã€‚" +msgstr "改行ã‚ーã§ãƒãƒ£ãƒƒãƒˆå…¥åŠ›ãŒã§ãã¾ã™" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." -msgstr "メッセージã¯ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™ã€‚" +msgstr "ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." -msgstr "リターンã¯ã“ã‚Œã‹ã‚‰ãƒãƒ£ãƒƒãƒˆã‚’ç•™ã‚ã¦ãŠãã¾ã™ã€‚" +msgstr "改行ã‚ーã§ãƒãƒ£ãƒƒãƒˆå…¥åŠ›ãŒã§ãã¾ã™" -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." -msgstr "メッセージã¯ã“ã‚Œã‹ã‚‰ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™ã€‚" +msgstr "ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™" -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "å‹é”" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "無視" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "ä¸æ€§" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" -msgstr "プレイヤーã¯ã‚‚ã†%s!" +msgstr "プレイヤーã¯æ—¢ã«%s" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" -msgstr "プレイヤーã¯%sæˆåŠŸï¼" +msgstr "プレイヤーã®%sã«æˆåŠŸã—ã¾ã—ãŸ" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" -msgstr "é¸æ‰‹ã¯%sを居られãªã‹ã£ãŸ " +msgstr "プレイヤーを%sã§ããªã‹ã£ãŸ" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" -msgstr "プレイヤーã¯ç„¡è¦–ã•ã‚Œãªã‹ã£ãŸï¼" +msgstr "プレイヤーを無視ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" -msgstr "プレイヤーã¯ã‚‚ã†ç„¡è¦–ã—ã¦ã„ãªã„ï¼" +msgstr "プレイヤーを無視解除ã—ã¾ã—ãŸ" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" -msgstr "Playerã¯unignoredã“ã¨ãŒã§ããªã‹ã£ãŸï¼" +msgstr "プレイヤーを無視解除ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" -msgstr "" +msgstr "ブラックリスト化ã•ã‚Œã¦ã„ã¾ã™" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" -msgstr "" +msgstr "敵" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" -msgstr "プレイヤーã¯ã‚‚ã†æ¶ˆã—ã¦ã„ã‚‹!" +msgstr "プレイヤーã¯å‰Šé™¤ã•ã‚Œã¦ã„ã¾ã™" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" -msgstr "プレーアãŒé¦–尾よãã«æ¶ˆåŽ»ï¼" +msgstr "プレイヤーを削除ã—ã¾ã—ãŸ" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" -msgstr "" +msgstr "プレイヤーを削除ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" -msgstr "クライアントã®ç¨¼åƒæ™‚間：%s" +msgstr "クライアントã®ç¨¼åƒæ™‚é–“: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" +msgstr[0] "%d週" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" +msgstr[0] "%dæ—¥" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" +msgstr[0] "%d時" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" +msgstr[0] "%d分" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "" +msgstr[0] "%d秒" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" -msgstr "" +msgstr "フォントã‚ャッシュサイズ" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" -msgstr "" +msgstr "ã‚ャッシュサイズ:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" -msgstr "" +msgstr "作æˆ:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" -msgstr "" +msgstr "削除:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" -msgstr "" +msgstr "リソースイメージ:" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" -msgstr "" +msgstr "リソースå¤å…イメージ:" #: src/commandhandler.h:34 #, c-format msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -"/%sã¸ã®å¯èƒ½ãªã‚ªãƒ—ションã¯ï¼š\"yes\", \"no\", \"true\", \"false\", \"1\", " -"\"0\"。" +"/%sã¸ã®å¯èƒ½ãªã‚ªãƒ—ションã¯ï¼š\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"" -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "一般" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "デãƒãƒƒã‚°" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " -msgstr "" +msgstr " ã¨ã—ã¦ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ã‚·ãƒ§ãƒƒãƒˆã‚’ä¿å˜ã—ã¾ã—ãŸ" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" -msgstr "スクリーンショットをä¿å˜ã™ã‚‹ã“ã¨ã«å¤±æ•—ã—ã¾ã—ãŸï¼" +msgstr "スクリーンショットをä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." -msgstr "" +msgstr "サーãƒãƒ¼ã¸ã®æŽ¥ç¶šãŒåˆ‡æ–ã•ã‚Œã¾ã—ãŸ" -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" -msgstr "他人ã‹ã‚‰ã®ãƒˆãƒ¬ãƒ¼ãƒ‰ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’無視ã—ã¾ã™ã€‚" +msgstr "トレードリクエストを無効ã«ã—ã¦ã„ã¾ã™" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" -msgstr "他人ã‹ã‚‰ã®ãƒˆãƒ¬ãƒ¼ãƒ‰ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å—ã‘入れã¾ã™ã€‚" +msgstr "トレードリクエストを有効ã«ã—ã¾ã—ãŸ" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" -msgstr "マップをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ" +msgstr "マップã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" -msgstr "%sã‚’ãƒãƒ¼ãƒ‰ã—ã¦ã„ã‚‹é–“ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—ãŸã€‚" +msgstr "%sã®èªã¿è¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—ãŸ" #: src/gui/beingpopup.cpp:124 #, c-format msgid "Party: %s" -msgstr "パーティ：%s" +msgstr "パーティ: %s" #: src/gui/beingpopup.cpp:138 #, c-format msgid "Guild: %s" -msgstr "ギルド：%s" +msgstr "ギルド: %s" #: src/gui/beingpopup.cpp:151 #, c-format msgid "Pvp rank: %d" -msgstr "PVP ランク：%d" +msgstr "PVP ランク: %d" #: src/gui/beingpopup.cpp:162 #, c-format msgid "Comment: %s" -msgstr "" +msgstr "コメント: %s" #: src/gui/botcheckerwindow.cpp:266 msgid "Bot Checker" -msgstr "ボット" +msgstr "ボットãƒã‚§ãƒƒã‚«ãƒ¼" #: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" @@ -389,7 +389,7 @@ msgstr "åå‰" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "攻撃" @@ -408,7 +408,7 @@ msgstr "å‹•ã" msgid "Result" msgstr "çµæžœ" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "リセット" @@ -426,21 +426,21 @@ msgstr "ä¾¡æ ¼:%s /åˆè¨ˆ:%s" #: src/gui/buydialog.cpp:103 msgid "Amount:" -msgstr "" +msgstr "é‡:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -452,8 +452,8 @@ msgid "Quit" msgstr "終了" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "最大" @@ -477,20 +477,20 @@ msgstr "売る" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "ã‚ャンセル" #: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57 msgid "Change Email Address" -msgstr "メールアドレスを変ãˆã‚‹ã€‚" +msgstr "メールアドレスã®å¤‰æ›´" #: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55 #, c-format @@ -499,24 +499,24 @@ msgstr "アカウント: %s" #: src/gui/changeemaildialog.cpp:54 msgid "Type new email address twice:" -msgstr "æ–°ã—ã„メールアドレスを二回入力ã—ã¦ãã ã•ã„：" +msgstr "æ–°ã—ã„メールアドレスを二回入力ã—ã¦ãã ã•ã„:" #: src/gui/changeemaildialog.cpp:132 #, c-format msgid "The new email address needs to be at least %d characters long." -msgstr "ユーザåã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上長ããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "メールアドレスã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/changeemaildialog.cpp:139 #, c-format msgid "The new email address needs to be less than %d characters long." -msgstr "ユーザåã¯%dæ–‡å—よりçŸããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "メールアドレスã¯%dæ–‡å—以下ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/changeemaildialog.cpp:146 msgid "The email address entries mismatch." -msgstr "" +msgstr "メールアドレスãŒä¸€è‡´ã—ã¾ã›ã‚“" #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "パスワードã®å¤‰æ›´" @@ -527,29 +527,29 @@ msgstr "パスワード:" #: src/gui/changepassworddialog.cpp:66 msgid "Type new password twice:" -msgstr "æ–°ã—ã„パスワードを二回入力ã—ã¦ãã ã•ã„：" +msgstr "æ–°ã—ã„パスワードを二回入力ã—ã¦ãã ã•ã„:" #: src/gui/changepassworddialog.cpp:114 msgid "Enter the old password first." -msgstr "å…ƒã®ãƒ‘スワードを入力ã—ã¦ãã ã•ã„。" +msgstr "å…ƒã®ãƒ‘スワードを入力ã—ã¦ãã ã•ã„" #: src/gui/changepassworddialog.cpp:120 #, c-format msgid "The new password needs to be at least %d characters long." -msgstr "パスワードã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上長ããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "パスワードã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/changepassworddialog.cpp:127 #, c-format msgid "The new password needs to be less than %d characters long." -msgstr "パスワードã¯%dæ–‡å—よりçŸããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "パスワードã¯%dæ–‡å—以下ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/changepassworddialog.cpp:134 msgid "The new password entries mismatch." -msgstr "" +msgstr "æ–°ã—ã„パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“" #: src/gui/charcreatedialog.cpp:59 msgid "Create Character" -msgstr "ã‚ャラクターを作æˆ" +msgstr "ã‚ャラクター作æˆ" #: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94 #: src/gui/register.cpp:75 @@ -572,18 +572,18 @@ msgstr "<" #: src/gui/charcreatedialog.cpp:92 msgid "Hair color:" -msgstr "髪色：" +msgstr "髪色:" #: src/gui/charcreatedialog.cpp:95 msgid "Hair style:" -msgstr "髪スタイル" +msgstr "ヘアスタイル" #: src/gui/charcreatedialog.cpp:101 msgid "Race:" msgstr "人種:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "作æˆ" @@ -602,72 +602,72 @@ msgstr "%d ãƒã‚¤ãƒ³ãƒˆã‚’振り分ã‘ã¦ãã ã•ã„" #: src/gui/charcreatedialog.cpp:231 msgid "Your name needs to be at least 4 characters." -msgstr "åå‰ã«ã¯ï¼”æ–‡å—以上必è¦ã§ã™ã€‚" +msgstr "åå‰ã¯ï¼”æ–‡å—以上必è¦ã§ã™" #: src/gui/charcreatedialog.cpp:303 msgid "Character stats OK" -msgstr "ã‚ャラクターã®èƒ½åŠ›ãƒã‚¤ãƒ³ãƒˆé…分é‡ã¯å•é¡Œã‚ã‚Šã¾ã›ã‚“。" +msgstr "能力ãƒã‚¤ãƒ³ãƒˆé…分é‡ã¯å•é¡Œã‚ã‚Šã¾ã›ã‚“" #: src/gui/charcreatedialog.cpp:317 #, c-format msgid "Please remove %d points" -msgstr "%dãƒã‚¤ãƒ³ãƒˆã‚’å–り除ã„ã¦ãã ã•ã„。" +msgstr "%dãƒã‚¤ãƒ³ãƒˆã‚’å–り除ã„ã¦ãã ã•ã„" #: src/gui/charselectdialog.cpp:76 msgid "Confirm Character Delete" -msgstr "ã‚ャラクターã®å‰Šé™¤ã—ã¦ã‚‚よã„ã‹ç¢ºèªã—ã¦ãã ã•ã„" +msgstr "ã‚ャラクター削除ã®ç¢ºèªã‚’ã—ã¦ãã ã•ã„" #: src/gui/charselectdialog.cpp:77 msgid "Are you sure you want to delete this character?" -msgstr "ã“ã®ã‚ャラクターを消ã—ã¦ã‚‚よã‚ã—ã„ã§ã—ょã†ã‹ï¼Ÿ" +msgstr "ã“ã®ã‚ャラクターを削除ã—ã¾ã™ã‹ï¼Ÿ" #: src/gui/charselectdialog.cpp:125 msgid "Account and Character Management" msgstr "アカウントã¨ã‚ャラクター管ç†" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" -msgstr "ãƒã‚°ã‚¤ãƒ³ã‚’スイッãƒã™ã‚‹" +msgstr "別アカウントã§ãƒã‚°ã‚¤ãƒ³" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "登録解除" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" -msgstr "メールアドレスを変ãˆã‚‹" +msgstr "メールアドレス変更" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" -msgstr "" +msgstr "パスワードãŒé•ã„ã¾ã™" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" -msgstr "" +msgstr "ã‚ャラクターを削除ã™ã‚‹ã«ã¯ãƒ‘スワードを入力ã—ã¦ä¸‹ã•ã„" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" -msgstr "" +msgstr "パスワードを入力ã—ã¦ä¸‹ã•ã„:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "削除" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" -msgstr "é¸ã¶" +msgstr "é¸æŠž" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "レベル%d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" -msgstr "(空ã£ã½)" +msgstr "(空)" #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70 msgid "default" @@ -691,7 +691,7 @@ msgstr "é’" #: src/gui/chatwindow.cpp:121 msgid "gold" -msgstr "金" +msgstr "金色" #: src/gui/chatwindow.cpp:122 msgid "yellow" @@ -707,7 +707,7 @@ msgstr "ç´«" #: src/gui/chatwindow.cpp:125 msgid "grey" -msgstr "ç°è‰²" +msgstr "グレー" #: src/gui/chatwindow.cpp:126 msgid "brown" @@ -739,15 +739,15 @@ msgstr "???" msgid "Chat" msgstr "ãƒãƒ£ãƒƒãƒˆ" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." -msgstr "" +msgstr "ç¾åœ¨: %s; %d プレイヤーãŒã„ã¾ã™" -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" -msgstr "%sã«é€ä¿¡ä¸ï¼š %s" +msgstr "%sã«ã•ã•ã‚„ãä¸:%s" #: src/gui/confirmdialog.cpp:47 msgid "Yes" @@ -770,49 +770,49 @@ msgstr "無視" #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" -msgstr "地図" +msgstr "マップ" #: src/gui/debugwindow.cpp:73 msgid "Target" -msgstr "" +msgstr "ターゲット" #: src/gui/debugwindow.cpp:74 msgid "Net" -msgstr "" +msgstr "ãƒãƒƒãƒˆ" #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222 #: src/gui/debugwindow.cpp:251 msgid "Music:" -msgstr "音楽：" +msgstr "音楽:" #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226 #: src/gui/debugwindow.cpp:253 msgid "Map:" -msgstr "マップ：" +msgstr "マップ:" #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224 #: src/gui/debugwindow.cpp:252 msgid "Minimap:" -msgstr "ミニマップ：" +msgstr "ミニマップ:" #: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220 #: src/gui/debugwindow.cpp:249 msgid "Cursor:" -msgstr "カーソル：" +msgstr "カーソル:" #: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203 #: src/gui/debugwindow.cpp:208 msgid "Player Position:" -msgstr "プレイヤーãƒã‚¸ã‚·ãƒ§ãƒ³ï¼š" +msgstr "プレイヤーã®ä½ç½®:" #: src/gui/debugwindow.cpp:154 msgid "Particle count:" -msgstr "" +msgstr "パーティクル数:" #: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237 #: src/gui/debugwindow.cpp:256 msgid "Map actors count:" -msgstr "æ•°é‡ã®ãƒžãƒ—ã®è¡Œç‚ºè€…:" +msgstr "マップアクターã®æ•°:" #: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175 #, c-format @@ -836,67 +836,67 @@ msgstr "%d FPS" #: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242 msgid "Textures count:" -msgstr "" +msgstr "テクスãƒãƒ£ãƒ¼æ•°:" #: src/gui/debugwindow.cpp:233 #, c-format msgid "Particle count: %d" -msgstr "ç²’å数： %d" +msgstr "パーティクル数:%d" #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 #: src/gui/debugwindow.cpp:345 msgid "Target:" -msgstr "ターゲット：" +msgstr "ターゲット:" #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 #: src/gui/debugwindow.cpp:346 msgid "Target Id:" -msgstr "ターゲット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:" -msgstr "ターゲットレベル：" +msgstr "ターゲットレベル:" #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 #: src/gui/debugwindow.cpp:348 msgid "Target Party:" -msgstr "ターゲットパーティ：" +msgstr "ターゲットパーティ:" #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 #: src/gui/debugwindow.cpp:349 msgid "Target Guild:" -msgstr "ターゲットギルド：" +msgstr "ターゲットギルド:" #: 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 "攻撃é…延" #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 #: src/gui/debugwindow.cpp:351 msgid "Minimal hit:" -msgstr "" +msgstr "最低ヒット:" #: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 #: src/gui/debugwindow.cpp:352 msgid "Maximum hit:" -msgstr "" +msgstr "最高ヒット:" #: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 #: src/gui/debugwindow.cpp:353 msgid "Critical hit:" -msgstr "" +msgstr "致命的ヒット:" #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 #, c-format msgid "Ping: %s ms" -msgstr "" +msgstr "ピング: %s ms" #: src/gui/debugwindow.cpp:395 #, c-format msgid "In: %d bytes/s" -msgstr "入力: %d ãƒã‚¤ãƒˆ/秒" +msgstr "入力: %dãƒã‚¤ãƒˆ/秒" #: src/gui/debugwindow.cpp:397 #, c-format @@ -905,25 +905,25 @@ msgstr "出力: %d ãƒã‚¤ãƒˆ/秒" #: src/gui/didyouknowwindow.cpp:47 msgid "Did You Know?" -msgstr "" +msgstr "豆知è˜" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "é–‰ã˜ã‚‹" #: src/gui/didyouknowwindow.cpp:64 msgid "< Previous" -msgstr "" +msgstr "< å‰ã¸" #: src/gui/didyouknowwindow.cpp:65 msgid "Next >" -msgstr "" +msgstr "次㸠>" #: src/gui/didyouknowwindow.cpp:66 msgid "Auto open this window" -msgstr "" +msgstr "ã“ã®çª“を自動ã§é–‹ã‘ã‚‹" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 @@ -932,14 +932,14 @@ msgstr "OK" #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74 msgid "Equipment" -msgstr "装備" +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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" -msgstr "外ã™" +msgstr "å–外ã™" #: src/gui/helpwindow.cpp:43 msgid "Help" @@ -947,82 +947,82 @@ msgstr "ヘルプ" #: src/gui/inventorywindow.cpp:71 msgid "by name" -msgstr "" +msgstr "åå‰" #: src/gui/inventorywindow.cpp:72 msgid "by id" -msgstr "" +msgstr "ID" #: src/gui/inventorywindow.cpp:73 msgid "by weight" -msgstr "" +msgstr "é‡é‡" #: src/gui/inventorywindow.cpp:74 msgid "by amount" -msgstr "" +msgstr "æ•°é‡" #: src/gui/inventorywindow.cpp:75 msgid "by type" -msgstr "" +msgstr "タイプ" #: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" -msgstr "アイテム" +msgstr "インベントリー" #: src/gui/inventorywindow.cpp:137 msgid "Slots:" -msgstr "スãƒãƒƒãƒˆ" +msgstr "スãƒãƒƒãƒˆ:" #: src/gui/inventorywindow.cpp:149 msgid "Filter:" -msgstr "フィルタ：" +msgstr "フィルタ:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" -msgstr "装備ã™ã‚‹" +msgstr "装ç€" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" -msgstr "使ã†" +msgstr "使用" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "è½ã¨ã™..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" -msgstr "分割ã™ã‚‹" +msgstr "分割" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 #: src/gui/popupmenu.cpp:588 msgid "Outfits" -msgstr "æœ" +msgstr "æœè£…" #: src/gui/inventorywindow.cpp:178 msgid "Weight:" -msgstr "é‡é‡" +msgstr "é‡é‡:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" -msgstr "ä¿å˜" +msgstr "ä¿ç®¡" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" -msgstr "å–り戻ã™" +msgstr "å–出ã™" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "è½ã¨ã™" @@ -1033,90 +1033,90 @@ msgstr "å…¨ã¦" #: src/gui/itemamountwindow.cpp:261 msgid "Select amount of items to trade." -msgstr "交æ›ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®é‡ã‚’é¸æŠžã—ã¦ãã ã•ã„。" +msgstr "トレードã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®æ•°é‡ã‚’入力ã—ã¦ãã ã•ã„" #: src/gui/itemamountwindow.cpp:264 msgid "Select amount of items to drop." -msgstr "è½ã¨ã™ã‚¢ã‚¤ãƒ†ãƒ ã®é‡ã‚’é¸æŠžã—ã¦ãã ã•ã„" +msgstr "è½ã¨ã™ã‚¢ã‚¤ãƒ†ãƒ ã®æ•°é‡ã‚’入力ã—ã¦ãã ã•ã„" #: src/gui/itemamountwindow.cpp:267 msgid "Select amount of items to store." -msgstr "ä¿ç®¡ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®é‡ã‚’é¸æŠžã—ã¦ãã ã•ã„。" +msgstr "ä¿ç®¡ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®æ•°é‡ã‚’入力ã—ã¦ãã ã•ã„" #: src/gui/itemamountwindow.cpp:270 msgid "Select amount of items to retrieve." -msgstr "å–り出ã™ã‚¢ã‚¤ãƒ†ãƒ ã®é‡ã‚’é¸æŠžã—ã¦ãã ã•ã„。" +msgstr "å–出ã™ã‚¢ã‚¤ãƒ†ãƒ ã®æ•°é‡ã‚’入力ã—ã¦ãã ã•ã„" #: src/gui/itemamountwindow.cpp:273 msgid "Select amount of items to split." -msgstr "分割ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®é‡ã‚’é¸æŠžã—ã¦ãã ã•ã„。" +msgstr "分割ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®é‡ã‚’é¸æŠžã—ã¦ãã ã•ã„" #: src/gui/itemamountwindow.cpp:276 msgid "Add to buy shop." -msgstr "" +msgstr "購入リストã«è¿½åŠ " #: src/gui/itemamountwindow.cpp:279 msgid "Add to sell shop." -msgstr "" +msgstr "販売リストã«è¿½åŠ " #: src/gui/itemamountwindow.cpp:282 msgid "Unknown." -msgstr "ä¸æ˜Ž." +msgstr "ä¸æ˜Ž" #: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183 msgid ", " -msgstr "ã€ã€€" +msgstr ", " #: src/gui/itempopup.cpp:193 #, c-format msgid "Weight: %s" -msgstr "é‡åŠ›ï¼š%s" +msgstr "é‡åŠ›: %s" #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69 msgid "Kill stats" -msgstr "殺人統計ウィンドウ" +msgstr "ã‚ル統計" #: src/gui/killstats.cpp:67 msgid "Reset stats" -msgstr "統計をれセット" +msgstr "統計をリセット" #: src/gui/killstats.cpp:68 msgid "Reset timer" -msgstr "タイマーをれセット" +msgstr "タイマーをリセット" #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" -msgstr "" +msgstr "レベル: %d 㨠%f%%" #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" -msgstr "" +msgstr "Exp: %d/%d 残り: %d" #: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 #: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" -msgstr "" +msgstr "1%% = %d exp, å¹³å‡ã®æ•µ 1%%: %s" #: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 #: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" -msgstr "" +msgstr "ã‚ル: %s, åˆè¨ˆexp: %s" #: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 #: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" -msgstr "" +msgstr "å¹³å‡Exp: %s, 次ã®ãƒ¬ãƒ™ãƒ«é”æˆã¾ã§ã®æ•µã®æ•°: %s" #: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 #: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" -msgstr "" +msgstr "ã‚ル/分: %s, Exp/分: %s" #: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 #: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 @@ -1124,43 +1124,43 @@ msgstr "" #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" -msgstr[0] "" +msgstr[0] "Expスピード %d 分ã”ã¨: %s" #: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" -msgstr[0] "" +msgstr[0] "次ã®ãƒ¬ãƒ™ãƒ«ã‚¢ãƒƒãƒ— %d 分ã”ã¨: %s" #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" -msgstr "" +msgstr "最後ã®Exp:" #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 #: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" -msgstr "" +msgstr "次ã®JackOã®å‡ºç¾ã¾ã§:" #: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 #: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 #: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" -msgstr "" +msgstr " 次ã®ãƒ¬ãƒ™ãƒ«é”æˆã¾ã§ã®æ™‚é–“: %s" #: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" -msgstr "" +msgstr "%s %d?" #: src/gui/killstats.cpp:370 msgid "jacko spawning" -msgstr "" +msgstr "JackOãŒå‡ºç¾ä¸" #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." -msgstr "" +msgstr "ギルドã‹ã‚‰é€€ä¼šã—ã¾ã—ãŸ" #: src/gui/logindialog.cpp:59 msgid "Normal" @@ -1168,7 +1168,7 @@ msgstr "普通" #: src/gui/logindialog.cpp:60 msgid "Auto Close" -msgstr "オートクãƒãƒ¼ã‚º" +msgstr "自動ã§é–‰ã˜ã‚‹" #: src/gui/logindialog.cpp:61 msgid "Skip" @@ -1181,27 +1181,27 @@ msgstr "ãƒã‚°ã‚¤ãƒ³" #: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252 #: src/gui/widgets/chattab.cpp:173 msgid "Server:" -msgstr "サーãƒ:" +msgstr "サーãƒãƒ¼:" #: src/gui/logindialog.cpp:96 msgid "Custom update host" -msgstr "カスタム・アップデート・ホスト" +msgstr "カスタムアップデートホスト" #: src/gui/logindialog.cpp:110 msgid "Remember username" -msgstr "ウザーåを覚ãˆã‚‹" +msgstr "ユーザーåを記憶ã™ã‚‹" #: src/gui/logindialog.cpp:111 msgid "Update:" -msgstr "アップデート" +msgstr "アップデート:" #: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" -msgstr "登録ã™ã‚‹" +msgstr "登録" #: src/gui/logindialog.cpp:122 msgid "Change Server" -msgstr "サーãƒãƒ¼ã‚’変ãˆã‚‹" +msgstr "サーãƒãƒ¼å¤‰æ›´" #: src/gui/ministatuswindow.cpp:59 msgid "health bar" @@ -1225,7 +1225,7 @@ msgstr "é‡é‡" #: src/gui/ministatuswindow.cpp:95 msgid "inventory slots bar" -msgstr "" +msgstr "インベントリースãƒãƒƒãƒˆãƒãƒ¼" #: src/gui/ministatuswindow.cpp:98 msgid "money bar" @@ -1243,31 +1243,27 @@ msgstr "情勢" msgid "Need" msgstr "å¿…è¦" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "サーãƒã‚’å¾…ã£ã¦ã„ã¾ã™â€¦" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "ã‚ャンセル" + +#: src/gui/npcdialog.cpp:53 msgid "Next" -msgstr "次ã¸" +msgstr "次" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "決定" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "クリア" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> 次ã®" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "宛先:" @@ -1278,25 +1274,26 @@ msgstr "é€ä¿¡ã™ã‚‹" #: src/gui/npcpostdialog.cpp:99 msgid "Failed to send as sender or letter invalid." -msgstr "æ–‡å—ã‹å·®å‡ºäººãŒç„¡åŠ¹ãªã®ã§é€ä¿¡ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" +msgstr "æ–‡å—ã‹å·®å‡ºäººãŒç„¡åŠ¹ã®ç‚ºé€ä¿¡ã«å¤±æ•—ã—ã¾ã—ãŸ" #: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890 #, c-format msgid "Outfit: %d" -msgstr "æœï¼š %d" +msgstr "æœè£…: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" -msgstr "éµï¼š%s" +msgstr "éµ: %s" #: src/gui/outfitwindow.cpp:91 msgid "Unequip first" -msgstr "外ã™ç¬¬ä¸€" +msgstr "最åˆã«å–外ã™" #: src/gui/outfitwindow.cpp:94 msgid "Away outfit" -msgstr "装備一å¼ä¸åœ¨ã§" +msgstr "AFKä¸ã®æœè£…" #: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671 #: src/gui/widgets/tradetab.cpp:44 @@ -1305,16 +1302,16 @@ msgstr "交æ›" #: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405 msgid "Whisper" -msgstr "" +msgstr "ã•ã•ã‚„ã" #: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676 msgid "Heal" -msgstr "" +msgstr "HP回復" #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411 #: src/gui/popupmenu.cpp:682 msgid "Be friend" -msgstr "" +msgstr "å‹é”ã«ãªã‚‹" #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174 @@ -1325,7 +1322,7 @@ msgstr "" #: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714 #: src/gui/popupmenu.cpp:727 msgid "Disregard" -msgstr "" +msgstr "無視ã™ã‚‹" #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159 #: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414 @@ -1333,7 +1330,7 @@ msgstr "" #: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693 #: src/gui/popupmenu.cpp:716 msgid "Black list" -msgstr "" +msgstr "ブラックリスト" #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160 #: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415 @@ -1341,7 +1338,7 @@ msgstr "" #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 #: src/gui/popupmenu.cpp:702 msgid "Set as enemy" -msgstr "" +msgstr "敵ã«è¨å®šã™ã‚‹" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 @@ -1353,7 +1350,7 @@ msgstr "" #: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709 #: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722 msgid "Erase" -msgstr "" +msgstr "消ã™" #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 #: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187 @@ -1364,106 +1361,106 @@ msgstr "" #: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721 #: src/gui/popupmenu.cpp:726 msgid "Unignore" -msgstr "" +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/playerrelations.cpp:447 +#: 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 msgid "Follow" -msgstr "" +msgstr "フォãƒãƒ¼" #: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466 #: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816 msgid "Imitation" -msgstr "" +msgstr "真似" #: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769 msgid "Invite to party" -msgstr "" +msgstr "パーティã¸æ‹›å¾…" #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477 #: src/gui/popupmenu.cpp:774 msgid "Kick from party" -msgstr "" +msgstr "パーティã‹ã‚‰ä¸€æ™‚çš„ã«è¿½ã„出ã™" #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244 #: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791 msgid "Kick from guild" -msgstr "" +msgstr "ギルドã‹ã‚‰ä¸€æ™‚çš„ã«è¿½ã„出ã™" #: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249 #: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796 msgid "Change pos in guild" -msgstr "" +msgstr "ギルドã§ã®å½¹å‰²ã‚’変更" #: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507 #: src/gui/popupmenu.cpp:805 msgid "Invite to guild" -msgstr "" +msgstr "ギルドã¸æ‹›å¾…" #: src/gui/popupmenu.cpp:265 msgid "Kick player" -msgstr "" +msgstr "プレイヤーを一時的ã«è¿½ã„出ã™" #: src/gui/popupmenu.cpp:267 msgid "Nuke" -msgstr "" +msgstr "消ã™" #: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739 #: src/gui/popupmenu.cpp:828 msgid "Show Items" -msgstr "" +msgstr "アイテムを表示ã™ã‚‹" #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" -msgstr "" +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 msgid "Add comment" -msgstr "" +msgstr "コメントをã™ã‚‹" #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515 #: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835 msgid "Buy (?)" -msgstr "" +msgstr "買ㆠ(?)" #: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516 #: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836 msgid "Sell (?)" -msgstr "" +msgstr "売る (?)" #: src/gui/popupmenu.cpp:312 msgid "Kick" -msgstr "" +msgstr "追ã„出ã™" #: src/gui/popupmenu.cpp:323 msgid "Remove from attack list" -msgstr "" +msgstr "攻撃リストã‹ã‚‰å‰Šé™¤ã™ã‚‹" #: src/gui/popupmenu.cpp:328 msgid "Add to priority attack list" -msgstr "" +msgstr "攻撃優先リストã¸è¿½åŠ ã™ã‚‹" #: src/gui/popupmenu.cpp:330 msgid "Add to attack list" -msgstr "" +msgstr "攻撃リストã¸è¿½åŠ ã™ã‚‹" #: src/gui/popupmenu.cpp:332 msgid "Add to ignore list" -msgstr "" +msgstr "無視リストã¸è¿½åŠ ã™ã‚‹" #: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519 msgid "Add name to chat" -msgstr "" +msgstr "åå‰ã‚’ãƒãƒ£ãƒƒãƒˆã¸è¿½åŠ ã™ã‚‹" #: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48 msgid "Players" @@ -1471,10 +1468,10 @@ msgstr "プレイヤー" #: src/gui/popupmenu.cpp:546 msgid "Pick up" -msgstr "" +msgstr "拾ã†" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "ãƒãƒ£ãƒƒãƒˆã«è¿½åŠ " @@ -1484,20 +1481,20 @@ msgstr "マップアイテム" #: src/gui/popupmenu.cpp:567 msgid "Rename" -msgstr "" +msgstr "åå‰ã‚’変更ã™ã‚‹" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" -msgstr "å–り去る" +msgstr "削除" #: src/gui/popupmenu.cpp:573 msgid "Warp" -msgstr "" +msgstr "ワープ" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "" +msgid "Clear outfit" +msgstr "æœè£…を削除ã™ã‚‹" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1505,11 +1502,11 @@ msgstr "呪文" #: src/gui/popupmenu.cpp:609 msgid "Load old spells" -msgstr "" +msgstr "å¤ã„呪文をèªè¾¼ã‚€" #: src/gui/popupmenu.cpp:610 msgid "Edit spell" -msgstr "" +msgstr "呪文を編集ã™ã‚‹" #: src/gui/popupmenu.cpp:636 msgid "Disable highlight" @@ -1521,142 +1518,142 @@ msgstr "強調表示を有効" #: src/gui/popupmenu.cpp:640 msgid "Don't remove name" -msgstr "" +msgstr "åå‰ã‚’消ã•ãªã„" #: src/gui/popupmenu.cpp:642 msgid "Remove name" -msgstr "" +msgstr "åå‰ã‚’削除ã™ã‚‹" #: src/gui/popupmenu.cpp:644 msgid "Enable away" -msgstr "" +msgstr "AFKを有効ã«ã™ã‚‹" #: src/gui/popupmenu.cpp:646 msgid "Disable away" -msgstr "" +msgstr "AFKを無効ã«ã™ã‚‹" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" -msgstr "ã§ã‚‹" +msgstr "退会" #: src/gui/popupmenu.cpp:654 msgid "Copy to clipboard" -msgstr "" +msgstr "クリップボードã«ã‚³ãƒ”ー" #: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "ギルドãƒã‚¸ã‚·ãƒ§ãƒ³ã‚’変更" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " -msgstr "" +msgstr " マップサインã®åå‰ã‚’変更" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " -msgstr " åå‰: " +msgstr "åå‰: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " -msgstr "" +msgstr "プレイヤーコメント " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " -msgstr "" +msgstr "コメント: " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" -msgstr "ã«è²¿æ˜“を足ã™" +msgstr "トレードã«è¿½åŠ " -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" -msgstr "" +msgstr "トレードã«10è¿½åŠ ã™ã‚‹" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" -msgstr "" +msgstr "トレードã«åŠåˆ†è¿½åŠ ã™ã‚‹" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" -msgstr "" +msgstr "トレードã«å…¨ã¦è¿½åŠ ã™ã‚‹" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" -msgstr "10ä¿å˜" +msgstr "10 ä¿å˜" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "åŠåˆ†ä¿å˜" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "全部ä¿å˜" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" -msgstr "" +msgstr "å…¨ã¦è½ã¨ã™" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" -msgstr "10å–ã‚‹" +msgstr "10 å–出ã™" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" -msgstr "åŠåˆ†å–ã‚‹" +msgstr "åŠåˆ†å–出ã™" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" -msgstr "全部å–ã‚‹" +msgstr "全部å–出ã™" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" -msgstr "" +msgstr "旧アイテムショートカットをèªè¾¼ã‚€" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" -msgstr "" +msgstr "旧ドãƒãƒƒãƒ—ショートカットをèªè¾¼ã‚€" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" -msgstr " éš ã™" +msgstr " éžè¡¨ç¤º" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" -msgstr "見ã›ã‚‹" +msgstr "表示" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" -msgstr "" +msgstr "黄色ãƒãƒ¼ã‚’リセットã™ã‚‹" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆã¸ã‚³ãƒ”ーã™ã‚‹" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(デフォルト)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" -msgstr "" +msgstr "上ã¸ç§»å‹•" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" -msgstr "" +msgstr "下ã¸ç§»å‹•" #: src/gui/quitdialog.cpp:52 msgid "Switch server" -msgstr "サーãƒãƒ¼ã‚’切り替ãˆã‚‹" +msgstr "サーãƒãƒ¼ã‚’変更ã™ã‚‹" #: src/gui/quitdialog.cpp:53 msgid "Switch character" -msgstr "ã‚ャラクターを切り替ãˆã‚‹" +msgstr "ã‚ャラクターを変更ã™ã‚‹" #: src/gui/register.cpp:77 msgid "Confirm:" @@ -1664,39 +1661,39 @@ msgstr "確èª:" #: src/gui/register.cpp:108 msgid "Email:" -msgstr "Eメール：" +msgstr "Eメール:" #: src/gui/register.cpp:176 #, c-format msgid "The username needs to be at least %d characters long." -msgstr "ユーザåã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上長ããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "ユーザーåã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/register.cpp:184 #, c-format msgid "The username needs to be less than %d characters long." -msgstr "ユーザåã¯%dæ–‡å—よりçŸããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "ユーザーåã¯%dæ–‡å—以下ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121 #, c-format msgid "The password needs to be at least %d characters long." -msgstr "パスワードã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上長ããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "パスワードã¯å°‘ãªãã¨ã‚‚%dæ–‡å—以上ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128 #, c-format msgid "The password needs to be less than %d characters long." -msgstr "パスワードã¯%dæ–‡å—よりçŸããªãã¦ã¯ã„ã‘ã¾ã›ã‚“。" +msgstr "パスワードã¯%dæ–‡å—以下ã§ãªãã¦ã¯ã„ã‘ã¾ã›ã‚“" #: src/gui/register.cpp:207 msgid "Passwords do not match." -msgstr "パスワードãŒä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“。" +msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“" #: src/gui/serverdialog.cpp:237 msgid "Choose Your Server" -msgstr "サーãƒã‚’é¸ã¶" +msgstr "サーãƒãƒ¼ã‚’é¸æŠžã—ã¦ãã ã•ã„" #: src/gui/serverdialog.cpp:248 msgid "Choose Your Server *** SAFE MODE ***" -msgstr "" +msgstr "サーãƒãƒ¼ã‚’é¸ã‚“ã§ä¸‹ã•ã„ *** セーフモード ***" #: src/gui/serverdialog.cpp:253 msgid "Port:" @@ -1704,19 +1701,19 @@ msgstr "ãƒãƒ¼ãƒˆ:" #: src/gui/serverdialog.cpp:257 msgid "Use same ip for game sub servers" -msgstr "" +msgstr "åŒã˜IPをゲームサブサーãƒãƒ¼ã§ã‚‚使用ã™ã‚‹" #: src/gui/serverdialog.cpp:271 msgid "Server type:" -msgstr "サーãƒãƒ¼å½¢" +msgstr "サーãƒãƒ¼ã‚¿ã‚¤ãƒ—:" #: src/gui/serverdialog.cpp:295 msgid "Load" -msgstr "ãƒãƒ¼ãƒ‰" +msgstr "èªè¾¼ã¿" #: src/gui/serverdialog.cpp:296 msgid "Connect" -msgstr "通信" +msgstr "ãƒã‚°ã‚¤ãƒ³" #: src/gui/serverdialog.cpp:297 msgid "Custom Server" @@ -1724,16 +1721,16 @@ msgstr "カスタムサーãƒãƒ¼" #: src/gui/serverdialog.cpp:402 msgid "Please type both the address and the port of a server." -msgstr "サーãƒã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¨ãƒãƒ¼ãƒˆç•ªå·ã‚’両方入力ã—ã¦ãã ã•ã„。" +msgstr "サーãƒã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¨ãƒãƒ¼ãƒˆã‚’入力ã—ã¦ãã ã•ã„" #: src/gui/serverdialog.cpp:560 #, c-format msgid "Downloading server list...%2.2f%%" -msgstr "" +msgstr "サーãƒãƒ¼ãƒªã‚¹ãƒˆã‚’ダウンãƒãƒ¼ãƒ‰ä¸...%2.2f%%" #: src/gui/serverdialog.cpp:565 msgid "Waiting for server..." -msgstr "サーãƒãƒ¼ã‚’å¾…ã£ã¦ã„ã‚‹..." +msgstr "サーãƒãƒ¼ã‹ã‚‰ã®å¿œç”ã‚’å¾…ã£ã¦ã„ã¾ã™" #: src/gui/serverdialog.cpp:569 msgid "Preparing download" @@ -1741,16 +1738,16 @@ msgstr "ダウンãƒãƒ¼ãƒ‰æº–å‚™ä¸..." #: src/gui/serverdialog.cpp:573 msgid "Error retreiving server list!" -msgstr "" +msgstr "サーãƒãƒ¼ãƒªã‚¹ãƒˆã®èªã¿è¾¼ã¿ã«å¤±æ•—" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" -msgstr "" +msgstr "アップデートãŒå¿…è¦ã§ã™" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" -msgstr "è¦ã‚‹ v%s" +msgstr "v%sãŒå¿…è¦" #: src/gui/setup_audio.cpp:50 msgid "Enable Audio" @@ -1770,11 +1767,11 @@ msgstr "音楽を有効ã«ã™ã‚‹" #: src/gui/setup_audio.cpp:54 msgid "Enable mumble voice chat" -msgstr "" +msgstr "Mumble Voice Chatを有効ã«ã™ã‚‹" #: src/gui/setup_audio.cpp:56 msgid "Download music" -msgstr "音楽ダウンãƒãƒ¼ãƒ‰" +msgstr "音楽をダウンãƒãƒ¼ãƒ‰ã™ã‚‹" #: src/gui/setup_audio.cpp:61 msgid "Audio" @@ -1795,8 +1792,7 @@ msgstr "ãŠçŸ¥ã‚‰ã›" #: src/gui/setup_audio.cpp:120 msgid "You may have to restart your client if you want to download new music" msgstr "" -"æ–°ã—ã„音楽をダウンãƒãƒ¼ãƒ‰ã™ã‚‹å ´åˆã¯ã€ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹å¯èƒ½æ€§" -"ãŒã‚ã‚‹" +"æ–°ã—ã„音楽をダウンãƒãƒ¼ãƒ‰ã™ã‚‹å ´åˆã¯ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™" #: src/gui/setup_audio.cpp:133 msgid "Sound Engine" @@ -1804,39 +1800,39 @@ msgstr "サウンドエンジン" #: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54 msgid "Colors" -msgstr "色彩" +msgstr "色" #: src/gui/setup_chat.cpp:57 msgid "Remove colors from received chat messages" -msgstr "" +msgstr "å—ä¿¡ã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®è‰²ã‚’無効ã«ã™ã‚‹" #: src/gui/setup_chat.cpp:60 msgid "Show chat colors list" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆã®æ–‡å—色リストを表示" #: src/gui/setup_chat.cpp:64 msgid "Commands" -msgstr "" +msgstr "コマンド" #: src/gui/setup_chat.cpp:66 msgid "Allow magic and GM commands in all chat tabs" -msgstr "" +msgstr "å…¨ã¦ã®ã‚¿ãƒ–ã§å‘ªæ–‡ã¨GMコマンドをãƒã‚°ã™ã‚‹" #: src/gui/setup_chat.cpp:70 msgid "Limits" -msgstr "" +msgstr "制é™" #: src/gui/setup_chat.cpp:72 msgid "Limit max chars in chat line" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆã§ä¸€è¡Œã«è¡¨ç¤ºã™ã‚‹æœ€å¤§æ–‡å—数を制é™ã™ã‚‹" #: src/gui/setup_chat.cpp:75 msgid "Limit max lines in chat" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆã§è¡¨ç¤ºã™ã‚‹æœ€å¤§è¡Œæ•°ã‚’制é™ã™ã‚‹" #: src/gui/setup_chat.cpp:79 msgid "Logs" -msgstr "" +msgstr "ãƒã‚°" #: src/gui/setup_chat.cpp:81 msgid "Enable chat Log" @@ -1844,35 +1840,35 @@ msgstr "ãƒãƒ£ãƒƒãƒˆãƒã‚°ã‚’有効" #: src/gui/setup_chat.cpp:84 msgid "Show chat history" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆå±¥æ´ã‚’表示" #: src/gui/setup_chat.cpp:88 msgid "Messages" -msgstr "" +msgstr "メッセージ" #: src/gui/setup_chat.cpp:90 msgid "Hide shop messages" -msgstr "" +msgstr "å£²è²·ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’éš ã™" #: src/gui/setup_chat.cpp:94 msgid "Tabs" -msgstr "" +msgstr "タブ" #: src/gui/setup_chat.cpp:96 msgid "Put all whispers in tabs" -msgstr "プライベートメッセージをタブã«å‡ºã™ã€‚" +msgstr "ã•ã•ã‚„ãををタブã§è¡¨ç¤ºã™ã‚‹" #: src/gui/setup_chat.cpp:99 msgid "Log magic messages in debug tab" -msgstr "" +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" -msgstr "" +msgstr "トレードタブを有効" #: src/gui/setup_chat.cpp:108 msgid "Enable battle tab" @@ -1880,39 +1876,39 @@ msgstr "ãƒãƒˆãƒ«ã‚¿ãƒ–を有効" #: src/gui/setup_chat.cpp:111 msgid "Show battle events" -msgstr "" +msgstr "ãƒãƒˆãƒ«ã‚¤ãƒ™ãƒ³ãƒˆã‚’表示" #: src/gui/setup_chat.cpp:114 msgid "Resize chat tabs if need" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆã‚¿ãƒ–をリサイズã™ã‚‹" #: src/gui/setup_chat.cpp:118 msgid "Time" -msgstr "" +msgstr "時間" #: src/gui/setup_chat.cpp:120 msgid "Use local time" -msgstr "" +msgstr "ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ を使ã†" #: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" -msgstr "" +msgstr "ãã®ä»–" #: src/gui/setup_chat.cpp:125 msgid "Highlight words (separated by comma)" -msgstr "" +msgstr "æ–‡å—ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆ (コンマã§åŒºåˆ‡ã‚‹)" #: src/gui/setup_chat.cpp:128 msgid "Show MVP messages" -msgstr "" +msgstr "MVPメッセージを表示ã™ã‚‹" #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" -msgstr "ã“ã‚ŒãŒãã®è‰²ãŒã©ã®ã‚ˆã†ã«è¦‹ãˆã‚‹ã‹ã§ã™ã€‚" +msgstr "色ã®ä¾‹" #: src/gui/setup_colors.cpp:75 msgid "Type:" -msgstr "タイプ：" +msgstr "タイプ:" #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407 msgid "Static" @@ -1926,7 +1922,7 @@ msgstr "点滅" #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91 #: src/gui/setup_colors.cpp:409 msgid "Rainbow" -msgstr "カラフル" +msgstr "虹" #: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93 #: src/gui/setup_colors.cpp:409 @@ -1935,23 +1931,23 @@ msgstr "スペクトル" #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319 msgid "Delay:" -msgstr "é…延：" +msgstr "é…延:" #: src/gui/setup_colors.cpp:112 msgid "Red:" -msgstr "赤" +msgstr "赤:" #: src/gui/setup_colors.cpp:127 msgid "Green:" -msgstr "ç·‘" +msgstr "ç·‘:" #: src/gui/setup_colors.cpp:142 msgid "Blue:" -msgstr "é’" +msgstr "é’:" #: src/gui/setup_colors.cpp:314 msgid "Alpha:" -msgstr "アルファ：" +msgstr "アルファ:" #: src/gui/setup.cpp:71 msgid "Apply" @@ -1963,11 +1959,11 @@ msgstr "ウィンドウをリセットã™ã‚‹" #: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142 msgid "Press the button to start calibration" -msgstr "ボタンを押ã™ã¨è¼ƒæ£ãŒå§‹ã¾ã‚Šã¾ã™ã€‚" +msgstr "ボタンを押ã—ã¦ã‚«ãƒªãƒ–レーションを開始" #: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140 msgid "Calibrate" -msgstr "変化ã•ã›ã‚‹" +msgstr "カリブレーション" #: src/gui/setup_joystick.cpp:72 msgid "Enable joystick" @@ -1975,7 +1971,7 @@ msgstr "ジョイスティックを使用å¯èƒ½ã«ã™ã‚‹" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "" +msgstr "クライアントãŒç„¡åŠ¹ã®å ´åˆã‚¸ãƒ§ã‚¤ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚’使用" #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -1987,7 +1983,7 @@ msgstr "åœæ¢" #: src/gui/setup_joystick.cpp:149 msgid "Rotate the stick and dont press buttons" -msgstr "" +msgstr "スティックã§å††ã‚’æãボタンã¯æŠ¼ã•ãªã„" #: src/gui/setup_keyboard.cpp:80 msgid "Keyboard" @@ -2007,11 +2003,11 @@ msgstr "標準ã«æˆ»ã™" #: src/gui/setup_keyboard.cpp:133 msgid "Key Conflict(s) Detected." -msgstr "ã‚ーãŒé‡è¤‡ã—ã¦ã„ã¾ã™ã€‚" +msgstr "ショートカットã‚ーãŒé‡è¤‡ã—ã¦ã„ã¾ã™" #: src/gui/setup_other.cpp:39 msgid "Misc" -msgstr "ä»–" +msgstr "ãã®ä»–" #: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125 msgid "Monsters" @@ -2019,87 +2015,87 @@ msgstr "モンスター" #: src/gui/setup_other.cpp:47 msgid "Show damage inflicted to monsters" -msgstr "モンスターã«ä¸ŽãˆãŸæ傷を表示ã™ã‚‹" +msgstr "モンスターã«ä¸ŽãˆãŸãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’表示ã™ã‚‹" #: src/gui/setup_other.cpp:50 msgid "Auto target only reachable monsters" -msgstr "" +msgstr "攻撃å¯èƒ½ç¯„囲ã®ãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼ã®ã¿" #: src/gui/setup_other.cpp:53 msgid "Highlight monster attack range" -msgstr "" +msgstr "モンスターã®æ”»æ’ƒç¯„囲を強調表示" #: src/gui/setup_other.cpp:57 msgid "Show monster hp bar" -msgstr "モンスターHPãƒãƒ¼ã‚’表示ã™ã‚‹" +msgstr "モンスターã®HPãƒãƒ¼ã‚’表示ã™ã‚‹" #: src/gui/setup_other.cpp:60 msgid "Cycle monster targets" -msgstr "" +msgstr "é¸æŠžã—ãŸãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼ã‚’円ã§è¡¨ç¤º" #: src/gui/setup_other.cpp:66 msgid "Show warps particles" -msgstr "" +msgstr "ワープパーティクルを表示" #: src/gui/setup_other.cpp:69 msgid "Highlight map portals" -msgstr "" +msgstr "マップãƒãƒ¼ã‚¿ãƒ«ã‚’強調表示" #: src/gui/setup_other.cpp:72 msgid "Highlight floor items" -msgstr "" +msgstr "床ã«è½ã¡ã¦ã„るアイテムを強調表示" #: src/gui/setup_other.cpp:75 msgid "Highlight player attack range" -msgstr "" +msgstr "攻撃å¯èƒ½ç¯„囲を強調表示" #: src/gui/setup_other.cpp:78 msgid "Show extended minimaps" -msgstr "" +msgstr "拡張ミニマップを表示ã™ã‚‹" #: src/gui/setup_other.cpp:81 msgid "Draw path" -msgstr "パスをæç”»" +msgstr "パスを表示ã•ã›ã‚‹" #: src/gui/setup_other.cpp:84 msgid "Draw hotkeys on map" -msgstr "" +msgstr "マップã«ãƒ›ãƒƒãƒˆã‚ーを表示ã•ã›ã‚‹" #: src/gui/setup_other.cpp:87 msgid "Enable lazy scrolling" -msgstr "" +msgstr "レイジースクãƒãƒ¼ãƒ«ã‚’有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:90 msgid "Scroll laziness" -msgstr "" +msgstr "レイジースクãƒãƒ¼ãƒ«" #: src/gui/setup_other.cpp:93 msgid "Scroll radius" -msgstr "" +msgstr "ラディアススクãƒãƒ¼ãƒ«" #: src/gui/setup_other.cpp:97 msgid "Moving" -msgstr "" +msgstr "動作" #: src/gui/setup_other.cpp:99 msgid "Auto fix position" -msgstr "" +msgstr "自動ã§ä½ç½®ã‚’ä¿®æ£" #: src/gui/setup_other.cpp:102 msgid "Attack while moving" -msgstr "" +msgstr "移動ä¸ã‚‚攻撃ã™ã‚‹" #: src/gui/setup_other.cpp:105 msgid "Sync player move" -msgstr "" +msgstr "プレイヤーã®å‹•ãã‚’åŒåŒ–ã™ã‚‹" #: src/gui/setup_other.cpp:108 msgid "Crazy move A program" -msgstr "" +msgstr "クレイジームーブ A プãƒã‚°ãƒ©ãƒ " #: src/gui/setup_other.cpp:112 msgid "Player" -msgstr "" +msgstr "プレイヤー" #: src/gui/setup_other.cpp:114 msgid "Show own hp bar" @@ -2107,83 +2103,83 @@ msgstr "自分ã®HPãƒãƒ¼ã‚’表示ã™ã‚‹" #: src/gui/setup_other.cpp:117 msgid "Enable quick stats" -msgstr "" +msgstr "クイックスタッツを有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:120 msgid "Cycle player targets" -msgstr "" +msgstr "é¸æŠžã—ãŸãƒ—レイヤーを円ã§è¡¨ç¤º" #: src/gui/setup_other.cpp:123 msgid "Show job exp messages" -msgstr "" +msgstr "ジョブExpメッセージを表示ã™ã‚‹" #: src/gui/setup_other.cpp:126 msgid "Show players popups" -msgstr "" +msgstr "プレイヤーãƒãƒƒãƒ—アップを表示ã™ã‚‹" #: src/gui/setup_other.cpp:129 msgid "Afk message" -msgstr "" +msgstr "AFKメッセージ" #: src/gui/setup_other.cpp:132 msgid "Show job" -msgstr "仕事を表示ã™ã‚‹" +msgstr "ジョブを表示ã™ã‚‹" #: src/gui/setup_other.cpp:135 msgid "Enable attack filter" -msgstr "" +msgstr "攻撃フィルターを有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" -msgstr "" +msgstr "アドãƒãƒ¼ãƒˆãƒ—ãƒãƒˆã‚³ãƒ«ã‚’有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" -msgstr "" +msgstr "売買リクエストをå—ã‘入れる" #: src/gui/setup_other.cpp:147 msgid "Enable shop mode" -msgstr "" +msgstr "ショップモードを有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" -msgstr "" +msgstr "NPCダイアãƒã‚°ã‚’記録ã™ã‚‹" #: src/gui/setup_other.cpp:157 msgid "Bots support" -msgstr "" +msgstr "ボットサãƒãƒ¼ãƒˆ" #: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" -msgstr "" +msgstr "オークションボットã®ã‚µãƒãƒ¼ãƒˆ" #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" -msgstr "" +msgstr "ギルドサãƒãƒ¼ãƒˆã‚’無効ã«ã—ギルドボットを有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:168 msgid "Enable server side attack" -msgstr "" +msgstr "サーãƒãƒ¼ã‚µã‚¤ãƒ‰ã‚¢ã‚¿ãƒƒã‚¯ã‚’有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:171 msgid "Enable bot checker" -msgstr "" +msgstr "ボットãƒã‚§ãƒƒã‚«ãƒ¼ã‚’有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection (do not disable)" -msgstr "" +msgstr "ä¸å®‰å®šãªã‚µãƒ¼ãƒãƒ¼ä¿è·ã‚’有効ã«ã™ã‚‹(無効ã«ã—ãªã„)" #: src/gui/setup_other.cpp:178 msgid "Enable debug log" -msgstr "デãƒãƒƒã‚°ãƒ«ãƒ¼ãƒ—を有効ã«ã™ã‚‹" +msgstr "デãƒãƒƒã‚°ãƒã‚°ã‚’有効ã«ã™ã‚‹" #: src/gui/setup_other.cpp:181 msgid "Low traffic mode" -msgstr "" +msgstr "低トラフィックモード" #: src/gui/setup_other.cpp:184 msgid "Hide shield sprite" -msgstr "" +msgstr "ã‚·ãƒ¼ãƒ«ãƒ‰ã‚¹ãƒ—ãƒ©ã‚¤ãƒˆã‚’éš ã™" #: src/gui/setup_other.cpp:187 msgid "Show background" @@ -2192,54 +2188,57 @@ msgstr "背景を表示ã™ã‚‹" #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" +"より良ã„パフォーマンス (より良ã„パフォーマンスã®ç‚ºã«ã¯æœ‰åŠ¹ã«ã—ã¦ä¸‹ã•ã„)" #: src/gui/setup_perfomance.cpp:58 msgid "Auto adjust perfomance" -msgstr "" +msgstr "パフォーマンスを自動調整" #: src/gui/setup_perfomance.cpp:61 msgid "Hw acceleration" -msgstr "" +msgstr "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³" #: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" +"é€éŽã‚ャッシュを有効化ã™ã‚‹ (ソフトウェア-メモリを沢山使用ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾" +"ã™)" #: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" -msgstr "" +msgstr "マップ削減を有効化 (ソフトウェア)" #: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" -msgstr "" +msgstr "より良ã„クオリティ (より良ã„パフォーマンスã®ç‚ºã«ã¯ç„¡åŠ¹ã«ã—ã¦ä¸‹ã•ã„)" #: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" -msgstr "" +msgstr "アルファãƒãƒ£ãƒ³ãƒãƒ«ä¿®æ£ã‚’有効化 (ソフトウェア-é‡ããªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™)" #: src/gui/setup_perfomance.cpp:77 msgid "Show beings transparency" -msgstr "" +msgstr "é€éŽã‚’表示ã™ã‚‹" #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." -msgstr "" +msgstr "スプライトリオーダーを有効ã«ã™ã‚‹." #: src/gui/setup_perfomance.cpp:83 msgid "Small memory (enable for lower memory usage)" -msgstr "" +msgstr "メモリ優先 (メモリ使用を少ãªãã™ã‚‹ã«ã¯æœ‰åŠ¹ã«ã—ã¦ä¸‹ã•ã„)" #: src/gui/setup_perfomance.cpp:86 msgid "Disable advanced beings caching (Software)" -msgstr "" +msgstr "アドãƒãƒ³ã‚¹ã‚ャッシュを無効ã«ã™ã‚‹ (ソフトウェア)" #: src/gui/setup_perfomance.cpp:89 msgid "Disable beings caching (Software)" -msgstr "" +msgstr "ã‚ャッシュを無効ã«ã™ã‚‹ (ソフトウェア)" #: src/gui/setup_players.cpp:54 msgid "Show gender" -msgstr "性的を表示ã™ã‚‹" +msgstr "性別を表示ã™ã‚‹" #: src/gui/setup_players.cpp:57 msgid "Show level" @@ -2251,11 +2250,11 @@ msgstr "自分ã®åå‰ã‚’表示ã™ã‚‹" #: src/gui/setup_players.cpp:63 msgid "Enable extended mouse targeting" -msgstr "" +msgstr "エクステンドマウスターゲットを有効ã«ã™ã‚‹" #: src/gui/setup_players.cpp:66 msgid "Target dead players" -msgstr "" +msgstr "æ»ã‚“ã プレイヤーã®æ¨™çš„を有効" #: src/gui/setup_players.cpp:69 msgid "Visible names" @@ -2263,23 +2262,23 @@ msgstr "åå‰ã‚’表示ã™ã‚‹" #: src/gui/setup_players.cpp:72 msgid "Secure trades" -msgstr "" +msgstr "トレードを安全化ã™ã‚‹" #: src/gui/setup_players.cpp:75 msgid "Unsecure chars in names" -msgstr "" +msgstr "ã‚»ã‚ュリティ上安全ã§ã¯ãªã„æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™" #: src/gui/setup_players.cpp:78 msgid "Show statuses" -msgstr "" +msgstr "ステータスを表示ã™ã‚‹" #: src/gui/setup_players.cpp:81 msgid "Show ip addresses on screenshots" -msgstr "" +msgstr "スクリーンショットã«IPを表示ã•ã›ã‚‹" #: src/gui/setup_players.cpp:84 msgid "Allow self heal with mouse click" -msgstr "" +msgstr "クリックã§ãƒ’ール" #: src/gui/setup_relations.cpp:65 msgid "Relation" @@ -2303,23 +2302,23 @@ msgstr "無視ã™ã‚‹" #: src/gui/setup_relations.cpp:74 msgid "Erased" -msgstr "消ã—ãŸ" +msgstr "削除済" #: src/gui/setup_relations.cpp:75 msgid "Blacklisted" -msgstr "" +msgstr "ブラックリスト化ã•ã‚Œã¦ã„ã¾ã™" #: src/gui/setup_relations.cpp:76 msgid "Enemy" -msgstr "" +msgstr "敵" #: src/gui/setup_relations.cpp:240 msgid "Allow trading" -msgstr "交æ›ã‚’承èªã™ã‚‹" +msgstr "トレードをå—付ã‘ã‚‹" #: src/gui/setup_relations.cpp:242 msgid "Allow whispers" -msgstr "プライベートメッセージをå—ã‘å–ã‚‹ã“ã¨ã‚’承èªã™ã‚‹" +msgstr "å…¨ã¦ã®ã•ã•ã‚„ãã‚’å—ã‘å–ã‚‹" #: src/gui/setup_relations.cpp:245 msgid "Old" @@ -2327,11 +2326,11 @@ msgstr "å¤ã„" #: src/gui/setup_relations.cpp:247 msgid "Relations" -msgstr "" +msgstr "関係" #: src/gui/setup_relations.cpp:272 msgid "When ignoring:" -msgstr "無視ã®éš›ã«ã¯ï¼š" +msgstr "無視ã®éš›ã«ã¯:" #: src/gui/setup_theme.cpp:108 msgid "Tiny (10)" @@ -2339,79 +2338,79 @@ msgstr "å°ã•ã„ (10)" #: src/gui/setup_theme.cpp:109 msgid "Small (11)" -msgstr "å°ï¼ˆ11）" +msgstr "å° (11)" #: src/gui/setup_theme.cpp:110 msgid "Medium (12)" -msgstr "媒体（12）" +msgstr "ä¸ (12)" #: src/gui/setup_theme.cpp:111 msgid "Large (13)" -msgstr "大（13）" +msgstr "大1 (13)" #: src/gui/setup_theme.cpp:112 msgid "Big (14)" -msgstr "ビッグ（14）" +msgstr "大2 (14)" #: src/gui/setup_theme.cpp:113 msgid "Huge (15)" -msgstr "巨大（15）" +msgstr "最大 (15)" #: src/gui/setup_theme.cpp:146 msgid "Chinese (China)" -msgstr "" +msgstr "ä¸å›½èªž (ä¸å›½)" #: src/gui/setup_theme.cpp:147 msgid "Czech" -msgstr "" +msgstr "ãƒã‚§ã‚³èªž" #: src/gui/setup_theme.cpp:148 msgid "English" -msgstr "" +msgstr "英語" #: src/gui/setup_theme.cpp:149 msgid "Finnish" -msgstr "" +msgstr "フィンランド語" #: src/gui/setup_theme.cpp:150 msgid "French" -msgstr "" +msgstr "フランス語" #: src/gui/setup_theme.cpp:151 msgid "German" -msgstr "" +msgstr "ドイツ語" #: src/gui/setup_theme.cpp:152 msgid "Indonesian" -msgstr "" +msgstr "インドãƒã‚·ã‚¢èªž" #: src/gui/setup_theme.cpp:153 msgid "Polish" -msgstr "" +msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" #: src/gui/setup_theme.cpp:154 msgid "Japanese" -msgstr "" +msgstr "日本語" #: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" -msgstr "" +msgstr "ドイツ語 (ベルギー/フランドル)" #: src/gui/setup_theme.cpp:156 msgid "Portuguese" -msgstr "" +msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" #: src/gui/setup_theme.cpp:157 msgid "Portuguese (Brazilian)" -msgstr "" +msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž (ブラジル)" #: src/gui/setup_theme.cpp:158 msgid "Russian" -msgstr "" +msgstr "ãƒã‚·ã‚¢èªž" #: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" -msgstr "" +msgstr "スペイン語 (カスティリヤ)" #: src/gui/setup_theme.cpp:191 msgid "Theme" @@ -2423,7 +2422,7 @@ msgstr "GUIテーマ" #: src/gui/setup_theme.cpp:194 msgid "Language" -msgstr "" +msgstr "言語" #: src/gui/setup_theme.cpp:195 msgid "Main Font" @@ -2435,7 +2434,7 @@ msgstr "太å—フォント" #: src/gui/setup_theme.cpp:197 msgid "Particle font" -msgstr "ç²’åã®ãƒ•ã‚©ãƒ³ãƒˆ" +msgstr "パーティクルフォント" #: src/gui/setup_theme.cpp:198 msgid "Help font" @@ -2443,11 +2442,11 @@ msgstr "ヘルプフォント" #: src/gui/setup_theme.cpp:199 msgid "Secure font" -msgstr "" +msgstr "安全ãªãƒ•ã‚©ãƒ³ãƒˆ" #: src/gui/setup_theme.cpp:200 msgid "Japanese font" -msgstr "" +msgstr "日本語フォント" #: src/gui/setup_theme.cpp:237 msgid "Font size" @@ -2455,16 +2454,16 @@ msgstr "フォントサイズ" #: src/gui/setup_theme.cpp:378 msgid "Theme Changed" -msgstr "テーマã¯å¤‰ãˆã¾ã—ãŸ" +msgstr "テーマを変更ã—ã¾ã—ãŸ" #: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." -msgstr "è¨å®šå¤‰æ›´ã®ãŸã‚ã€ã‚¢ãƒ—リケーションをå†èµ·å‹•ã—ã¦ãã ã•ã„。" +msgstr "è¨å®šå¤‰æ›´ã®ç‚ºã‚¢ãƒ—リケーションをå†èµ·å‹•ã—ã¦ãã ã•ã„" #: src/gui/setup_video.cpp:194 msgid "Software" -msgstr "ソフトウェア" +msgstr "マップãƒãƒ¼ã‚¿ãƒ«ã‚’強調表示" #: src/gui/setup_video.cpp:195 msgid "Fast OpenGL" @@ -2484,11 +2483,11 @@ msgstr "テã‚スト" #: src/gui/setup_video.cpp:227 msgid "Bubbles, no names" -msgstr "ãƒãƒ–ルã€åå‰è¡¨ç¤ºãªã—" +msgstr "å¹ã出ã—,åå‰è¡¨ç¤ºãªã—" #: src/gui/setup_video.cpp:229 msgid "Bubbles with names" -msgstr "ãƒãƒ–ルã€åå‰è¡¨ç¤ºã‚ã‚Š" +msgstr "å¹ã出ã—,åå‰è¡¨ç¤ºã‚ã‚Š" #: src/gui/setup_video.cpp:242 msgid "off" @@ -2520,16 +2519,16 @@ msgstr "カスタムカーソル" #: src/gui/setup_video.cpp:291 msgid "Particle effects" -msgstr "ç²’å効果" +msgstr "パーティクル効果" #: src/gui/setup_video.cpp:293 msgid "Show pickup notification" -msgstr "ピックアップ通知表示" +msgstr "åŽé›†é€šçŸ¥è¡¨ç¤º" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:295 msgid "in chat" -msgstr "ãƒãƒ£ãƒƒãƒˆä¸" +msgstr "ãƒãƒ£ãƒƒãƒˆã§" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:297 @@ -2538,12 +2537,12 @@ msgstr "ç”»é¢å†…ã§" #: src/gui/setup_video.cpp:302 msgid "FPS limit:" -msgstr "FPSリミット" +msgstr "FPSリミット:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 #: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " -msgstr "" +msgstr "Alt FPS リミット: " #: src/gui/setup_video.cpp:321 msgid "Overhead text" @@ -2559,7 +2558,7 @@ msgstr "環境FX" #: src/gui/setup_video.cpp:324 msgid "Particle detail" -msgstr "ç²’åã®è©³ç´°" +msgstr "パーティクルã®è©³ç´°" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 @@ -2570,12 +2569,12 @@ msgstr "ãªã—" #: src/gui/setup_video.cpp:484 msgid "" "Failed to switch to windowed mode and restoration of old mode also failed!" -msgstr "ウインドウモードã§ã‚‚å‰ã®ãƒ¢ãƒ¼ãƒ‰ã®å¾©å…ƒã‚‚ã¾ãŸå¤±æ•—ã—ã¾ã—ãŸï¼" +msgstr "ウインドウモードã€ã¾ãŸå‰ãƒ¢ãƒ¼ãƒ‰ã®å¾©å…ƒã«ã‚‚失敗ã—ã¾ã—ãŸ" #: src/gui/setup_video.cpp:490 msgid "" "Failed to switch to fullscreen mode and restoration of old mode also failed!" -msgstr "フルスクリーンモードã§ã‚‚å‰ã®ãƒ¢ãƒ¼ãƒ‰ã®å¾©å…ƒã‚‚ã¾ãŸå¤±æ•—ã—ã¾ã—ãŸï¼" +msgstr "フルスクリーンモードã€ã¾ãŸå‰ãƒ¢ãƒ¼ãƒ‰ã®å¾©å…ƒã«ã‚‚失敗ã—ã¾ã—ãŸ" #: src/gui/setup_video.cpp:501 msgid "Switching to Full Screen" @@ -2583,7 +2582,7 @@ msgstr "フルスクリーンã«å¤‰æ›´" #: src/gui/setup_video.cpp:502 msgid "Restart needed for changes to take effect." -msgstr "è¨å®šå¤‰æ›´ã®ãŸã‚ã€å†èµ·å‹•ã‚’ã—ã¦ãã ã•ã„。" +msgstr "è¨å®šå¤‰æ›´ã®ç‚ºã€å†èµ·å‹•ã‚’ã—ã¦ãã ã•ã„" #: src/gui/setup_video.cpp:514 msgid "Changing to OpenGL" @@ -2595,39 +2594,39 @@ msgstr "OpenGLã®è¨å®šã‚’変更ã™ã‚‹ãŸã‚ã€å†èµ·å‹•ã‚’ã—ã¦ãã ã•ã„。 #: src/gui/setup_video.cpp:602 msgid "Custom resolution (example: 1024x768)" -msgstr "カスタム解åƒåº¦ï¼ˆä¾‹ï¼š1024 × 768）" +msgstr "カスタム解åƒåº¦ (例: 1024x768)" #: src/gui/setup_video.cpp:603 msgid "Enter new resolution: " -msgstr "" +msgstr "解åƒåº¦ã‚’入力ã—ã¦ä¸‹ã•ã„: " #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623 msgid "Screen Resolution Changed" -msgstr "スクリーンã®è§£åƒåº¦ãŒå¤‰ã‚ã‚Šã¾ã—ãŸã€‚" +msgstr "スクリーンã®è§£åƒåº¦ã‚’変更ã—ã¾ã—ãŸ" #: src/gui/setup_video.cpp:621 msgid "Some windows may be moved to fit the lowered resolution." -msgstr "" +msgstr "解åƒåº¦ã®å¤‰æ›´ã«åˆã‚ã›ã€ã„ãã¤ã‹ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒç§»å‹•ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™" #: src/gui/setup_video.cpp:654 msgid "Particle Effect Settings Changed." -msgstr "" +msgstr "パーティクル効果ã®è¨å®šã‚’変更ã—ã¾ã—ãŸ" #: src/gui/setup_video.cpp:655 msgid "Changes will take effect on map change." -msgstr "変化ã¯ãƒžãƒƒãƒ—ãŒã‹ã‚ã£ãŸã¨ãã‹ã‚‰å½±éŸ¿ã—ã¾ã™ã€‚" +msgstr "変更ã¯ãƒžãƒƒãƒ—ãŒå¤‰ã‚ã£ãŸæ™‚ã«æœ‰åŠ¹ã«ãªã‚Šã¾ã™" #: src/gui/shopwindow.cpp:75 msgid "Personal Shop" -msgstr "パーサナルショップ" +msgstr "最大 (15)" #: src/gui/shopwindow.cpp:118 msgid "Buy items" -msgstr "商å“ã‚’è²·ã†" +msgstr "購入" #: src/gui/shopwindow.cpp:119 msgid "Sell items" -msgstr "商å“を売る" +msgstr "販売" #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124 #: src/gui/tradewindow.cpp:89 @@ -2636,25 +2635,25 @@ msgstr "è¿½åŠ " #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126 msgid "Announce" -msgstr "発表ã™ã‚‹" +msgstr "アナウンス" #: src/gui/shopwindow.cpp:127 msgid "Show links in announce" -msgstr "" +msgstr "アナウンスã«ãƒªãƒ³ã‚¯ã‚’表示ã™ã‚‹" #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149 msgid "Auction" -msgstr "" +msgstr "オークション" #: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" -msgstr "å–引è¦æ±‚" +msgstr "トレードをリクエスト" #: src/gui/shopwindow.cpp:749 #, c-format msgid "%s wants to %s %s do you accept?" -msgstr "" +msgstr "%sãŒ%s %sを希望ã—ã¦ã„ã¾ã™ã€‚承èªã—ã¾ã™ã‹ï¼Ÿ" #: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81 msgid "Skills" @@ -2662,7 +2661,7 @@ msgstr "スã‚ル" #: src/gui/skilldialog.cpp:288 msgid "Up" -msgstr "上ã’ã‚‹" +msgstr "上" #: src/gui/skilldialog.cpp:341 #, c-format @@ -2687,202 +2686,212 @@ msgstr "Lvl: %d" #: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" -msgstr "Lvl：%d (%+d)" +msgstr "Lvl: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "ギルド" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." -msgstr "" +msgstr "ユーザー %sã‚’ã€ã‚®ãƒ«ãƒ‰ %sã«æ‹›å¾…ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." -msgstr "" +msgstr "ギルド %sã¸é€€ä¼šå±Šã‚’出ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" -msgstr "" +msgstr "ギルドã¸ãƒ¡ãƒ³ãƒãƒ¼ã‚’招待ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" -msgstr "" +msgstr "ギルド %sã«èª°ã‚’招待ã—ã¾ã™ã‹ï¼Ÿ" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" -msgstr "ギルドを残ã™ï¼Ÿ" +msgstr "ギルドã‹ã‚‰é€€ä¼šã—ã¾ã™ã‹ï¼Ÿ" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" -msgstr "" +msgstr "ギルド %sã‹ã‚‰æœ¬å½“ã«é€€ä¼šã—ã¾ã™ã‹?" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "パーティー" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." -msgstr "" +msgstr "ユーザー %s をパーティã«æ‹›å¾…ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." -msgstr "" +msgstr "パーティ %sã¸é€€ä¼šå±Šã‚’出ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" -msgstr "" +msgstr "メンãƒãƒ¼ã‚’パーティã«æ‹›å¾…ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" -msgstr "" +msgstr "パーティ %sã«èª°ã‚’招待ã—ã¾ã™ã‹?" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" -msgstr "パーティーを残ã™ï¼Ÿ" +msgstr "パーティーã‹ã‚‰é€€ä¼šã—ã¾ã™ã‹ï¼Ÿ" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" -msgstr "" +msgstr "パーティ %sã‹ã‚‰æœ¬å½“ã«é€€ä¼šã—ã¾ã™ã‹?" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" -msgstr "航法" +msgstr "ナビ" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" -msgstr "" +msgstr "Atk" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" -msgstr "" +msgstr "優先ã•ã‚Œã‚‹æ•µ" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" -msgstr "" +msgstr "敵を攻撃ã™ã‚‹" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" -msgstr "" +msgstr "敵を無視ã™ã‚‹" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "ギルドを作æˆã™ã‚‹" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "パーティを作る" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" -msgstr "ソシアル" +msgstr "ソーシャル" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "招待" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." -msgstr "" +msgstr "%sã‹ã‚‰ã®ãƒ‘ーティ招待を承èªã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." -msgstr "" +msgstr "%sã‹ã‚‰ã®ãƒ‘ーティ招待を拒å¦ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." -msgstr "" +msgstr "%sã‹ã‚‰ã®ã‚®ãƒ«ãƒ‰æ‹›å¾…を承èªã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." -msgstr "" +msgstr "%sã‹ã‚‰ã®ã‚®ãƒ«ãƒ‰æ‹›å¾…ã‚’æ‹’å¦ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." -msgstr "" +msgstr "ギルド %sを作æˆã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." -msgstr "" +msgstr "パーティ %sを作æˆã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "ギルドå" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." -msgstr "サーãƒãƒ¼ã‚’é¸ã‚“ã§ãã ã•ã„。" +msgstr "ギルドåã‚’é¸ã‚“ã§ãã ã•ã„" -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." -msgstr "" +msgstr "ギルド招待を承èªã—ãŸãŒæ—¢ã«å…¥ä¼šã—ã¦ã„ã¾ã™" -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." -msgstr "" +msgstr "%sãŒã‚®ãƒ«ãƒ‰ %sã¸æ‹›å¾…ã—ã¦ã„ã¾ã™" -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" -msgstr "ギルド招待をå—ã‘入れ" +msgstr "ギルド招待をå—ã‘入れる" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." -msgstr "パーティã¸ã®æ‹›å¾…ã‚’å—ã‘å–ã‚Šã¾ã—ãŸãŒã€ã‚‚ã†æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚" +msgstr "パーティ招待を承èªã—ãŸãŒæ—¢ã«å…¥ä¼šã—ã¦ã„ã¾ã™" -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." -msgstr "" +msgstr "パーティã«æ‹›å¾…ã•ã‚Œã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." -msgstr "" +msgstr "パーティ %sã«æ‹›å¾…ã•ã‚Œã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." -msgstr "%sã¯ã‚ãªãŸã‚’パーティã«æ‹›å¾…ã—ã¾ã—ãŸã€‚" +msgstr "%sã¯ã‚ãªãŸã‚’パーティã«æ‹›å¾…ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, c-format msgid "%s has invited you to join the %s party." -msgstr "%sã¯ã‚ãªãŸã‚’%sã¨ã„ã†ãƒ‘ーティã«æ‹›å¾…ã—ã¾ã—ãŸã€‚" +msgstr "%sã¯ã‚ãªãŸã‚’%sã¨ã„ã†ãƒ‘ーティã«æ‹›å¾…ã—ã¾ã—ãŸ" -#: src/gui/socialwindow.cpp:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" -msgstr "パーティ招待をå—ã‘入れã¾ã™ã€‚" +msgstr "パーティ招待をå—ã‘入れã¾ã™" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 msgid "Cannot create party. You are already in a party" -msgstr "パーティーを作æˆã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。もã†ãƒ‘ーティーã«å…¥ã£ã¦ã„ã¾ã™ã€‚" +msgstr "パーティーを作æˆã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。もã†ãƒ‘ーティーã«å…¥ã£ã¦ã„ã¾ã™" -#: src/gui/socialwindow.cpp:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "パーティå" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "パーティåã‚’é¸ã‚“ã§ãã ã•ã„" #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88 msgid "Specials" -msgstr "スペシアール" +msgstr "スペシャル" #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 #: src/gui/statuswindow.cpp:337 @@ -2894,7 +2903,7 @@ msgstr "レベル: %d" #: src/gui/statuswindow.cpp:304 #, c-format msgid "Money: %s" -msgstr "GP:%s" +msgstr "GP: %s" #: src/gui/statuswindow.cpp:151 msgid "HP:" @@ -2920,17 +2929,17 @@ msgstr "ジョブãƒã‚¤ãƒ³ãƒˆ:" #: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 #, c-format msgid "Character points: %d" -msgstr "ã‚ャラクターãƒã‚¤ãƒ³ãƒˆï¼š %d" +msgstr "ã‚ャラクターãƒã‚¤ãƒ³ãƒˆ: %d" #: src/gui/statuswindow.cpp:269 #, c-format msgid "Level: %d (GM %d)" -msgstr "レベル： %d (GM %d)" +msgstr "レベル: %d (GM %d)" #: src/gui/statuswindow.cpp:325 #, c-format msgid "Correction points: %d" -msgstr "ä¿®æ£ç‚¹ï¼š %d" +msgstr "ä¿®æ£ç‚¹: %d" #: src/gui/textcommandeditor.cpp:113 msgid "No Target" @@ -2938,7 +2947,7 @@ msgstr "ターゲットãªã—" #: src/gui/textcommandeditor.cpp:114 msgid "Allow Target" -msgstr "ターゲットを許å¯ã™ã‚‹" +msgstr "ターゲットを有効ã«ã™ã‚‹" #: src/gui/textcommandeditor.cpp:115 msgid "Need Target" @@ -2950,19 +2959,19 @@ msgstr "ジェãƒãƒ©ãƒ«é”法" #: src/gui/textcommandeditor.cpp:121 msgid "Life Magic" -msgstr "命é”法" +msgstr "ライフé”法" #: src/gui/textcommandeditor.cpp:122 msgid "War Magic" -msgstr "戦争é”法" +msgstr "ウォーé”法" #: src/gui/textcommandeditor.cpp:123 msgid "Transmute Magic" -msgstr "変ã‚ã‚‹é”法" +msgstr "トランスミュートé”法" #: src/gui/textcommandeditor.cpp:124 msgid "Nature Magic" -msgstr "自然é”法" +msgstr "ãƒã‚¤ãƒãƒ£ãƒ¼é”法" #: src/gui/textcommandeditor.cpp:125 msgid "Astral Magic" @@ -2982,39 +2991,39 @@ msgstr "ä»–" #: src/gui/textcommandeditor.cpp:194 msgid "Symbol:" -msgstr "シンボル：" +msgstr "シンボル:" #: src/gui/textcommandeditor.cpp:197 msgid "Command:" -msgstr "コマンド：" +msgstr "コマンド:" #: src/gui/textcommandeditor.cpp:200 msgid "Comment:" -msgstr "" +msgstr "コメント:" #: src/gui/textcommandeditor.cpp:203 msgid "Mana:" -msgstr "マナ：" +msgstr "マナ:" #: src/gui/textcommandeditor.cpp:209 msgid "Target Type:" -msgstr "ターゲットタイプ：" +msgstr "ターゲットタイプ:" #: src/gui/textcommandeditor.cpp:215 msgid "Icon:" -msgstr "アイコン" +msgstr "アイコン:" #: src/gui/textcommandeditor.cpp:221 msgid "Magic level:" -msgstr "é”法レベル：" +msgstr "é”法レベル:" #: src/gui/textcommandeditor.cpp:227 msgid "Magic School:" -msgstr "é”法å¦åœ’" +msgstr "é”法å¦åœ’:" #: src/gui/textcommandeditor.cpp:233 msgid "School level:" -msgstr "å¦æ ¡ãƒ¬ãƒ™ãƒ«ï¼š" +msgstr "å¦æ ¡ãƒ¬ãƒ™ãƒ«:" #: src/gui/textcommandeditor.cpp:238 msgid "Save" @@ -3022,23 +3031,23 @@ msgstr "セーブ" #: src/gui/tradewindow.cpp:60 msgid "Propose trade" -msgstr "交æ›ã®æ案" +msgstr "トレードを申請ã™ã‚‹" #: src/gui/tradewindow.cpp:61 msgid "Confirmed. Waiting..." -msgstr "確èªã—ã¾ã—ãŸã€‚å¾…ã£ã¦ã„ã¾ã™â€¦ã€‚" +msgstr "確èªä¸" #: src/gui/tradewindow.cpp:62 msgid "Agree trade" -msgstr "交æ›ã‚’了承ã™ã‚‹" +msgstr "トレードを了承ã™ã‚‹" #: src/gui/tradewindow.cpp:63 msgid "Agreed. Waiting..." -msgstr "了承ã—ã¾ã—ãŸã€‚å¾…ã£ã¦ã„ã¾ã™â€¦ã€‚" +msgstr "了承ã—ã¾ã—ãŸ" #: src/gui/tradewindow.cpp:66 msgid "Trade: You" -msgstr "交æ›:ã‚ãªãŸã¨" +msgstr "交æ›:自分" #: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167 #, c-format @@ -3047,7 +3056,7 @@ msgstr "%sを手ã«å…¥ã‚ŒãŸ" #: src/gui/tradewindow.cpp:112 msgid "You give:" -msgstr "ã‚ã’る物:" +msgstr "トレードã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ :" #: src/gui/tradewindow.cpp:116 msgid "Change" @@ -3055,46 +3064,46 @@ msgstr "変更" #: src/gui/tradewindow.cpp:375 msgid "You don't have enough money." -msgstr "ç¾é‡‘ä¸è¶³ã§ã™ã€‚" +msgstr "ç¾é‡‘ä¸è¶³ã§ã™" #: src/gui/tradewindow.cpp:454 msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -"ã‚¢ã‚¤ãƒ†ãƒ ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ã«å¤±æ•—ã—ã¾ã—ãŸã€‚アイテム一種類を一ã¤ã®ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ä¸Šã§é‡" -"複ã—ã¦è¿½åŠ ã™ã‚‹ã“ã¨ã¯å‡ºæ¥ã¾ã›ã‚“ï¼" +"アイテムã®è¿½åŠ ã«å¤±æ•—ã—ã¾ã—ãŸã€‚アイテム一種類を一ã¤ã®ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ä¸Šã§é‡è¤‡ã—ã¦è¿½" +"åŠ ã™ã‚‹ã“ã¨ã¯å‡ºæ¥ã¾ã›ã‚“" #: src/gui/unregisterdialog.cpp:54 #, c-format msgid "Name: %s" msgstr "åå‰: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "æ›´æ–°ã—ã¦ã„ã¾ã™..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "接続ã—ã¦ã„ã¾ã™..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "プレイ" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." -msgstr "##1 アップデートã¯å®Œäº†ã—ã¦ã„ã¾ã›ã‚“。" +msgstr "##1 アップデートã¯å®Œäº†ã—ã¦ã„ã¾ã›ã‚“" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" -msgstr "##1 ã¨ã¦ã‚‚推奨ã•ã‚Œã¾ã™ã€‚" +msgstr "##1 ã™ã‚‹äº‹ã‚’å¼·ã推奨ã—ã¾ã™" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." -msgstr "" +msgstr "##1 ã—ã°ã‚‰ããŸã£ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "完了" @@ -3108,15 +3117,15 @@ msgstr "å‹é”ã®åå‰" #: src/gui/userpalette.cpp:118 msgid "Disregarded Names" -msgstr "無視åå‰" +msgstr "無視ã—ã¦ã„ã‚‹åå‰" #: src/gui/userpalette.cpp:119 msgid "Ignored Names" -msgstr "無視ã•ã‚ŒãŸåå‰" +msgstr "無視ã—ã¦ã„ã‚‹åå‰" #: src/gui/userpalette.cpp:120 msgid "Erased Names" -msgstr "消去åå‰" +msgstr "削除ã—ãŸåå‰" #: src/gui/userpalette.cpp:121 msgid "Other Players' Names" @@ -3128,11 +3137,11 @@ msgstr "自分ã®åå‰" #: src/gui/userpalette.cpp:123 msgid "GM Names" -msgstr "ゲームマスターå" +msgstr "GMå" #: src/gui/userpalette.cpp:124 msgid "NPCs" -msgstr "NPCãŸã¡" +msgstr "NPC" #: src/gui/userpalette.cpp:126 msgid "Monster HP bar" @@ -3144,7 +3153,7 @@ msgstr "モンスターã®HPãƒãƒ¼ï¼ˆäºŒç•ªç›®ã®è‰²ï¼‰" #: src/gui/userpalette.cpp:129 msgid "Party Members" -msgstr "パティメンãƒãƒ¼" +msgstr "パーティメンãƒãƒ¼" #: src/gui/userpalette.cpp:130 msgid "Guild Members" @@ -3180,7 +3189,7 @@ msgstr "モンスターã¯ãƒ—レイヤーをヒット" #: src/gui/userpalette.cpp:140 msgid "Other Player Hits Local Player" -msgstr "" +msgstr "ä»–ã®ãƒ—レイヤーãŒãƒãƒ¼ã‚«ãƒ«ãƒ—レイヤーを攻撃ã—ã¾ã—ãŸ" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" @@ -3188,15 +3197,15 @@ msgstr "クリティカルヒット" #: src/gui/userpalette.cpp:143 msgid "Local Player Hits Monster" -msgstr "" +msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ—レイヤーãŒãƒ¢ãƒ³ã‚¹ã‚¿ãƒ¼ã‚’攻撃ã—ã¾ã—ãŸ" #: src/gui/userpalette.cpp:145 msgid "Local Player Critical Hit" -msgstr "" +msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ—レイヤー　会心ã®ä¸€æ’ƒ" #: src/gui/userpalette.cpp:147 msgid "Local Player Miss" -msgstr "" +msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ—レイヤー　ミス" #: src/gui/userpalette.cpp:148 msgid "Misses" @@ -3208,19 +3217,19 @@ msgstr "ãƒãƒ¼ã‚¿ãƒ«ãƒã‚¤ãƒ©ã‚¤ãƒˆ" #: src/gui/userpalette.cpp:151 msgid "Default collision Highlight" -msgstr "" +msgstr "デフォルトコリジョンãƒã‚¤ãƒ©ã‚¤ãƒˆ" #: src/gui/userpalette.cpp:153 msgid "Air collision Highlight" -msgstr "" +msgstr "空コリジョンãƒã‚¤ãƒ©ã‚¤ãƒˆ" #: src/gui/userpalette.cpp:155 msgid "Water collision Highlight" -msgstr "" +msgstr "水コリジョンãƒã‚¤ãƒ©ã‚¤ãƒˆ" #: src/gui/userpalette.cpp:157 msgid "Walkable Highlight" -msgstr "æ©ããƒã‚¤ãƒ©ã‚¤ãƒˆ" +msgstr "æ©é“ãƒã‚¤ãƒ©ã‚¤ãƒˆ" #: src/gui/userpalette.cpp:159 msgid "Local Player Attack Range" @@ -3236,35 +3245,35 @@ msgstr "モンスター攻撃範囲" #: src/gui/userpalette.cpp:165 msgid "Home Place" -msgstr "ãƒ›ãƒ¼ãƒ å ´æ‰€" +msgstr "ホームä½ç½®" #: src/gui/userpalette.cpp:167 msgid "Home Place Border" -msgstr "" +msgstr "ホームボーダー" #: src/gui/userpalette.cpp:169 msgid "Road Point" -msgstr "ãƒãƒ¼ãƒ‰ã®ãƒã‚¤ãƒ³ãƒˆ" +msgstr "ãƒãƒ¼ãƒ‰ãƒã‚¤ãƒ³ãƒˆ" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" -msgstr "" +msgstr "オンラインリスト - アップデートä¸" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "アップデート" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " -msgstr "" +msgstr "オンラインリスト - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" -msgstr "" +msgstr "オンラインリスト - エラー" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" -msgstr "" +msgstr "オンラインリスト - アップデート" #: src/gui/widgets/battletab.cpp:45 msgid "Battle" @@ -3296,7 +3305,7 @@ msgstr "コマンド: /users" #: src/gui/widgets/channeltab.cpp:67 msgid "This command shows the users in this channel." -msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒãƒ£ãƒ³ãƒãƒ«å†…ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’表示ã—ã¾ã™ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒãƒ£ãƒ³ãƒãƒ«ã«å‚åŠ ä¸ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’表示ã—ã¾ã™" #: src/gui/widgets/channeltab.cpp:71 msgid "Command: /topic <message>" @@ -3304,7 +3313,7 @@ msgstr "コマンド: /topic <メッセージ>" #: src/gui/widgets/channeltab.cpp:72 msgid "This command sets the topic to <message>." -msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€ãƒˆãƒ”ックをè¨å®šã—ã¾ã™ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒˆãƒ”ックをè¨å®šã—ã¾ã™" #: src/gui/widgets/channeltab.cpp:76 msgid "Command: /quit" @@ -3312,53 +3321,53 @@ msgstr "コマンド: /quit" #: src/gui/widgets/channeltab.cpp:77 msgid "This command leaves the current channel." -msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€ç¾åœ¨ã„ã‚‹ãƒãƒ£ãƒ³ãƒãƒ«ã‚’去りã¾ã™ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ç¾åœ¨ã„ã‚‹ãƒãƒ£ãƒ³ãƒãƒ«ã‚’去りã¾ã™" #: src/gui/widgets/channeltab.cpp:78 msgid "If you're the last person in the channel, it will be deleted." -msgstr "ã‚‚ã—ãã®ãƒãƒ£ãƒ³ãƒãƒ«ã®æœ€å¾Œã®äººãªã‚‰ã°ã€ãã®ãƒãƒ£ãƒ³ãƒãƒ«ã¯å‰Šé™¤ã•ã‚Œã¾ã™ã€‚" +msgstr "ãƒãƒ£ãƒ³ãƒãƒ«ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒã„ãªã„å ´åˆã¯å‰Šé™¤ã•ã‚Œã¾ã™" #: src/gui/widgets/channeltab.cpp:83 msgid "Command: /op <nick>" -msgstr "コマンド: /op <ニックãƒãƒ¼ãƒ >" +msgstr "コマンド: /op <プレイヤーå>" #: src/gui/widgets/channeltab.cpp:84 msgid "This command makes <nick> a channel operator." -msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€å…¥åŠ›ã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ãƒãƒ£ãƒ³ãƒãƒ«ã®ã‚ªãƒšãƒ¬ãƒ¼ã‚¿ã¨ãªã‚‹" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯å…¥åŠ›ã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ãƒãƒ£ãƒ³ãƒãƒ«ã®ã‚ªãƒšãƒ¬ãƒ¼ã‚¿ã«æŒ‡å®šã—ã¾ã™" #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94 #: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69 #: src/net/ea/gui/partytab.cpp:85 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "" -"入力ã™ã‚‹ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã«ã‚¹ãƒšãƒ¼ã‚¹ãŒå…¥ã£ã¦ã„ã‚‹å ´åˆã€ãƒ€ãƒ–ルコーテーション(\"\")ã§" -"囲んã§ãã ã•ã„。" +"入力ã™ã‚‹ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã«ã‚¹ãƒšãƒ¼ã‚¹ãŒå«ã¾ã‚Œã¦ã„ã‚‹å ´åˆã¯ãƒ€ãƒ–ルコーテーション(\"\")" +"ã§å›²ã‚“ã§ãã ã•ã„" #: src/gui/widgets/channeltab.cpp:87 msgid "Channel operators can kick and op other users from the channel." msgstr "" "ãƒãƒ£ãƒ³ãƒãƒ«ã®ã‚ªãƒšãƒ¬ãƒ¼ã‚¿ãƒ¼ã¯ãƒãƒ£ãƒ³ãƒãƒ«ã‹ã‚‰ã‚ªãƒšãƒ¬ãƒ¼ã‚¿ãƒ¼ä»¥å¤–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’追ã„出ã™" -"ã“ã¨ãŒã§ãã¾ã™ã€‚" +"ã“ã¨ãŒã§ãã¾ã™" #: src/gui/widgets/channeltab.cpp:92 msgid "Command: /kick <nick>" -msgstr "コマンド: /kick <ニックãƒãƒ¼ãƒ >" +msgstr "コマンド: /kick <プレイヤーå>" #: src/gui/widgets/channeltab.cpp:93 msgid "This command makes <nick> leave the channel." -msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€ãƒ¦ãƒ¼ã‚¶ã‚’ãƒãƒ£ãƒ³ãƒãƒ«ã‹ã‚‰è¿½ã„出ã™ã“ã¨ãŒã§ãã¾ã™ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒ¦ãƒ¼ã‚¶ã‚’ãƒãƒ£ãƒ³ãƒãƒ«ã‹ã‚‰è¿½ã„出ã—ã¾ã™" #: src/gui/widgets/channeltab.cpp:118 msgid "Need a user to op!" -msgstr "オペレーターã«ãªã‚‹äººãŒå¿…è¦ã§ã™ï¼" +msgstr "オペレーターã«ãªã‚‹äººãŒå¿…è¦ã§ã™" #: src/gui/widgets/channeltab.cpp:125 msgid "Need a user to kick!" -msgstr "追ã„出ã™ã“ã¨ãŒã§ãるメンãƒãƒ¼ãŒå¿…è¦ã§ã™ï¼" +msgstr "追ã„出ã™ãƒ¡ãƒ³ãƒãƒ¼ãŒå¿…è¦ã§ã™" #: src/gui/widgets/chattab.cpp:151 msgid "Global announcement:" -msgstr "アナウンス:" +msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã‚¢ãƒŠã‚¦ãƒ³ã‚¹:" #: src/gui/widgets/chattab.cpp:157 #, c-format @@ -3373,11 +3382,11 @@ msgstr "%s ã•ã•ã‚„ã: %s" #: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67 #: src/net/ea/gui/partytab.cpp:83 msgid "Command: /invite <nick>" -msgstr "コマンド: /invite ＜プレイヤーå＞" +msgstr "コマンド: /invite <プレイヤーå>" #: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68 msgid "This command invites <nick> to the guild you're in." -msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€å…¥åŠ›ã—ãŸãƒ—レイヤーを自分ã®ã‚®ãƒ«ãƒ‰ã«æ‹›å¾…ã—ã¾ã™ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€å…¥åŠ›ã—ãŸãƒ—レイヤーを自分ã®ã‚®ãƒ«ãƒ‰ã«æ‹›å¾…ã—ã¾ã™" #: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74 #: src/net/ea/gui/partytab.cpp:90 @@ -3386,28 +3395,28 @@ msgstr "コマンド: /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 "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒ—レイヤーをギルドã‹ã‚‰é€€ä¼šã•ã›ã¾ã™" #: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135 #: src/net/ea/gui/partytab.cpp:69 msgid "/help > Display this help." -msgstr "/helpã§ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹ã€‚" +msgstr "/help > ヘルプメニューを表示" #: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136 msgid "/invite > Invite a player to your guild" -msgstr "" +msgstr "/invite > プレイヤーをギルドã¸æ‹›å¾…ã™ã‚‹" #: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137 msgid "/leave > Leave the guild you are in" -msgstr "" +msgstr "/leave > ギルドã‹ã‚‰é€€ä¼šã™ã‚‹" #: 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 > プレイヤーをギルドã‹ã‚‰è¿½ã„出ã—ã¾ã™" #: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394 msgid "Edit" -msgstr "エディット" +msgstr "編集" #: src/gui/widgets/whispertab.cpp:107 msgid "/ignore > Ignore the other player" @@ -3415,11 +3424,11 @@ msgstr "/ignore > ä»–ã®ãƒ—レイヤーを無視ã™ã‚‹" #: src/gui/widgets/whispertab.cpp:108 msgid "/unignore > Stop ignoring the other player" -msgstr "" +msgstr "/unignore ã¯ãƒ—レイヤー無視を解除をã—ã¾ã™" #: src/gui/widgets/whispertab.cpp:109 msgid "/close > Close the whisper tab" -msgstr "/closeã§ãƒ—ライベートメッセージã®ã‚¿ãƒ–ã‚’é–‰ã˜ã¾ã™ã€‚" +msgstr "/closeã§ã•ã•ã‚„ãタブを閉ã˜ã¾ã™" #: src/gui/widgets/whispertab.cpp:119 msgid "Command: /close" @@ -3427,28 +3436,27 @@ msgstr "コマンド: /close" #: src/gui/widgets/whispertab.cpp:120 msgid "This command closes the current whisper tab." -msgstr "" -"ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€ç¾åœ¨é–‹ã„ã¦ã„るプライベートメッセージã®ã‚¿ãƒ–ã‚’é–‰ã˜ã¾ã™ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ç¾åœ¨é–‹ã„ã¦ã„ã‚‹ã•ã•ã‚„ãタブを閉ã˜ã¾ã™" #: src/gui/widgets/whispertab.cpp:124 msgid "Command: /ignore" -msgstr "コマンド： /ignore" +msgstr "コマンド: /ignore" #: src/gui/widgets/whispertab.cpp:125 msgid "This command ignores the other player regardless of current relations." -msgstr "" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯å…¨ã¦ã®ãƒ—レイヤーを無視ã—ã¾ã™" #: src/gui/widgets/whispertab.cpp:130 msgid "Command: /unignore <player>" -msgstr "コマンド：　/unignore <プレイヤー>" +msgstr "コマンド: /unignore <プレイヤーå>" #: src/gui/widgets/whispertab.cpp:131 msgid "This command stops ignoring the other player if they are being ignored." -msgstr "" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒ—レイヤー無視を解除ã—ã¾ã™" #: src/gui/windowmenu.cpp:65 msgid "BC" -msgstr "ボット" +msgstr "BC" #: src/gui/windowmenu.cpp:65 msgid "Bot checker" @@ -3456,51 +3464,51 @@ msgstr "ボットãƒã‚§ãƒƒã‚«ãƒ¼" #: src/gui/windowmenu.cpp:67 msgid "ONL" -msgstr "" +msgstr "ONL" #: src/gui/windowmenu.cpp:67 msgid "Who is online" -msgstr "誰ãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³" +msgstr "オンラインリスト" #: src/gui/windowmenu.cpp:69 msgid "KS" -msgstr "" +msgstr "KS" #: src/gui/windowmenu.cpp:71 msgid "Smilies" -msgstr "" +msgstr "スマイリー" #: src/gui/windowmenu.cpp:73 msgid "STA" -msgstr "" +msgstr "STA" #: src/gui/windowmenu.cpp:73 msgid "Status" -msgstr "状態" +msgstr "ステータス" #: src/gui/windowmenu.cpp:74 msgid "EQU" -msgstr "" +msgstr "EQU" #: src/gui/windowmenu.cpp:76 msgid "INV" -msgstr "" +msgstr "INV" #: src/gui/windowmenu.cpp:81 msgid "SKI" -msgstr "" +msgstr "SKI" #: src/gui/windowmenu.cpp:88 msgid "SPE" -msgstr "" +msgstr "SPE" #: src/gui/windowmenu.cpp:93 msgid "SOC" -msgstr "" +msgstr "SOC" #: src/gui/windowmenu.cpp:94 msgid "SH" -msgstr "" +msgstr "SH" #: src/gui/windowmenu.cpp:94 msgid "Shortcuts" @@ -3508,23 +3516,23 @@ msgstr "ショートカット" #: src/gui/windowmenu.cpp:96 msgid "SP" -msgstr "" +msgstr "SP" #: src/gui/windowmenu.cpp:97 msgid "DR" -msgstr "" +msgstr "DR" #: src/gui/windowmenu.cpp:98 msgid "YK" -msgstr "" +msgstr "YK" #: src/gui/windowmenu.cpp:98 msgid "Did you know" -msgstr "" +msgstr "豆知è˜" #: src/gui/windowmenu.cpp:100 msgid "SET" -msgstr "" +msgstr "SET" #: src/gui/worldselectdialog.cpp:77 msgid "Select World" @@ -3536,59 +3544,59 @@ msgstr "ãƒã‚°ã‚¤ãƒ³ã®å¤‰æ›´" #: src/gui/worldselectdialog.cpp:83 msgid "Choose World" -msgstr "世界をé¸ã¶" +msgstr "世界ã®é¸æŠž" #: src/inventory.cpp:251 msgid "Storage" -msgstr "ä¿å˜" +msgstr "倉庫" #: src/inventory.cpp:253 msgid "Cart" -msgstr "è·é¦¬è»Š" +msgstr "カート" #: src/keyboardconfig.cpp:43 msgid "Basic Keys" -msgstr "" +msgstr "標準ã‚ー" #: src/keyboardconfig.cpp:44 msgid "Move Up" -msgstr "上移動" +msgstr "上ã¸ç§»å‹•" #: src/keyboardconfig.cpp:45 msgid "Move Down" -msgstr "下移動" +msgstr "下ã¸ç§»å‹•" #: src/keyboardconfig.cpp:46 msgid "Move Left" -msgstr "左移動" +msgstr "å·¦ã¸ç§»å‹•" #: src/keyboardconfig.cpp:47 msgid "Move Right" -msgstr "å³ç§»å‹•" +msgstr "å³ã¸ç§»å‹•" #: src/keyboardconfig.cpp:50 msgid "Target & Attack" -msgstr "ターゲットã¨æ”»æ’ƒ" +msgstr "ターゲット&攻撃" #: src/keyboardconfig.cpp:52 msgid "Move to Target" -msgstr "ターゲットã«å‹•ã" +msgstr "ターゲットã¾ã§ç§»å‹•" #: src/keyboardconfig.cpp:54 msgid "Change Move to Target type" -msgstr "" +msgstr "ターゲットã¸æŽ¥è¿‘方法変更" #: src/keyboardconfig.cpp:56 msgid "Move to Home location" -msgstr "ãƒ›ãƒ¼ãƒ å ´æ‰€ã«å‹•ã" +msgstr "ホームä½ç½®ã¾ã§ç§»å‹•" #: src/keyboardconfig.cpp:58 msgid "Set home location" -msgstr "" +msgstr "ホームä½ç½®å¤‰æ›´" #: src/keyboardconfig.cpp:60 msgid "Move to navigation point" -msgstr "" +msgstr "ナビゲーションãƒã‚¤ãƒ³ãƒˆã¸ç§»å‹•" #: src/keyboardconfig.cpp:63 msgid "Stop Attack" @@ -3596,7 +3604,7 @@ msgstr "攻撃をæ¢ã‚ã‚‹" #: src/keyboardconfig.cpp:65 msgid "Untarget" -msgstr "" +msgstr "ターゲットã‹ã‚‰å¤–ã™" #: src/keyboardconfig.cpp:66 msgid "Target Closest" @@ -3608,7 +3616,7 @@ msgstr "NPCã‚’ç‹™ã†" #: src/keyboardconfig.cpp:69 msgid "Target Player" -msgstr "プレイヤーを狙ã†" +msgstr "プレイヤーをターゲット" #: src/keyboardconfig.cpp:71 msgid "Pickup" @@ -3616,7 +3624,7 @@ msgstr "拾ã†" #: src/keyboardconfig.cpp:72 msgid "Change Pickup Type" -msgstr "" +msgstr "拾ã„方を変更" #: src/keyboardconfig.cpp:74 msgid "Hide Windows" @@ -3632,11 +3640,11 @@ msgstr "スクリーンショット" #: src/keyboardconfig.cpp:78 msgid "Enable/Disable Trading" -msgstr "å–引をå¯èƒ½/ä¸å¯èƒ½ã«ã™ã‚‹" +msgstr "å–引を有効/無効ã«ã™ã‚‹" #: src/keyboardconfig.cpp:80 msgid "Change Map View Mode" -msgstr "" +msgstr "マップビューモード変更" #: src/keyboardconfig.cpp:82 msgid "Select OK" @@ -3644,11 +3652,11 @@ msgstr "OKã‚’é¸æŠžã™ã‚‹" #: src/keyboardconfig.cpp:85 msgid "Shortcuts Keys" -msgstr "" +msgstr "ショートカットã‚ー" #: src/keyboardconfig.cpp:86 msgid "Item Shortcuts Key" -msgstr "" +msgstr "アイテムショートカットã‚ー" #: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90 #: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94 @@ -3667,7 +3675,7 @@ msgstr "アイテムショートカット: %d" #: src/keyboardconfig.cpp:128 msgid "Windows Keys" -msgstr "" +msgstr "ウィンドウズã‚ー" #: src/keyboardconfig.cpp:129 msgid "Help Window" @@ -3675,15 +3683,15 @@ msgstr "ヘルプウィンドウ" #: src/keyboardconfig.cpp:131 msgid "Status Window" -msgstr "ステータス・ウィンドウ" +msgstr "ステータスウィンドウ" #: src/keyboardconfig.cpp:133 msgid "Inventory Window" -msgstr "在庫ウィンドウ" +msgstr "インベントリーウィンドウ" #: src/keyboardconfig.cpp:135 msgid "Equipment Window" -msgstr "装備ウィンドウ" +msgstr "装ç€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" #: src/keyboardconfig.cpp:137 msgid "Skill Window" @@ -3691,7 +3699,7 @@ msgstr "スã‚ルウィンドウ" #: src/keyboardconfig.cpp:139 msgid "Minimap Window" -msgstr "å°ã•ãªãƒžãƒƒãƒ—ウィンドウ" +msgstr "ミニマップウィンドウ" #: src/keyboardconfig.cpp:141 msgid "Chat Window" @@ -3711,15 +3719,15 @@ msgstr "デãƒã‚°ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" #: src/keyboardconfig.cpp:149 msgid "Social Window" -msgstr "ソシアルウインドウ" +msgstr "ソーシャルウインドウ" #: src/keyboardconfig.cpp:151 msgid "Emote Shortcut Window" -msgstr "表情ショートカットウィンドウ" +msgstr "スマイリーショートカットウィンドウ" #: src/keyboardconfig.cpp:153 msgid "Outfits Window" -msgstr "æœã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦" +msgstr "æœè£…ウインドウ" #: src/keyboardconfig.cpp:155 msgid "Shop Window" @@ -3731,7 +3739,7 @@ msgstr "クイックドãƒãƒƒãƒ—ウィンドウ" #: src/keyboardconfig.cpp:159 msgid "Kill Stats Window" -msgstr "" +msgstr "ã‚ルスタッツ窓" #: src/keyboardconfig.cpp:161 msgid "Commands Window" @@ -3739,27 +3747,27 @@ msgstr "コマンドウインドウ" #: src/keyboardconfig.cpp:163 msgid "Bot Checker Window" -msgstr "" +msgstr "ボットãƒã‚§ãƒƒã‚«ãƒ¼ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" #: src/keyboardconfig.cpp:166 msgid "Who Is Online Window" -msgstr "オンライン・ウザー・ウインドウ" +msgstr "オンラインユーザーウインドウ" #: src/keyboardconfig.cpp:168 msgid "Did you know Window" -msgstr "" +msgstr "豆知è˜çª“" #: src/keyboardconfig.cpp:171 msgid "Previous Social Tab" -msgstr "" +msgstr "å‰ã‚½ãƒ¼ã‚·ãƒ£ãƒ«ã‚¿ãƒ–" #: src/keyboardconfig.cpp:173 msgid "Next Social Tab" -msgstr "" +msgstr "次ソーシャルタブ" #: src/keyboardconfig.cpp:175 msgid "Emotes Keys" -msgstr "" +msgstr "スマイリーã‚ー" #: src/keyboardconfig.cpp:176 msgid "Smilie" @@ -3794,7 +3802,7 @@ msgstr "スマイリーショートカット: %d" #: src/keyboardconfig.cpp:270 msgid "Outfits Keys" -msgstr "" +msgstr "æœè£…ã‚ー" #: src/keyboardconfig.cpp:271 msgid "Wear Outfit" @@ -3806,11 +3814,11 @@ msgstr "æœã‚’コピーã™ã‚‹" #: src/keyboardconfig.cpp:275 msgid "Copy equipped to Outfit" -msgstr "" +msgstr "装ç€å“ã‚’æœè£…ã«ã‚³ãƒ”ー" #: src/keyboardconfig.cpp:277 msgid "Chat Keys" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆã‚ー" #: src/keyboardconfig.cpp:278 msgid "Toggle Chat" @@ -3818,11 +3826,11 @@ msgstr "トグルãƒãƒ£ãƒƒãƒˆ" #: src/keyboardconfig.cpp:280 msgid "Scroll Chat Up" -msgstr "ãƒãƒ£ãƒƒãƒˆã‚’上ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" +msgstr "ãƒãƒ£ãƒƒãƒˆã‚’上ã¸ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" #: src/keyboardconfig.cpp:282 msgid "Scroll Chat Down" -msgstr "ãƒãƒ£ãƒƒãƒˆã‚’下ã«ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" +msgstr "ãƒãƒ£ãƒƒãƒˆã‚’下ã¸ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã™ã‚‹" #: src/keyboardconfig.cpp:284 msgid "Previous Chat Tab" @@ -3834,27 +3842,27 @@ msgstr "次ã®ãƒãƒ£ãƒƒãƒˆã‚¿ãƒ–" #: src/keyboardconfig.cpp:289 msgid "Close current Chat Tab" -msgstr "" +msgstr "ã“ã®ãƒãƒ£ãƒƒãƒˆã‚¿ãƒ–ã‚’é–‰ã˜ã‚‹" #: src/keyboardconfig.cpp:291 msgid "Previous chat line" -msgstr "" +msgstr "å‰ãƒãƒ£ãƒƒãƒˆæ–‡" #: src/keyboardconfig.cpp:293 msgid "Next chat line" -msgstr "" +msgstr "次ãƒãƒ£ãƒƒãƒˆæ–‡" #: src/keyboardconfig.cpp:295 msgid "Chat Auto Complete" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆã‚ªãƒ¼ãƒˆã‚³ãƒ³ãƒ—リート" #: src/keyboardconfig.cpp:297 msgid "Deactivate Chat Input" -msgstr "" +msgstr "ãƒãƒ£ãƒƒãƒˆå…¥åŠ›ç„¡åŠ¹" #: src/keyboardconfig.cpp:299 msgid "Other Keys" -msgstr "" +msgstr "ãã®ä»–ã®ã‚ー" #: src/keyboardconfig.cpp:300 msgid "Ignore input 1" @@ -3866,47 +3874,47 @@ msgstr "インプット２無視" #: src/keyboardconfig.cpp:304 msgid "Direct Up" -msgstr "æ–¹å‘上" +msgstr "上方å‘" #: src/keyboardconfig.cpp:305 msgid "Direct Down" -msgstr "æ–¹å‘下" +msgstr "下方å‘" #: src/keyboardconfig.cpp:307 msgid "Direct Left" -msgstr "æ–¹å‘ å·¦" +msgstr "左方å‘" #: src/keyboardconfig.cpp:308 msgid "Direct Right" -msgstr "æ–¹å‘å³" +msgstr "å³æ–¹å‘" #: src/keyboardconfig.cpp:310 msgid "Crazy moves" -msgstr "クレイジーã«ç§»å‹•" +msgstr "クレイジームーブ" #: src/keyboardconfig.cpp:312 msgid "Change Crazy Move mode" -msgstr "" +msgstr "クレイジームーブモード変更" #: src/keyboardconfig.cpp:314 msgid "Quick Drop N Items from 0 slot" -msgstr "" +msgstr "Nアイテムを 0スãƒãƒƒãƒˆã‹ã‚‰ã‚¯ã‚¤ãƒƒã‚¯ãƒ‰ãƒãƒƒãƒ—" #: src/keyboardconfig.cpp:316 msgid "Quick Drop N Items" -msgstr "" +msgstr "Nアイテムをクイックドãƒãƒƒãƒ—" #: src/keyboardconfig.cpp:318 msgid "Switch Quick Drop Counter" -msgstr "" +msgstr "クイックドãƒãƒƒãƒ—カウンター変更" #: src/keyboardconfig.cpp:320 msgid "Quick heal target or self" -msgstr "" +msgstr "ターゲットåˆã¯è‡ªåˆ†ã‚’HP回復ã•ã›ã‚‹" #: src/keyboardconfig.cpp:322 msgid "Use #itenplz spell" -msgstr "#itenplz ã¯å‘ªæ–‡ã‚’使ã†" +msgstr "呪文 #itenplz ã‚’å”±ãˆã‚‹" #: src/keyboardconfig.cpp:324 msgid "Use magic attack" @@ -3914,55 +3922,55 @@ msgstr "é”法攻撃を使用" #: src/keyboardconfig.cpp:326 msgid "Switch magic attack" -msgstr "" +msgstr "マジックアタック変更" #: src/keyboardconfig.cpp:329 msgid "Switch pvp attack" -msgstr "" +msgstr "PvP攻撃変更" #: src/keyboardconfig.cpp:330 msgid "Change move type" -msgstr "" +msgstr "ムーブタイプ変更" #: src/keyboardconfig.cpp:332 msgid "Change Attack Weapon Type" -msgstr "" +msgstr "æ¦å™¨å¤‰æ›´" #: src/keyboardconfig.cpp:334 msgid "Change Attack Type" -msgstr "" +msgstr "攻撃方法変更" #: src/keyboardconfig.cpp:336 msgid "Change Follow mode" -msgstr "" +msgstr "フォãƒãƒ¼ãƒ¢ãƒ¼ãƒ‰å¤‰æ›´" #: src/keyboardconfig.cpp:338 msgid "Change Imitation mode" -msgstr "" +msgstr "真似モード変更" #: src/keyboardconfig.cpp:341 msgid "Disable / Enable Game modifier keys" -msgstr "" +msgstr "ゲームモディファイアã‚ーを無効 / 有効ã«ã™ã‚‹" #: src/keyboardconfig.cpp:342 msgid "On / Off audio" -msgstr "アウディオ　オン/オフ" +msgstr "オーディオ　オン/オフ" #: src/keyboardconfig.cpp:344 msgid "Enable / Disable away mode" -msgstr "" +msgstr "AFKモードを有効 / 無効ã«ã™ã‚‹" #: src/keyboardconfig.cpp:346 msgid "Emulate right click from keyboard" -msgstr "" +msgstr "å³ã‚¯ãƒªãƒƒã‚¯ã‚’エミュレートã™ã‚‹" #: src/keyboardconfig.cpp:348 msgid "Toggle camera mode" -msgstr "" +msgstr "カメラモード変更" #: src/keyboardconfig.cpp:350 msgid "Modifier key" -msgstr "" +msgstr "モディファイアーã‚ー" #: src/keyboardconfig.cpp:429 #, c-format @@ -3970,562 +3978,577 @@ msgid "" "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " "strange behaviour." msgstr "" +"\"%s\"ã¨\"%s\"ã‚ーãŒé‡è¤‡ã—ã¦ã„ã¾ã™ã€‚ ゲームプレイã«æ‚ªã„影響ãŒå‡ºã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›" +"ん。" #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "" +#, c-format +msgid "You were killed by %s" +msgstr "%sã«ã‚ˆã£ã¦æ®ºã•ã‚Œã¾ã—ãŸ" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." -msgstr "" +msgstr "å˜åœ¨ã—ãªã„アイテムã¯æ‹¾ãˆã¾ã›ã‚“" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." -msgstr "" +msgstr "アイテムãŒé‡éŽãŽã¾ã™" -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." -msgstr "" +msgstr "アイテムãŒé ã™ãŽã¾ã™." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." -msgstr "" +msgstr "インベントリーãŒæº€æ¯ã§ã™" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." -msgstr "" +msgstr "é‡ãŒå¤šã™ãŽã¾ã™" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." -msgstr "" +msgstr "ã“ã‚Œã¯ä»–ã®ãƒ—レイヤーã®ã‚¢ã‚¤ãƒ†ãƒ ã§ã™" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." -msgstr "" +msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã®ç‚ºæ‹¾ãˆã¾ã›ã‚“" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." -msgstr[0] "" +msgstr[0] "%d [@@%d|%s@@]を手ã«å…¥ã‚Œã¾ã—ãŸ" -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" -msgstr "" +msgstr "(D) デフォルトムーブ" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" -msgstr "" +msgstr "(I) 逆ムーブ" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" -msgstr "" +msgstr "(c) クレイジームーブをå«ã‚“ã ムーブ" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" -msgstr "" +msgstr "(C) クレイジームーブ" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" -msgstr "" +msgstr "(d) ダブルノーマル + クレイジー" -#: src/localplayer.cpp:1896 -#, fuzzy +#: src/localplayer.cpp:1903 msgid "(?) unknown move" -msgstr "(?) å‹•ã" +msgstr "(?) ä¸æ˜Žãªãƒ ーブ" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" -msgstr "" +msgstr "(%d) クレイジームーブ %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" -msgstr "" +msgstr "(a) カスタムクレイジームーブ" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" -msgstr "" +msgstr "(?) クレイジームーブ" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" -msgstr "" +msgstr "(0) ターゲットã¸ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆæŽ¥è¿‘" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" -msgstr "" +msgstr "(1) è·é›¢1ã§ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã¸æŽ¥è¿‘" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" -msgstr "" +msgstr "(2) è·é›¢2ã§ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã«è¿‘付ã" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" -msgstr "" +msgstr "(3) è·é›¢3ã§ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã¸æŽ¥è¿‘" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" -msgstr "" +msgstr "(5) è·é›¢5ã§ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã«è¿‘付ã" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" -msgstr "" +msgstr "(7) è·é›¢7ã§ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã«è¿‘付ã" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" -msgstr "" +msgstr "(A) 攻撃範囲内ã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã«è¿‘付ã" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" -msgstr "" +msgstr "(a) 弓師攻撃範囲" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" -msgstr "" +msgstr "(?) ターゲットã«è¿‘付ã" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" -msgstr "" +msgstr "(D) デフォルトフォãƒãƒ¼" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" -msgstr "" +msgstr "(R) å‹é”フォãƒãƒ¼" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" -msgstr "" +msgstr "(M) ミラーフォãƒãƒ¼" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" -msgstr "" +msgstr "(P) ペットフォãƒãƒ¼" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" -msgstr "" +msgstr "(?) ä¸æ˜Žãªãƒ•ã‚©ãƒãƒ¼" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" -msgstr "(?) 襲ã†" +msgstr "(?) 攻撃" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" -msgstr "" +msgstr "(D) デフォルト攻撃" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" -msgstr "" +msgstr "(s) 盾ãªã—攻撃" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" -msgstr "" +msgstr "(S) 盾ã‚り攻撃" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" -msgstr "" +msgstr "(G) 接近ã€æ”»æ’ƒ" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" -msgstr "" +msgstr "(A) 接近ã€æ”»æ’ƒã€æ‹¾ã†" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" -msgstr "" +msgstr "(d) 自動攻撃ãªã—" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" -msgstr "" +msgstr "(S) å°ç¯„囲ã§æ‹¾ã† 1x1セル" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" -msgstr "" +msgstr "(D) デフォルト範囲ã§æ‹¾ã† 2x1セル" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" -msgstr "" +msgstr "(F) 広範囲ã§æ‹¾ã† 2x3セル" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" -msgstr "" +msgstr "(3) 3x3セルã®ç¯„囲ã§æ‹¾ã†" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" -msgstr "" +msgstr "(g) è·é›¢4ã®ç¯„囲ã§æ‹¾ã†" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" -msgstr "" +msgstr "(G) è·é›¢8ã§æ‹¾ã†" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" -msgstr "" +msgstr "(A) 最大範囲ã§æ‹¾ã†" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" -msgstr "(?) 拾ã„上ã’ã‚‹" +msgstr "(?) 拾ã†" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" -msgstr "" +msgstr "(N) 通常マップビュー" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" -msgstr "" +msgstr "(D) デãƒãƒƒã‚°ãƒžãƒƒãƒ—ビュー" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" -msgstr "" +msgstr "(u) ウルトラマップビュー" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" -msgstr "" +msgstr "(U) ウルトラマップビュー2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" -msgstr "" +msgstr "(e) 空マップビュー" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" -msgstr "" +msgstr "(b) 白黒マップビュー" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" -msgstr "" +msgstr "(f) é”法攻撃㯠#flarを使ã†" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" -msgstr "" +msgstr "(c) é”法攻撃㯠#chizaを使ã†" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" -msgstr "" +msgstr "(I) é”法攻撃㯠#ingravを使ã†" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" -msgstr "" +msgstr "(F) é”法攻撃㯠#frillyarを使ã†" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" -msgstr "" +msgstr "(U) é”法攻撃㯠#upmarmuを使ã†" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" -msgstr "" +msgstr "(?) é”法攻撃" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" -msgstr "" +msgstr "(a) å…¨ã¦ã®ãƒ—レイヤーを攻撃" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" -msgstr "" +msgstr "(f) å‹é”以外を攻撃" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" -msgstr "" +msgstr "(b) 敵を攻撃" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" -msgstr "" +msgstr "(d) ä»–ã®ãƒ—レイヤーを攻撃ã—ãªã„" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" -msgstr "" +msgstr "(?) PvP攻撃" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" -msgstr "" +msgstr "(D) デフォルト真似" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" -msgstr "" +msgstr "(O) æœè£…真似" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" -msgstr "(?) " +msgstr "(?) 真似をã™ã‚‹" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" -msgstr "去ã£ã¦" +msgstr "アウェイ" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" -msgstr "" +msgstr "(O) ã‚ーボード" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" -msgstr "(A) " +msgstr "(A) アウェイ" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" -msgstr "(?) ä¸åœ¨ã§" +msgstr "(?) アウェイ" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" -msgstr "" +msgstr "(G) ゲームカメラモード" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" -msgstr "" +msgstr "(F) フリーカメラモード" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" -msgstr "" +msgstr "ゲームモディファイアã¯æœ‰åŠ¹ã«ãªã£ã¦ã¾ã™" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" -msgstr "" +msgstr "ゲームモディファイアã¯ç„¡åŠ¹ã«ãªã£ã¦ã¾ã™" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" -msgstr "" +msgstr "ä¸æ˜Žãªã‚²ãƒ¼ãƒ モディファイアー" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " -msgstr "従ã†: " +msgstr "フォãƒãƒ¼: " -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" -msgstr "" +msgstr "フォãƒãƒ¼ã‚’æ¢ã‚ã‚‹" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " -msgstr "擬ã„: " +msgstr "真似: " -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" -msgstr "" +msgstr "真似をやã‚ã‚‹" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " -msgstr "ã‚ãªãŸ" +msgstr " ãŒè¦‹ãˆã‚‹" -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" -msgstr "" +msgstr "manaplus [オプション] [manaplus-ファイル]" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" -msgstr "" +msgstr "[manaplus-ファイル] : manaplusã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯XMLファイルã§ã™ (.manaplus)" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" -msgstr "" +msgstr " ã§ã‚«ã‚¹ã‚¿ãƒ パラメーターをè¨å®šã—ã¾ã—ãŸ" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." -msgstr "" +msgstr " ã‚’manaplusクライアントã¸è¨å®šã—ã¾ã—ãŸ" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "オプション:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" -msgstr "" +msgstr " -l --log-file : 使用ã™ã‚‹ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" -msgstr "" +msgstr " -L --chat-log-dir : ãƒãƒ£ãƒƒãƒˆãƒã‚°å ´æ‰€" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" -msgstr "" +msgstr " -v --version : ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" -msgstr "" +msgstr " -h --help : ヘルプメニュー表示" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" -msgstr "" +msgstr " -C --config-dir : 使用ã™ã‚‹è¨å®šãƒ•ã‚¡ã‚¤ãƒ«" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" -msgstr "" +msgstr " -U --username : ã“ã®åå‰ã§ãƒã‚°ã‚¤ãƒ³ã™ã‚‹" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" -msgstr "" +msgstr " -P --password : ã“ã®ãƒ‘スワードã§ãƒã‚°ã‚¤ãƒ³ã™ã‚‹" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" -msgstr "" +msgstr " -c --character : ã“ã®ã‚ャラクターã§ãƒã‚°ã‚¤ãƒ³ã™ã‚‹" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" -msgstr "" +msgstr " -s --server : ãƒã‚°ã‚¤ãƒ³ã‚µãƒ¼ãƒãƒ¼åˆã¯IP" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" -msgstr "" +msgstr " -p --port : ãƒã‚°ã‚¤ãƒ³ã‚µãƒ¼ãƒãƒ¼ãƒãƒ¼ãƒˆ" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" -msgstr "" +msgstr " --update-host : ã“ã®ã‚¢ãƒƒãƒ—デートホストを利用ã™ã‚‹" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr "" +" -D --default : デフォルトã§ä½¿ç”¨ã™ã‚‹ã‚ャラクターサーãƒãƒ¼ã¨ã‚ャラク" +"ターをé¸æŠžã™ã‚‹" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" -msgstr "" +msgstr " -u --skip-update : アップデートをスã‚ップã™ã‚‹" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" -msgstr "" +msgstr " -d --data : ゲームデータをèªã¿è¾¼ã‚€å ´æ‰€" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" -msgstr "" +msgstr " -L --localdata-dir : ãƒãƒ¼ã‚«ãƒ«ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å ´æ‰€" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" -msgstr "" +msgstr " --screenshot-dir : スクリーンショットã®ä¿å˜å ´æ‰€" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" +msgstr " --safemode : セーフモードã§ã‚²ãƒ¼ãƒ を始ã‚ã‚‹" + +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" msgstr "" +" -T --tests : ドライãƒãƒ¼ã¨è‡ªå‹•ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã®ãƒ†ã‚¹ãƒˆã‚’始ã‚ã‚‹" -#: src/main.cpp:75 +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" -msgstr "" +msgstr " --openglエラー : OpenGLを今回ã®ã¿ç„¡åŠ¹ã«ã™ã‚‹" #: src/net/ea/buysellhandler.cpp:163 msgid "Nothing to sell." -msgstr "売り物ãŒã”ã–ã„ã¾ã›ã‚“。" +msgstr "売るアイテムãŒã‚ã‚Šã¾ã›ã‚“" #: src/net/ea/buysellhandler.cpp:171 msgid "Thanks for buying." -msgstr "è²·ã£ã¦ãã ã•ã‚Šã€ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã—ãŸã€‚" +msgstr "ã”購入ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã—ãŸ" #: src/net/ea/buysellhandler.cpp:179 msgid "Unable to buy." -msgstr "購買ä¸å¯èƒ½" +msgstr "購買ã§ãã¾ã›ã‚“" #: src/net/ea/charserverhandler.cpp:66 msgid "Strength:" -msgstr "ç‹åŠ›:" +msgstr "Strength:" #: src/net/ea/charserverhandler.cpp:67 msgid "Agility:" -msgstr "ç´ æ—©ã•:" +msgstr "Agility:" #: src/net/ea/charserverhandler.cpp:68 msgid "Vitality:" -msgstr "体力:" +msgstr "Vitality:" #: src/net/ea/charserverhandler.cpp:69 msgid "Intelligence:" -msgstr "知性:" +msgstr "Intelligence:" #: src/net/ea/charserverhandler.cpp:70 msgid "Dexterity:" -msgstr "æ•æ·:" +msgstr "Dexterity:" #: src/net/ea/charserverhandler.cpp:71 msgid "Luck:" -msgstr "é‹:" +msgstr "Luck:" #: src/net/ea/charserverhandler.cpp:115 msgid "Access denied. Most likely, there are too many players on this server." -msgstr "" +msgstr "アクセスã§ãã¾ã›ã‚“。サーãƒãƒ¼ãŒæ··ã¿ã‚ã£ã¦ã„ã¾ã™" #: src/net/ea/charserverhandler.cpp:119 msgid "Cannot use this ID." -msgstr "ID使用ä¸å¯èƒ½ã€‚" +msgstr "ã“ã®IDã¯ä½¿ç”¨ã§ãã¾ã›ã‚“" #: src/net/ea/charserverhandler.cpp:122 msgid "Unknown char-server failure." -msgstr "" +msgstr "ä¸æ˜Žãªã‚ャラクターサーãƒãƒ¼ã‚¨ãƒ©ãƒ¼" #: src/net/ea/charserverhandler.cpp:151 msgid "Failed to create character. Most likely the name is already taken." -msgstr "ã‚ャラクター作æˆå¤±æ•—。本åã¯ã®ã†ä½¿ã‚ã‚Œã¦ã„る。" +msgstr "" +"ã‚ャラクター作æˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚æ—¢ã«ä½¿ã‚ã‚Œã¦ã„ã‚‹åå‰ã‚‚ã—ãã¯ç„¡åŠ¹ãªæ–‡å—ãŒå«ã¾" +"ã‚Œã¦ã„ã¾ã™" -#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." -msgstr "åå‰é–“é•ã„" +msgstr "åå‰ãŒé•ã„ã¾ã™" #: src/net/ea/charserverhandler.cpp:158 msgid "Incorrect stats." -msgstr "ä¸é©åˆ‡ãªçµ±è¨ˆã€‚" +msgstr "é–“é•ã£ãŸçµ±è¨ˆ" #: src/net/ea/charserverhandler.cpp:161 msgid "Incorrect hair." -msgstr "ä¸é©åˆ‡ãªé«ªã€‚" +msgstr "é–“é•ã£ãŸé«ªåž‹" #: src/net/ea/charserverhandler.cpp:164 msgid "Incorrect slot." -msgstr "ä¸é©åˆ‡ãªã‚¹ãƒãƒƒãƒˆã€‚" +msgstr "é–“é•ã£ãŸã‚¹ãƒãƒƒãƒˆ" + +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "種別ãŒé–“é•ã£ã¦ã„ã¾ã™" -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "æƒ…å ±" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." -msgstr "ã‚ャラクターを削除ã—ãŸã€‚" +msgstr "ã‚ャラクターを削除ã—ã¾ã—ãŸ" -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." -msgstr "ã‚ャラ削除失敗" +msgstr "ã‚ャラクター削除ã«å¤±æ•—ã—ã¾ã—ãŸ" #: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67 #: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78 #: 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 "ãƒãƒ£ãƒ³ãƒãƒ«ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" #: src/net/ea/chathandler.cpp:129 #, c-format msgid "Whisper could not be sent, %s is offline." -msgstr "" +msgstr "%sãŒã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã®ç‚ºã•ã•ã‚„ãã¯é€ã‚Œã¾ã›ã‚“ã§ã—ãŸ" #: src/net/ea/chathandler.cpp:137 #, c-format msgid "Whisper could not be sent, ignored by %s." -msgstr "" +msgstr "%sãŒç„¡è¦–è¨å®šã‚’ã—ã¦ã„る為ã•ã•ã‚„ãã¯é€ã‚Œã¾ã›ã‚“ã§ã—ãŸ" #: src/net/ea/chathandler.cpp:346 msgid "MVP player." -msgstr "プレイヤー MVP" +msgstr "MVPプレイヤー" #: src/net/ea/chathandler.cpp:350 msgid "MVP player: " -msgstr "プレイヤー MVP " +msgstr "MVPプレイヤー: " #: src/net/ea/chathandler.cpp:370 msgid "All whispers ignored." -msgstr "" +msgstr "å…¨ã¦ã®ã•ã•ã‚„ãを無視ã—ã¾ã—ãŸ" #: src/net/ea/chathandler.cpp:374 msgid "All whispers ignore failed." -msgstr "" +msgstr "å…¨ã¦ã®ã•ã•ã‚„ãã®ç„¡è¦–ã«å¤±æ•—ã—ã¾ã—ãŸ" #: src/net/ea/chathandler.cpp:385 msgid "All whispers unignored." -msgstr "" +msgstr "å…¨ã¦ã®ã•ã•ã‚„ãを無視解除ã—ã¾ã—ãŸ" #: src/net/ea/chathandler.cpp:389 msgid "All whispers unignore failed." -msgstr "" +msgstr "å…¨ã¦ã®ã•ã•ã‚„ãã®ç„¡è¦–解除ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" -msgstr "オンラインユーザー：%d" +msgstr "オンラインユーザー: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "ゲーム" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" -msgstr "" +msgstr "今ã‚ャンセルã§ãã¾ã›ã‚“" #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85 msgid "Guild created." @@ -4533,138 +4556,138 @@ msgstr "ギルド作æˆæˆåŠŸ" #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93 msgid "You are already in guild." -msgstr "" +msgstr "æ—¢ã«ã‚®ãƒ«ãƒ‰ã¸å…¥ä¼šã—ã¦ã„ã¾ã™" #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." -msgstr "" +msgstr "èªè¨¼ã‚¨ãƒ©ãƒ¼" #: src/net/ea/guildhandler.cpp:103 msgid "Unknown server response." -msgstr "ä¸æ˜Žãªã‚µãƒ¼ãƒãƒ¼ã®å¿œç”。" +msgstr "サーãƒãƒ¼ã‹ã‚‰ä¸æ˜Žãªå¿œç”ã§ã™" #: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" -msgstr "ギルドå：%s" +msgstr "ギルドå: %s" #: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" -msgstr "ギルドマスタ： %s" +msgstr "ギルドマスター: %s" #: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" -msgstr "ギルドレベル：%d" +msgstr "ギルドレベル: %d" #: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" -msgstr "オンラインウザー： %d" +msgstr "オンラインユーザー: %d" #: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" -msgstr "最大ã®ãƒ¡ãƒ³ãƒãƒ¼ï¼š %d" +msgstr "最大メンãƒãƒ¼æ•°: %d" #: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" -msgstr "å¹³å‡ãƒ¬ãƒ™ãƒ«ï¼š %d" +msgstr "å¹³å‡ãƒ¬ãƒ™ãƒ«: %d" #: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" -msgstr "ギルド経験：%d" +msgstr "ギルドExp: %d" #: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" -msgstr "" +msgstr "次ã®ã‚®ãƒ«ãƒ‰Expã¾ã§: %d" #: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" -msgstr "ギルド城：%s" +msgstr "ギルド城: %s" #: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." -msgstr "" +msgstr "ユーザーをギルドã¸æ‹›å¾…ã§ãã¾ã›ã‚“ã§ã—ãŸ" #: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." -msgstr "" +msgstr "ユーザーã¯ã‚®ãƒ«ãƒ‰æ‹›å¾…ã‚’æ–ã‚Šã¾ã—ãŸ" #: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." -msgstr "" +msgstr "ユーザーã¯ã‚®ãƒ«ãƒ‰ã¸å…¥ä¼šã—ã¾ã—ãŸ" #: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." -msgstr "" +msgstr "ギルドãŒå®šå“¡ã«ãªã‚Šã¾ã—ãŸ" #: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." -msgstr "" +msgstr "ギルド招待ã«å¯¾ã—ã¦ä¸æ˜Žãªè¿”ç”" #: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." -msgstr "" +msgstr "%sãŒã‚®ãƒ«ãƒ‰ã‚’退会ã—ã¾ã—ãŸ" -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "" +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "ギルドã‹ã‚‰è¿½ã„出ã•ã‚Œã¾ã—ãŸ" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." -msgstr "" +msgstr "%sãŒã‚®ãƒ«ãƒ‰ã‹ã‚‰è¿½ã„出ã—ã¾ã—ãŸ" #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" -msgstr "/inviteã§ãƒ‘ーティã«ãƒ—レーヤーを招待ã™ã‚‹ã€‚" +msgstr "/invite パーティã«ãƒ—レイヤーを招待ã™ã‚‹" #: src/net/ea/gui/partytab.cpp:71 msgid "/leave > Leave the party you are in" -msgstr "/leaveã§æ—¢å˜ã®ãƒ‘ーティã‹ã‚‰é›¢ã‚Œã‚‹ã€‚" +msgstr "/leave パーティã‹ã‚‰é€€ä¼šã™ã‚‹" #: src/net/ea/gui/partytab.cpp:72 msgid "/kick > Kick some one from the party you are in" -msgstr "/kickã§æ—¢å˜ã®ãƒ‘ーティã‹ã‚‰ä¸€äººã‚’追ã„出ã—ã¦ã¿ã‚‹ã€‚" +msgstr "/kick パーティã‹ã‚‰ãƒ¡ãƒ³ãƒãƒ¼ã‚’一時的ã«è¿½ã„出ã™" #: src/net/ea/gui/partytab.cpp:73 msgid "/item > Show/change party item sharing options" -msgstr "/item ã§ãƒ‘ーティ内ã®ã‚¢ã‚¤ãƒ†ãƒ シェアモードを表示ãŠã‚ˆã³å¤‰æ›´ã™ã‚‹ã€‚" +msgstr "/item パーティ内ã§ã‚¢ã‚¤ãƒ†ãƒ 共有モードを表示/変更ã™ã‚‹" #: src/net/ea/gui/partytab.cpp:74 msgid "/exp > Show/change party experience sharing options" -msgstr "/exp ã§ãƒ‘ーティ内ã®çµŒé¨“分割モードを表示ãŠã‚ˆã³å¤‰æ›´ã™ã‚‹ã€‚" +msgstr "/exp ã§ãƒ‘ーティ内ã®çµŒé¨“シェアモードを表示/変更ã™ã‚‹" #: src/net/ea/gui/partytab.cpp:84 msgid "This command invites <nick> to party with you." -msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã¯ã€å…¥åŠ›ã—ãŸãƒ—レイヤーを自分ã®ãƒ‘ーティーã«æ‹›å¾…ã—ã¾ã™ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯å…¥åŠ›ã—ãŸãƒ—レイヤーを自分ã®ãƒ‘ーティーã«æ‹›å¾…ã—ã¾ã™" #: src/net/ea/gui/partytab.cpp:91 msgid "This command causes the player to leave the party." -msgstr "本コマンドã§ã¯ãƒ‘ティã‹ã‚‰ãƒ—レイヤーを追ã„出ã•ã›ã‚‹ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒ‘ーティã‹ã‚‰ãƒ—レイヤーを退会ã•ã›ã¾ã™" #: src/net/ea/gui/partytab.cpp:95 msgid "Command: /item <policy>" -msgstr "コマンド: /item <ãƒãƒªã‚·>" +msgstr "コマンド: /item <ãƒãƒªã‚·ãƒ¼>" #: src/net/ea/gui/partytab.cpp:97 msgid "This command changes the party's item sharing policy." -msgstr "本コマンドã§ã¯ã€ã‚¢ã‚¤ãƒ†ãƒ 共有モードを変更ã™ã‚‹ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã‚¢ã‚¤ãƒ†ãƒ 共有モードを変更ã—ã¾ã™" #: src/net/ea/gui/partytab.cpp:98 msgid "" "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or " "\"0\", \"no\", \"false\" to disable item sharing." msgstr "" -"＜ãƒãƒªã‚·ï¼žã‚’有効ã™ã‚‹ãŸã‚ã«ã¯ã€Œï¼‘ã€ã€ã€Œyesã€ã‹ã€Œtrueã€ã‚’è¨å®šãã ã•ã„。無効ã«ã™" -"ã‚‹ãŸã‚ã«ã€ã€Œ0ã€ã€ã€Œnoã€ã‹ã€Œfalseã€ã‚’è¨å®šãã ã•ã„。" +"＜ãƒãƒªã‚·ãƒ¼ï¼ž アイテム共有モードを有効ã™ã‚‹ãŸã‚ã«ã¯ \"1\", \"yes\", \"true\"ã€" +"無効ã«ã™ã‚‹ã«ã¯\"0\", \"no\", \"false\"ã¨å…¥åŠ›ã—ã¦ä¸‹ã•ã„" #: src/net/ea/gui/partytab.cpp:101 msgid "Command: /item" @@ -4672,23 +4695,23 @@ msgstr "コマンド: /item" #: src/net/ea/gui/partytab.cpp:102 msgid "This command displays the party's current item sharing policy." -msgstr "本コマンドã§ã¯ã€ã‚¢ã‚¤ãƒ†ãƒ 共有モードを表示ã™ã‚‹ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã‚¢ã‚¤ãƒ†ãƒ 共有モードを表示ã—ã¾ã™" #: src/net/ea/gui/partytab.cpp:107 msgid "Command: /exp <policy>" -msgstr "コマンド: /exp <ãƒãƒªã‚·>" +msgstr "コマンド: /exp <ãƒãƒªã‚·ãƒ¼>" #: src/net/ea/gui/partytab.cpp:108 msgid "This command changes the party's experience sharing policy." -msgstr "本コマンドã§ã¯ã€çµŒé¨“分割モードを変更ã™ã‚‹ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯çµŒé¨“シェアモードを変更ã—ã¾ã™" #: src/net/ea/gui/partytab.cpp:110 msgid "" "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience " "sharing, or \"0\", \"no\", \"false\" to disable experience sharing." msgstr "" -"<ãƒãƒªã‚·>を有効ã™ã‚‹ãŸã‚ã«ã¯ã€ã€Œ1ã€ã€ã€Œyesã€ã‹ã€Œtrueã€ã‚’è¨å®šãã ã•ã„。無効ã«ã™" -"ã‚‹å ´åˆã€ã€Œ0ã€ã€ã€Œnoã€ã‹ã€Œfalseã€ã‚’è¨å®šãã ã•ã„。" +"＜ãƒãƒªã‚·ãƒ¼ï¼ž 経験シェアモードを有効ã™ã‚‹ãŸã‚ã«ã¯ \"1\", \"yes\", \"true\"ã€ç„¡" +"効ã«ã™ã‚‹ã«ã¯\"0\", \"no\", \"false\"ã¨å…¥åŠ›ã—ã¦ä¸‹ã•ã„" #: src/net/ea/gui/partytab.cpp:113 msgid "Command: /exp" @@ -4696,112 +4719,112 @@ msgstr "コマンド: /exp" #: src/net/ea/gui/partytab.cpp:114 msgid "This command displays the party's current experience sharing policy." -msgstr "本コマンドã§ã¯ã€ãƒ‘ーティメンãƒãƒ¼ä»¥å†…ã®çµŒé¨“分割方é‡ã‚’表示ã™ã‚‹ã€‚" +msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒ‘ーティメンãƒãƒ¼ã®çµŒé¨“シェアモードを表示ã—ã¾ã™" #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285 msgid "Item sharing enabled." -msgstr "アイテムシェア有効" +msgstr "アイテム共有モード有効" #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295 msgid "Item sharing disabled." -msgstr "アイテムシェア無効" +msgstr "アイテム共有モード無効" #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305 msgid "Item sharing not possible." -msgstr "アイテムシェアä¸å¯èƒ½" +msgstr "アイテム共有モードä¸å¯èƒ½" #: src/net/ea/gui/partytab.cpp:157 msgid "Item sharing unknown." -msgstr "アイテムシェアä¸æ˜Ž" +msgstr "アイテム共有モードä¸æ˜Ž" #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247 msgid "Experience sharing enabled." -msgstr "経験シェア有効" +msgstr "経験シェアモード有効" #: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257 msgid "Experience sharing disabled." -msgstr "経験シェア無効" +msgstr "経験シェアモード無効" #: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267 msgid "Experience sharing not possible." -msgstr "経験シェアä¸å¯èƒ½" +msgstr "経験シェアモードä¸å¯èƒ½" #: src/net/ea/gui/partytab.cpp:196 msgid "Experience sharing unknown." -msgstr "経験シェアä¸æ˜Ž" +msgstr "経験シェアモードä¸æ˜Ž" #: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." -msgstr "アイテム使用失敗" +msgstr "アイテム使用ã«å¤±æ•—" #: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." -msgstr "装備ä¸å¯èƒ½" +msgstr "装ç€ä¸å¯èƒ½" #: src/net/ea/loginhandler.cpp:131 msgid "Account was not found. Please re-login." -msgstr "アカウントãŒè¦‹ã¤ã‹ã‚‰ãªã‹ã£ãŸã€‚å†ãƒã‚°ã‚¤ãƒ³ã‚’ãã ã•ã„。" +msgstr "アカウントãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ä¸‹ã•ã„" #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." -msgstr "" +msgstr "変更å‰ã®ãƒ‘スワードãŒé–“é•ã£ã¦ã„ã¾ã™" #: src/net/ea/loginhandler.cpp:137 msgid "New password too short." -msgstr "新パスワードã¯çŸã„éŽãŽã¾ã™ã€‚" +msgstr "æ–°ã—ã„パスワードã¯æ–‡å—æ•°ãŒè¶³ã‚Šã¾ã›ã‚“" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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 "ä¸æ˜Žã‚¨ãƒ©ãƒ¼" +msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼" -#: src/net/ea/loginhandler.cpp:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." -msgstr "未登録ãªID。" +msgstr "未登録ãªID" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." -msgstr "入力ã—ãŸãƒ‘スワードã¯é–“é•ã£ã¦ã„ã¾ã™ã€‚" +msgstr "入力ã—ãŸãƒ‘スワードã¯é–“é•ã£ã¦ã„ã¾ã™" -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." -msgstr "アカウントã®æœ‰åŠ¹æœŸé™ãŒåˆ‡ã‚‰ã‚ŒãŸã€‚" +msgstr "アカウントã®æœ‰åŠ¹æœŸé™ãŒåˆ‡ã‚Œã¾ã—ãŸ" -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." -msgstr "" +msgstr "サーãƒãƒ¼ã‹ã‚‰æ‹’å¦ã•ã‚Œã¾ã—ãŸ" -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." -msgstr "" +msgstr "ゲームã‹ã‚‰æ°¸ä¹…追放ã•ã‚Œã¾ã—ãŸã€‚詳細ã¯GMãƒãƒ¼ãƒ ã¸é€£çµ¡ã—ã¦ä¸‹ã•ã„" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." -msgstr "" +msgstr "アップデートãŒå¿…è¦ã§ã™" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" -"ã‚ãªãŸã¯%sã¾ã§ã‚²ãƒ¼ãƒ ã‹ã‚‰ãƒãƒ¼ãƒ³ã•ã‚ŒãŸã€‚\n" -"ゲームマスターãŸã¡ã«ã”連絡ãã ã•ã„。" +"ã‚ãªãŸã¯%sã¾ã§ã‚²ãƒ¼ãƒ ã‹ã‚‰è¿½æ”¾ã•ã‚Œã¾ã—ãŸã€‚\n" +"GMã«ã”連絡下ã•ã„。" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." -msgstr "" +msgstr "サーãƒãƒ¼ãŒæ··é›‘ã—ã¦ã„ã¾ã™" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." -msgstr "ユーザåã¯ã‚‚ã†ä½¿ã‚ã‚Œã¦ã„る。" +msgstr "ユーザåã¯æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™" -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." -msgstr "" +msgstr "ユーザーãƒãƒ¼ãƒ ã¯æ°¸ä¹…ã«å‰Šé™¤ã•ã‚Œã¾ã—ãŸ" #: src/net/ea/partyhandler.cpp:80 msgid "Could not create party." @@ -4809,89 +4832,88 @@ msgstr "パーティ作æˆå¤±æ•—" #: src/net/ea/partyhandler.cpp:82 msgid "Party successfully created." -msgstr "パーティ作æˆæˆåŠŸ" +msgstr "パーティを作æˆã—ã¾ã—ãŸ" #: src/net/ea/partyhandler.cpp:138 #, c-format msgid "%s has joined your party." -msgstr "" +msgstr "%sãŒãƒ‘ーティã«å‚åŠ ã—ã¾ã—ãŸ" #: src/net/ea/partyhandler.cpp:174 #, c-format msgid "%s is already a member of a party." -msgstr "%sã¯ã‚‚ã†ãƒ‘ーティã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã‚る。" +msgstr "%sã¯æ—¢ã«ãƒ‘ーティã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™" #: src/net/ea/partyhandler.cpp:179 #, c-format msgid "%s refused your invitation." -msgstr "%sã¯æ‹›å¾…ã‚’æ‹’ã‚“ã 。" +msgstr "%sã¯æ‹›å¾…ã‚’æ‹’å¦ã—ã¾ã—ãŸ" #: src/net/ea/partyhandler.cpp:184 #, c-format msgid "%s is now a member of your party." -msgstr "%sã¯ä»Šã‹ã‚‰ãƒ‘ーティã®ãƒ¡ãƒ³ãƒãƒ¼ã«ãªã£ãŸã€‚" +msgstr "%sã¯ãƒ‘ーティã®ãƒ¡ãƒ³ãƒãƒ¼ã«ãªã‚Šã¾ã—ãŸ" #: src/net/ea/partyhandler.cpp:189 #, c-format msgid "%s can't join your party because party is full." -msgstr "" +msgstr "パーティãŒæº€å“¡ã®ç‚º%sã¯å‚åŠ ã§ãã¾ã›ã‚“" #: src/net/ea/partyhandler.cpp:194 #, c-format msgid "QQQ Unknown invite response for %s." -msgstr "" +msgstr "QQQ %sã‹ã‚‰ä¸æ˜Žãªè¿”ç”" #: src/net/ea/partyhandler.cpp:358 msgid "You have left the party." -msgstr "パーティã‹ã‚‰é›¢ã‚ŒãŸã€‚" +msgstr "パーティã‹ã‚‰é€€ä¼šã—ã¾ã—ãŸ" #: src/net/ea/partyhandler.cpp:371 #, c-format msgid "%s has left your party." -msgstr "%sãŒãƒ‘ーティã‹ã‚‰é›¢ã‚ŒãŸã€‚" +msgstr "%sãŒãƒ‘ーティã‹ã‚‰é€€ä¼šã—ã¾ã—ãŸ" #: src/net/ea/partyhandler.cpp:448 #, c-format msgid "An unknown member tried to say: %s" -msgstr "ä¸æ˜Žãªãƒ¡ãƒ³ãƒãƒ¼ãŒè¨€ãŠã†ã¨ã—ãŸäº‹: %s" +msgstr "ä¸æ˜Žãªãƒ¡ãƒ³ãƒãƒ¼ã‹ã‚‰ã®å¿œç”: %s" #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." -msgstr "ã‚ãªãŸã¯æ»ã«ã¾ã—ãŸã€‚" +msgstr "ã‚ãªãŸã¯æ»ã«ã¾ã—ãŸ" #: 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 "残念ãªãŠçŸ¥ã‚‰ã›ã§ã™ãŒã€ã‚ãªãŸæ§˜ã®ã‚ャラã¯æˆ¦é—˜ä¸äº¡ããªã£ã¦ã—ã¾ã„ã¾ã—ãŸã€‚" +msgstr "残念ãªãŠçŸ¥ã‚‰ã›ã§ã™ãŒã€ã‚ãªãŸæ§˜ã®ã‚ャラã¯æˆ¦é—˜ä¸ã«ãŠäº¡ããªã‚Šã«ãªã‚Šã¾ã—ãŸ" #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." -msgstr "今ã‹ã‚‰ç”Ÿãã¦ã„ãªã„。" +msgstr "æ—¢ã«æ»ã‚“ã§ã„る模様ã§ã™" #: 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." -msgstr "æ»ç¥žã®å†·ãŸã„手ã«é‚ãŒå–られã¦ã—ã¾ã£ãŸã€‚" +msgstr "æ»ç¥žã®å†·ãŸã„手ã«é‚ãŒå–られã¦ã—ã¾ã£ãŸ" #: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" -msgstr "ゲームオーãƒãƒ¼!" +msgstr "ゲームオーãƒãƒ¼" #: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." -msgstr "ゲームを続ã‘ã‚‹ãŸã‚ã«ã¯ã‚³ã‚¤ãƒ³ã‚’入れã¦ãã ã•ã„。" +msgstr "ゲームを続ã‘ã‚‹ãŸã‚ã«ã¯ã‚³ã‚¤ãƒ³ã‚’入れã¦ãã ã•ã„" #: src/net/ea/playerhandler.cpp:103 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 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." -msgstr "å–‰ã§çš„ã®æ¦å™¨ã‚’æ½°ã™äºˆå®šã ã£ãŸãŒâ€¦å¤±æ•—ã—ãŸã€‚" +msgstr "敵ã®æ¦å™¨ã‚’æ½°ã™äºˆå®šã ã£ãŸãŒâ€¦å¤±æ•—ã—ãŸ" #: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." @@ -4899,80 +4921,78 @@ msgstr "ã‚ã‚“ã¾ã‚Šä¸Šæ‰‹ãã„ã‹ãªã‹ã£ãŸãœãƒ¼" #: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" -msgstr "æŒã¡ç‰©ã‚’確定ã—ã¦æ¬²ã—ã„？" +msgstr "éºä½“ã®æŒã¡ç‰©ã‚’確定ã—ã¦æ¬²ã—ã„？" #: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." -msgstr "悲ã—ã•ã®ã‚ã¾ã‚Šã€ç—•è·¡ã§ã•ãˆè¦‹ã¤ã‹ã‚‰ãªã‹ã£ãŸã€‚" +msgstr "悲ã—ã„ã§ã™ãŒã‚ãªãŸã®è·¡å½¢ã•ãˆã‚‚残ã£ã¦ã„ã¾ã›ã‚“" #: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." -msgstr "全滅ã•ã‚ŒãŸã€‚" +msgstr "全滅ã—ã¡ã‚ƒã£ãŸ" #: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." -msgstr "相手ã‹ã‚‰è‡ªåˆ†ã®é ãŒæ¸¡ã•ã‚ŒãŸã¿ãŸã„。" +msgstr "敵ã‹ã‚‰ã€Œå¿˜ã‚Œç‰©ã€ã£ã¦è‡ªåˆ†ã®é を渡ã•ã‚Œã¾ã—ãŸ" #: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." -msgstr "ã‚‚ã†ä¸€å›žå€’ã•ã‚ŒãŸã€æ°´é“管ã‹ã‚‰æ»ä½“を這ã£ã¦ã¿ãŸå¾Œã€æ–°ä½“ã‚’å—ã‘å–ã£ã¦ã¿ã¦" +msgstr "ã¾ãŸã‚„ã£ã¡ã‚ƒã£ãŸã。æ»ä½“をドブã«æ¨ã¦ãŸã‚‰æ–°ã—ã„ã®ã‚‚らãˆã‚‹ã‹ã‚‚" #: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." -msgstr "ã¾ã æ»ãªãªã‹ã£ãŸã€‚休憩ä¸ã ã‘ã§ã‚る。" +msgstr "ã¾ã æ»ã‚“ã§ã„ã¾ã›ã‚“。一時休憩ä¸ã§ã™" #: src/net/ea/playerhandler.cpp:121 msgid "You are no more." -msgstr "ã‚ãªãŸã¯ã‚‚ã†å˜åœ¨ã—ã¦ã„ãªã„。" +msgstr "ã‚ãªãŸã¯ç„¡ã«ãªã£ãŸ" #: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." -msgstr "生ãã‚‹ã“ã¨ãªãã€ã„ãªããªã£ãŸã€‚" +msgstr "å˜åœ¨ã‚’消ã—去ã£ãŸ" #: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." -msgstr "ã‚ãªãŸã¯æ¯ã‚’引ãå–ã‚Šã€ã‚ãªãŸã‚’作ã£ãŸäººã¸é€¢ã„ã«è¡Œã£ã¦ã—ã¾ã£ãŸã€‚" +msgstr "ã‚ãªãŸã¯æ¯ã‚’引ãå–ã‚Šã€ç¥žã®å…ƒã¸æ—…ç«‹ã£ãŸ" #: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." -msgstr "ã‚ãªãŸã¯æ»ä½“ã§ã‚る。" +msgstr "ã‚ãªãŸã¯æ»ä½“ã«ãªã£ãŸ" #: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." -msgstr "命を失ã„ã€å¤©å›½ã«å‘ã‹ã£ãŸã€‚" +msgstr "命を失ã„天国ã«å‘ã‹ã£ãŸ" #: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" -"ã‚‚ã—ã‚ãªãŸãŒãã‚“ãªã«ã‚‚生気ã«æº€ã¡ã¦ã„ãªã‹ã£ãŸãªã‚‰ã°ã€æ»ã‚“ã§è‘¬ã‚‰ã‚Œã¦ã„ãŸã‚“ã˜ã‚ƒ" -"ãªã„ã‹ï¼Ÿ" +msgstr "ãã‚“ãªã«ã‚‚生気ã«æº€ã¡ã¦ã„ãªã‘ã‚Œã°æ—¢ã«è‘¬ã‚‰ã‚Œã¦ã„ãŸã¯ãš" #: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." -msgstr "ã‚ãªãŸã®ãŒã‚“ã°ã‚Šã¯ä»Šã‚„æ´å²ã¨ãªã£ãŸã‚‰ã—ã„。" +msgstr "ã‚ãªãŸã®ãŒã‚“ã°ã‚Šã¯ä»Šã‚„æ´å²ã¨ãªã£ãŸ" #: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." -msgstr "クタãƒãƒƒã‚¿ã¿ãŸã„ãªã€‚" +msgstr "æ»ã‚“ã˜ã‚ƒã£ãŸ" #: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." -msgstr "人間界ã‹ã‚‰è¿½ã„出ã•ã‚ŒãŸã€‚" +msgstr "ã‚„ã£ã¡ã‚ƒã£ãŸ" #: 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 "最後ã®å‘¼å¸ã ã£ãŸã€‚æ»ç¥žã«ä¼šã£ãŸå¾Œã€ç„¡ã¨çµåˆã—ãŸ" #: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." -msgstr "旧プレイヤーã§ã‚る。" +msgstr "å˜åœ¨ã—ãªã„プレイヤーã§ã™" #: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." -msgstr "ãŠå‰ã®é‚ã¯åŒ—極ã¾ã§é£›ã°ã‚ŒãŸã€‚" +msgstr "ãŠå‰ã®é‚ã¯åŒ—極ã¾ã§é£›ã°ã‚ŒãŸ" #: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 #: src/net/ea/playerhandler.cpp:427 @@ -4982,33 +5002,33 @@ msgstr "メッセージ" #: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." -msgstr "æŒã£ã¦ã„るアイテムã¯ä½“é‡ã‚ˆã‚ŠåŠåˆ†ä»¥ä¸Šãªã®ã§ã€ä½“力ãŒå›žå¾©ã§ããªã„。" +msgstr "インベントリーãŒä½“é‡ã®åŠåˆ†ä»¥ä¸Šã®ç‚ºã€ä½“力ã¯å›žå¾©ã§ãã¾ã›ã‚“" #: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." -msgstr "" +msgstr "インベントリーãŒä½“é‡ã®åŠåˆ†ä»¥ä¸‹ã«ãªã£ãŸç‚ºã€ä½“力ã¯å›žå¾©ã—ã¾ã™" #: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." -msgstr "" +msgstr "%sを手ã«å…¥ã‚Œã¾ã—ãŸ" #: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." -msgstr "ã‚ãªãŸã¯ %s を費やã—" +msgstr "%sを使ã„ã¾ã—ãŸ" #: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" -msgstr "スã‚ルã¯ã‚‚ã†ä¸ŠãŒã‚‰ãªã„ï¼" +msgstr "スã‚ルã¯ã“れ以上ã‚ãŒã‚Šã¾ã›ã‚“" #: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." -msgstr "矢を先ã«è£…å‚™ã—ã¦ãã ã•ã„。" +msgstr "矢を装ç€ã—ã¦ä¸‹ã•ã„" #: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" -msgstr "å–引失敗" +msgstr "トレード失敗" #: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" @@ -5016,7 +5036,7 @@ msgstr "スマイリー表示失敗" #: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" -msgstr "触るã“ã¨ãŒå¤±æ•—ã—ãŸã€‚" +msgstr "座れã¾ã›ã‚“" #: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" @@ -5024,110 +5044,110 @@ msgstr "ãƒãƒ£ãƒƒãƒˆä½œæˆå¤±æ•—" #: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" -msgstr "パーティã«å‚åŠ ã§ããªã‹ã£ãŸï¼" +msgstr "パーティã«å‚åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸ" #: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" -msgstr "å«ã¹ãªã„ï¼" +msgstr "å«ã¹ã¾ã›ã‚“" #: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" -msgstr "ã‚ãªãŸã¯ã¾ã å分ã«é«˜ã„lvlã‚’é”ã—ã¦ã„ãªã„ï¼" +msgstr "ã‚ãªãŸã¯ã¾ã å分ãªlvlã«é”ã—ã¦ã„ã¾ã›ã‚“" #: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" -msgstr "HPä¸è¶³ï¼" +msgstr "HPä¸è¶³" #: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" -msgstr "SPä¸è¶³ï¼" +msgstr "SPä¸è¶³" #: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" -msgstr "メモãªã—ï¼" +msgstr "メモãŒã‚ã‚Šã¾ã›ã‚“" #: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" -msgstr "今ã“ã®è¡Œå‹•ã¯ç„¡ç†ã€‚" +msgstr "今ã“ã®è¡Œå‹•ã¯ã§ãã¾ã›ã‚“" #: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" -msgstr "é‡‘æ¬ ã¿ãŸã„ã‚“ã˜ã‚ƒãªã„ã‹â€¦" +msgstr "ãŠé‡‘ãŒè¶³ã‚Šã¾ã›ã‚“" #: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" -msgstr "本スã‚ルãŒã“ã®æ¦å™¨ã¨ä½¿ãˆãªã„。" +msgstr "ã“ã®ã‚¹ã‚ルã¯ã“ã®æ¦å™¨ã¨ä¸€ç·’ã«ä½¿ãˆã¾ã›ã‚“" #: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" -msgstr "ä»–ã®èµ¤å®çŸ³ãŒå¿…è¦ã¨ãªã£ãŸï¼" +msgstr "Red GemãŒå¿…è¦ã§ã™" #: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" -msgstr "ä»–ã®é’å®çŸ³ãŒå¿…è¦ã¨ãªã£ãŸï¼" +msgstr "Blue GemãŒå¿…è¦ã§ã™" #: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" -msgstr "アイテムãŒæŒã¡ã™ãŽã¦ã„る状態ï¼" +msgstr "アイテムをæŒã¡ã™ãŽã¦ã„ã¾ã™" #: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" -msgstr "ã†ã‚“？何ãれ？" +msgstr "ãˆï¼Ÿä½•ãれ？" #: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." -msgstr "ワープãŒå¤±æ•—ã—ãŸã€‚" +msgstr "ワープã«å¤±æ•—ã—ã¾ã—ãŸ" #: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." -msgstr "何も盗ã‚ãªã‹ã£ãŸâ€¦" +msgstr "何も盗ã‚ã¾ã›ã‚“ã§ã—ãŸ" #: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." -msgstr "毒ã¯ä¸åŠ¹æžœ" +msgstr "毒ã®å½±éŸ¿ã¯ãªã‹ã£ãŸ" #: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128 #, c-format msgid "%s wants to trade with you, do you accept?" -msgstr "%sã¯ã‚ãªãŸã¨å–引ã—ãŸã„ã¿ãŸã„ãŒã€å¿œã˜ã‚‹ï¼Ÿ" +msgstr "%sã¯ã‚ãªãŸã«ãƒˆãƒ¬ãƒ¼ãƒ‰ã‚’申請ã—ã¦ã„ã¾ã™" #: src/net/ea/tradehandler.cpp:135 msgid "Trading isn't possible. Trade partner is too far away." -msgstr "å–引ã¯ä¸å¯èƒ½ã€‚å–引ã®ç›¸æ‰‹ã¯é ã™ãŽã‚‹ã€‚" +msgstr "相手ãŒé ã™ãŽã‚‹ç‚ºãƒˆãƒ¬ãƒ¼ãƒ‰ã¯ä¸å¯èƒ½ã§ã™" #: src/net/ea/tradehandler.cpp:139 msgid "Trading isn't possible. Character doesn't exist." -msgstr "å–引ã¯ä¸å¯èƒ½ã€‚本ã‚ャラãŒå˜åœ¨ã—ã¦ã„ãªã„。" +msgstr "ã‚ャラクターãŒå˜åœ¨ã—ãªã„為トレードã¯ä¸å¯èƒ½ã§ã™" #: src/net/ea/tradehandler.cpp:143 msgid "Trade cancelled due to an unknown reason." -msgstr "ä¸æ˜Žãªç†ç”±ã§å–引ãŒä¸æ¢ã•ã‚ŒãŸã€‚" +msgstr "ä¸æ˜Žãªç†ç”±ã§ãƒˆãƒ¬ãƒ¼ãƒ‰ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸ" #: src/net/ea/tradehandler.cpp:149 #, c-format msgid "Trade: You and %s" -msgstr "ã‚ãªãŸã¨%sã¨ã®å–引" +msgstr "ã‚ãªãŸã¨%sã¨ã®ãƒˆãƒ¬ãƒ¼ãƒ‰" #: src/net/ea/tradehandler.cpp:159 #, c-format msgid "Trade with %s cancelled." -msgstr "%sã¨ã®å–引ãŒä¸æ¢ã•ã‚ŒãŸã€‚" +msgstr "%sã¨ã®ãƒˆãƒ¬ãƒ¼ãƒ‰ã¯ä¸æ¢ã•ã‚Œã¾ã—ãŸ" #: src/net/ea/tradehandler.cpp:172 msgid "Unhandled trade cancel packet." -msgstr "ã§ããªã‹ã£ãŸå–引ã‚ャンセルパケット" +msgstr "ã§ããªã‹ã£ãŸãƒˆãƒ¬ãƒ¼ãƒ‰ã‚ャンセルパケット" #: src/net/ea/tradehandler.cpp:237 msgid "Failed adding item. Trade partner is over weighted." -msgstr "ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—ã€‚ç›¸æ‰‹ã¯ã‚¢ã‚¤ãƒ†ãƒ ã‚’æŒã¡ã™ãŽã¦ã„る状態ã§ã‚る。" +msgstr "ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—ã€‚ç›¸æ‰‹ã®ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªãƒ¼ã®é‡é‡ã‚ªãƒ¼ãƒãƒ¼ã§ã™" #: src/net/ea/tradehandler.cpp:242 msgid "Failed adding item. Trade partner has no free slot." -msgstr "ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—ã€‚ç›¸æ‰‹ã®ç©ºã„ã¦ã„るスãƒãƒƒãƒˆã¯ãªã„。" +msgstr "ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—ã€‚ç›¸æ‰‹ã®ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªãƒ¼ã«ç©ºã‚¹ãƒãƒƒãƒˆãŒã‚ã‚Šã¾ã›ã‚“" #: src/net/ea/tradehandler.cpp:247 msgid "Failed adding item. You can't trade this item." -msgstr "" +msgstr "ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—ã€‚ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ãƒˆãƒ¬ãƒ¼ãƒ‰ã§ãã¾ã›ã‚“" #: src/net/ea/tradehandler.cpp:251 msgid "Failed adding item for unknown reason." @@ -5135,181 +5155,181 @@ msgstr "ä¸æ˜Žãªç†ç”±ã§ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—" #: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." -msgstr "å–引ä¸æ¢" +msgstr "トレードä¸æ¢" #: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." -msgstr "å–引完了" +msgstr "トレード完了" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" -msgstr "å¼·ã•" +msgstr "Strength" #: src/net/manaserv/attributes.cpp:167 #, c-format msgid "Strength %+.1f" -msgstr "強度 (str) %+.1f" +msgstr "Strength %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" -msgstr "ç´ æ—©ã•" +msgstr "Agility" #: src/net/manaserv/attributes.cpp:180 #, c-format msgid "Agility %+.1f" -msgstr "æ©Ÿæ•ã• (agi) %+.1f" +msgstr "Agility %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" -msgstr "器用ã•" +msgstr "Dexterity" #: src/net/manaserv/attributes.cpp:193 #, c-format msgid "Dexterity %+.1f" -msgstr "器用㕠(dex) %+.1f" +msgstr "Dexterity %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" -msgstr "活力" +msgstr "Vitality" #: src/net/manaserv/attributes.cpp:206 #, c-format msgid "Vitality %+.1f" -msgstr "活気 (vit) %+.1f" +msgstr "Vitality %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" -msgstr "知能" +msgstr "Intelligence" #: src/net/manaserv/attributes.cpp:219 #, c-format msgid "Intelligence %+.1f" -msgstr "知能 (int) %+.1f" +msgstr "Intelligence %+.1f" #: src/net/manaserv/attributes.cpp:225 msgid "Willpower" -msgstr "気力" +msgstr "Willpower" #: src/net/manaserv/attributes.cpp:232 #, c-format msgid "Willpower %+.1f" -msgstr "æ„地 (wil) %+.1f" +msgstr "Willpower %+.1f" #: src/net/manaserv/beinghandler.cpp:337 msgid "Press OK to respawn." -msgstr "" +msgstr "蘇るã«ã¯OKを押ã—ã¦ä¸‹ã•ã„" #: src/net/manaserv/beinghandler.cpp:338 msgid "You Died" -msgstr "æ»ã‚“ã§ã—ã¾ã£ãŸã€‚" +msgstr "æ»ã‚“ã§ã—ã¾ã£ãŸ" #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219 msgid "Not logged in." -msgstr "" +msgstr "å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ä¸‹ã•ã„" #: src/net/manaserv/charhandler.cpp:148 msgid "No empty slot." -msgstr "" +msgstr "空スãƒãƒƒãƒˆãŒã‚ã‚Šã¾ã›ã‚“" #: src/net/manaserv/charhandler.cpp:151 msgid "Invalid name." -msgstr "ä¸å½“åå‰" +msgstr "無効ãªåå‰" #: src/net/manaserv/charhandler.cpp:154 msgid "Character's name already exists." -msgstr "ユーザーåã¯æ—¢ã«å˜åœ¨ã—ã¦ã„る。" +msgstr "æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹ã‚ャラクターåã§ã™" #: src/net/manaserv/charhandler.cpp:157 msgid "Invalid hairstyle." -msgstr "ä¸å½“髪型" +msgstr "髪型ãŒãƒ€ã‚µã„ã®ã§å¤±æ ¼" #: src/net/manaserv/charhandler.cpp:160 msgid "Invalid hair color." -msgstr "" +msgstr "無効ã®é«ªè‰²" #: src/net/manaserv/charhandler.cpp:163 msgid "Invalid gender." -msgstr "無効ãªæ€§çš„。" +msgstr "ã‚ャラã®æ€§åˆ¥é–“é•ã£ã¦ã‚‹ã‚“ã˜ã‚ƒãªã„？" #: src/net/manaserv/charhandler.cpp:166 msgid "Character's stats are too high." -msgstr "" +msgstr "ã‚ャラクターã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒé«˜ã™ãŽã¾ã™" #: src/net/manaserv/charhandler.cpp:169 msgid "Character's stats are too low." -msgstr "" +msgstr "ã‚ャラクターã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒä½Žã™ãŽã¾ã™" #: src/net/manaserv/charhandler.cpp:172 #, c-format msgid "At least one stat is out of the permitted range: (%u - %u)." -msgstr "" +msgstr "1ã¤ã¾ãŸã¯è¤‡æ•°ã®ã‚¹ã‚¿ãƒƒãƒ„ãŒæœ€å¤§ã‚’超ãˆã¦ã„ã¾ã™: (%u - %u)." #: src/net/manaserv/charhandler.cpp:178 msgid "Invalid slot number." -msgstr "ç„¡åŠ¹å ´æ‰€ã®å·" +msgstr "スãƒãƒƒãƒˆãƒŠãƒ³ãƒãƒ¼ãŒç„¡åŠ¹ã§ã™" #: src/net/manaserv/charhandler.cpp:210 msgid "Player deleted." -msgstr "プレイヤーã¯å‰Šé™¤ã•ã‚ŒãŸã€‚" +msgstr "プレイヤーã¯å‰Šé™¤ã•ã‚Œã¾ã—ãŸ" #: src/net/manaserv/charhandler.cpp:222 msgid "Selection out of range." -msgstr "" +msgstr "ターゲットãŒé ã™ãŽã¾ã™" #: src/net/manaserv/charhandler.cpp:225 #, c-format msgid "Unknown error (%d)." -msgstr "ä¸æ˜Žã‚¨ãƒ©ãƒ¼ (%d)。" +msgstr "ä¸æ˜Žã‚¨ãƒ©ãƒ¼ (%d)" #: src/net/manaserv/charhandler.cpp:261 msgid "No gameservers are available." -msgstr "全サーãƒã¯ç¾åœ¨ãƒ•ãƒ¼ãƒ«ã§ã‚る。" +msgstr "利用ã§ãるゲームサーãƒãƒ¼ãŒã‚ã‚Šã¾ã›ã‚“" #: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309 #: src/net/manaserv/guildhandler.cpp:265 #, c-format msgid "Topic: %s" -msgstr "トピック：%s" +msgstr "トピック: %s" #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269 msgid "Players in this channel:" -msgstr "" +msgstr "ã“ã®ãƒãƒ£ãƒ³ãƒãƒ«ã«ã„るプレイヤー:" #: src/net/manaserv/chathandler.cpp:208 msgid "Error joining channel." -msgstr "" +msgstr "ãƒãƒ£ãƒ³ãƒãƒ«ã«å‚åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸ" #: src/net/manaserv/chathandler.cpp:214 msgid "Listing channels." -msgstr "" +msgstr "ãƒãƒ£ãƒ³ãƒãƒ«ã‚’表示ã—ã¦ã„ã¾ã™" #: src/net/manaserv/chathandler.cpp:226 msgid "End of channel list." -msgstr "" +msgstr "å…¨ã¦ã®ãƒãƒ£ãƒ³ãƒãƒ«ãƒªã‚¹ãƒˆ" #: src/net/manaserv/chathandler.cpp:299 #, c-format msgid "%s entered the channel." -msgstr "" +msgstr "%sãŒãƒãƒ£ãƒ³ãƒãƒ«ã«å‚åŠ ã—ã¾ã—ãŸ" #: src/net/manaserv/chathandler.cpp:304 #, c-format msgid "%s left the channel." -msgstr "" +msgstr "%sãŒãƒãƒ£ãƒ³ãƒãƒ«ã‹ã‚‰å¤–出ã—ã¾ã—ãŸ" #: src/net/manaserv/chathandler.cpp:320 #, c-format msgid "%s has set mode %s on user %s." -msgstr "" +msgstr "%sãŒ%sã«%sã—ã¾ã—ãŸ" #: src/net/manaserv/chathandler.cpp:331 #, c-format msgid "%s has kicked %s." -msgstr "%s ã¯ï¼…ã‚’è¹´ã£ãŸ %s" +msgstr "%sã¯%sを追ã„出ã—ã¾ã—ãŸ" #: src/net/manaserv/chathandler.cpp:337 msgid "Unknown channel event." -msgstr "" +msgstr "ä¸æ˜Žãªãƒãƒ£ãƒ³ãƒãƒ«ã‚¤ãƒ™ãƒ³ãƒˆ" #: src/net/manaserv/guildhandler.cpp:90 msgid "Error creating guild." @@ -5321,7 +5341,7 @@ msgstr "招待é€ä¿¡æˆåŠŸ" #: src/net/manaserv/guildhandler.cpp:207 msgid "Member was promoted successfully." -msgstr "本メンãƒãƒ¼ãŒç„¡äº‹ã«æ˜‡é€²ã•ã‚ŒãŸã€‚" +msgstr "本メンãƒãƒ¼ãŒç„¡äº‹ã«æ˜‡é€²ã•ã‚Œã¾ã—ãŸ" #: src/net/manaserv/guildhandler.cpp:212 msgid "Failed to promote member." @@ -5329,378 +5349,291 @@ msgstr "メンãƒãƒ¼æ˜‡é€²å¤±æ•—" #: src/net/manaserv/loginhandler.cpp:93 msgid "Wrong magic_token." -msgstr "" +msgstr "é–“é•ã£ãŸãƒžã‚¸ãƒƒã‚¯ãƒˆãƒ¼ã‚¯ãƒ³ã§ã™" #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281 msgid "Already logged in." -msgstr "ã™ã§ã«ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™ã€‚" +msgstr "æ—¢ã«ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:99 msgid "Account banned." -msgstr "" +msgstr "アカウントåœæ¢ã•ã‚Œã¾ã—ãŸ" #: src/net/manaserv/loginhandler.cpp:124 msgid "New password incorrect." -msgstr "" +msgstr "æ–°ã—ã„パスワードãŒé–“é•ã£ã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163 msgid "Account not connected. Please login first." -msgstr "アカウントãŒæŽ¥ç¶šã•ã‚Œã¦ã„ãªã„。最åˆã«ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。" +msgstr "アカウントãŒæŽ¥ç¶šã•ã‚Œã¦ã„ã¾ã›ã‚“。最åˆã«ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„" #: src/net/manaserv/loginhandler.cpp:156 msgid "New email address incorrect." -msgstr "" +msgstr "æ–°ã—ã„メールアドレスãŒé–“é•ã£ã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:159 msgid "Old email address incorrect." -msgstr "" +msgstr "変更å‰ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒé–“é•ã£ã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:167 msgid "The new email address already exists." -msgstr "" +msgstr "æ–°ã—ã„メールアドレスã¯æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:249 msgid "" "Client registration is not allowed. Please contact server administration." -msgstr "" +msgstr "クライアントã‹ã‚‰ã®ç™»éŒ²ã¯ã§ãã¾ã›ã‚“。サーãƒãƒ¼ç®¡ç†è€…ã«é€£çµ¡ã‚’ã—ã¦ä¸‹ã•ã„" #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312 msgid "Client version is too old." -msgstr "" +msgstr "アップデートãŒå¿…è¦ã§ã™" #: src/net/manaserv/loginhandler.cpp:278 msgid "Wrong username or password." -msgstr "" +msgstr "ユーザーãƒãƒ¼ãƒ ã¾ãŸã¯ãƒ‘スワードãŒé–“é•ã£ã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:284 msgid "Account banned" -msgstr "アカウントãŒç¦æ¢ã•ã‚Œã¦" +msgstr "アカウントã¯è¿½æ”¾ã•ã‚Œã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:287 msgid "Login attempt too soon after previous attempt." -msgstr "" +msgstr "時間ãŒçµŒã£ã¦ã‹ã‚‰å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ä¸‹ã•ã„" #: src/net/manaserv/loginhandler.cpp:315 msgid "Wrong username, password or email address." -msgstr "ユーザåã€ãƒ‘スワードã‹ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãŒé–“é•ã£ã¦ã‚‹ã€‚" +msgstr "ユーザåã€ãƒ‘スワードã€ã¾ãŸã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒé–“é•ã£ã¦ã„ã¾ã™" #: src/net/manaserv/loginhandler.cpp:318 msgid "Username already exists." -msgstr "ユーザーåã¯æ—¢ã«å˜åœ¨ã—ã¦ã„る。" +msgstr "æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„るユーザーåã§ã™" #: src/net/manaserv/loginhandler.cpp:321 msgid "Email address already exists." -msgstr "メールアドレスãŒæ—¢ã«å˜åœ¨ã—ã¦ã„る。" +msgstr "æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„るメールアドレスã§ã™" #: src/net/manaserv/loginhandler.cpp:324 msgid "You took too long with the captcha or your response was incorrect." -msgstr "" +msgstr "ã‚ャプãƒãƒ£ç”»åƒã®æ™‚間切れã¾ãŸã¯ç”ãˆãŒé–“é•ã£ã¦ã„ã¾ã™" #: src/net/manaserv/partyhandler.cpp:90 msgid "Joined party." -msgstr "パーティã«å‚åŠ ã—ãŸã€‚" +msgstr "パーティã«å‚åŠ ã—ã¾ã—ãŸ" #: src/net/manaserv/partyhandler.cpp:108 #, c-format msgid "%s joined the party." -msgstr "%sãŒãƒ‘ーティã«å‚åŠ ã—ãŸã€‚" +msgstr "%sãŒãƒ‘ーティã«å‚åŠ ã—ã¾ã—ãŸ" #: src/net/manaserv/partyhandler.cpp:126 #, c-format msgid "%s rejected your invite." -msgstr "%sã¯æ‹›å¾…ã‚’æ–ã£ãŸã€‚" +msgstr "%sã¯æ‹›å¾…ã‚’æ–ã‚Šã¾ã—ãŸ" #: src/net/manaserv/tradehandler.cpp:107 msgid "Accepting incoming trade requests." -msgstr "å–引è¦æ±‚ã‚’å—ã‘å–ã‚Šä¸" +msgstr "トレード申請をå—付ä¸" #: src/net/manaserv/tradehandler.cpp:109 msgid "Ignoring incoming trade requests." -msgstr "å–引è¦æ±‚を無視ã«ã—ã¦ã„る。" +msgstr "トレード申請を無効ä¸" #: src/net/manaserv/tradehandler.cpp:146 #, c-format msgid "Trading with %s" -msgstr "%sã¨å–引ä¸" +msgstr "%sã¨ãƒˆãƒ¬ãƒ¼ãƒ‰ã—ã¾ã™" #: src/net/tmwa/adminhandler.cpp:70 msgid "Kick failed!" -msgstr "ã‚ック失敗" +msgstr "追ã„出ã—失敗" #: src/net/tmwa/adminhandler.cpp:72 msgid "Kick succeeded!" -msgstr "ã‚ックæˆåŠŸ" +msgstr "追ã„出ã—æˆåŠŸ" #: src/net/tmwa/buysellhandler.cpp:133 msgid "Thanks for selling." -msgstr "売ã£ã¦ãã ã•ã‚Šã€ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã—ãŸã€‚" +msgstr "販売ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã—ãŸã€‚" #: src/net/tmwa/buysellhandler.cpp:137 msgid "Unable to sell." -msgstr "売るã“ã¨ä¸å¯èƒ½" +msgstr "販売ã§ãã¾ã›ã‚“" #: src/net/tmwa/buysellhandler.cpp:140 msgid "Unable to sell while trading." -msgstr "" +msgstr "トレードä¸ã¯å£²è²·ã§ãã¾ã›ã‚“" #: src/net/tmwa/buysellhandler.cpp:143 msgid "Unable to sell unsellable item." -msgstr "" +msgstr "トレードä¸ã¯å£²è²·ã§ãã¾ã›ã‚“" #: src/net/tmwa/generalhandler.cpp:108 #, c-format msgid "Strength %+d" -msgstr "å¼·ã• %+d" +msgstr "Strength %+d" #: src/net/tmwa/generalhandler.cpp:109 #, c-format msgid "Agility %+d" -msgstr "ä¿Šæ•ã•%+d" +msgstr "Agility %+d" #: src/net/tmwa/generalhandler.cpp:110 #, c-format msgid "Vitality %+d" -msgstr "活力 %+d" +msgstr "Vitality %+d" #: src/net/tmwa/generalhandler.cpp:111 #, c-format msgid "Intelligence %+d" -msgstr "知能 %+d" +msgstr "Intelligence %+d" #: src/net/tmwa/generalhandler.cpp:112 #, c-format msgid "Dexterity %+d" -msgstr "æ£ç¢ºã• %+d" +msgstr "Dexterity %+d" #: src/net/tmwa/generalhandler.cpp:113 #, c-format msgid "Luck %+d" -msgstr "é‹ %+d" +msgstr "Luck %+d" #: src/net/tmwa/generalhandler.cpp:139 msgid "Authentication failed." -msgstr "èªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" +msgstr "èªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸ" #: src/net/tmwa/generalhandler.cpp:142 msgid "No servers available." -msgstr "" +msgstr "利用ã§ãるサーãƒãƒ¼ãŒã‚ã‚Šã¾ã›ã‚“" #: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." -msgstr "" +msgstr "ä»–ã‹ã‚‰ã®ãƒã‚°ã‚¤ãƒ³ãŒã‚ã‚Šã¾ã—ãŸ" #: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." -msgstr "" +msgstr "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯æ—¢ã«ãƒã‚°ã‚¤ãƒ³ä¸ã§ã™" #: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." -msgstr "" +msgstr "スピードãƒãƒƒã‚¯ãŒæŽ¢çŸ¥ã•ã‚Œã¾ã—ãŸ" #: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." -msgstr "é‡è¤‡ã—ãƒã‚°ã‚¤ãƒ³ã€‚" +msgstr "é‡è¤‡ãƒã‚°ã‚¤ãƒ³" #: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." -msgstr "" +msgstr "ä¸æ˜ŽãªæŽ¥ç¶šã‚¨ãƒ©ãƒ¼ã§ã™" #: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" -msgstr "サーãƒãƒ¼ã‹ã‚‰åˆ‡æ–ã•ã‚ŒãŸã€‚" +msgstr "サーãƒãƒ¼ã‹ã‚‰åˆ‡æ–ã•ã‚Œã¾ã—ãŸ" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" -msgstr "é‹" +msgstr "Luck" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" -msgstr "防御" +msgstr "Defense" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" -msgstr "特攻撃" +msgstr "M.Attack" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" -msgstr "特防御" +msgstr "M.Defense" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" -msgstr "ï¼… 精度" +msgstr "% Accuracy" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" -msgstr "ï¼… 回é¿" +msgstr "% Evade" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" -msgstr "% å±æ©Ÿ" +msgstr "% Critical" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "攻撃é…延" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr " å¾’æ©é…延" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "攻撃è·é›¢" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." -msgstr "" +msgstr "ダメージ/秒" #: src/net/tmwa/network.cpp:153 msgid "Empty address given to Network::connect()!" -msgstr "" +msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ç©ºã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒé€ä¿¡ã•ã‚Œã¾ã—ãŸ::connect()!" #: src/net/tmwa/network.cpp:357 msgid "Unable to resolve host \"" -msgstr "ホストåを解決ã§ãã¾ã›ã‚“。" +msgstr "ホストåを解決ã§ãã¾ã›ã‚“" #: src/net/tmwa/network.cpp:427 msgid "Connection to server terminated. " -msgstr "" +msgstr "サーãƒãƒ¼ã¸ã®æŽ¥ç¶šãŒåˆ‡æ–ã•ã‚Œã¾ã—㟠" #: src/net/tmwa/partyhandler.cpp:171 #, c-format msgid "%s is not in your party!" -msgstr "%sã¯ãƒ‘ーティã«ã¯ã„ãªã„ï¼" +msgstr "%sã¯ãƒ‘ーティã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "'...'を表示ã™ã‚‹" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" -msgstr "åå‰ã‚’瞬ã" +msgstr "åå‰ã‚’点ç¯ã•ã›ã‚‹" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" -msgstr "フãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°'...'ãƒãƒ–ル" +msgstr "フãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°'...'å¹å‡ºã—" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" -msgstr "フãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°ãƒãƒ–ル" +msgstr "å¹å‡ºã—" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "åå‰ãªã—" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" -msgstr "攻撃 %+d" +msgstr "Attack %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" -msgstr "防御 %+d" +msgstr "Defense %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "ä¸æ˜Žãªã‚¢ã‚¤ãƒ†ãƒ " - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(I)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" diff --git a/po/manaplus.pot b/po/manaplus.pot index 51a4d78ff..91737f2b7 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: 2011-12-10 01:54+0300\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -40,273 +40,273 @@ msgstr "" msgid "I" msgstr "" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "" -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "" -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "" -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "" -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "" -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "" @@ -315,43 +315,43 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "" -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "" @@ -386,7 +386,7 @@ msgstr "" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "" @@ -405,7 +405,7 @@ msgstr "" msgid "Result" msgstr "" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "" @@ -428,16 +428,16 @@ msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "" @@ -449,8 +449,8 @@ msgid "Quit" msgstr "" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "" @@ -474,14 +474,14 @@ msgstr "" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "" @@ -513,7 +513,7 @@ msgid "The email address entries mismatch." msgstr "" #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "" @@ -579,8 +579,8 @@ msgstr "" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "" @@ -622,47 +622,47 @@ msgstr "" msgid "Account and Character Management" msgstr "" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "" @@ -736,12 +736,12 @@ msgstr "" msgid "Chat" msgstr "" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "" @@ -905,7 +905,7 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "" @@ -933,8 +933,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "" @@ -976,26 +976,26 @@ msgid "Filter:" msgstr "" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "" @@ -1009,17 +1009,17 @@ msgid "Weight:" msgstr "" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "" @@ -1242,31 +1242,27 @@ msgstr "" msgid "Need" msgstr "" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" +#: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" msgstr "" -#: src/gui/npcdialog.cpp:52 +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "" @@ -1285,6 +1281,7 @@ msgid "Outfit: %d" msgstr "" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "" @@ -1368,7 +1365,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "" @@ -1420,7 +1417,7 @@ msgid "Show Items" msgstr "" #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "" @@ -1472,8 +1469,8 @@ msgstr "" msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "" @@ -1485,8 +1482,8 @@ msgstr "" msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "" @@ -1495,7 +1492,7 @@ msgid "Warp" msgstr "" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" +msgid "Clear outfit" msgstr "" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 @@ -1534,7 +1531,7 @@ msgstr "" msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "" @@ -1547,105 +1544,105 @@ msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "" @@ -1742,11 +1739,11 @@ msgstr "" msgid "Error retreiving server list!" msgstr "" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "" @@ -2686,194 +2683,204 @@ msgstr "" msgid "Lvl: %d (%+d)" msgstr "" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "" -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "" -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "" -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "" -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "" -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "" -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." msgstr "" -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "" -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "" -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, c-format msgid "%s has invited you to join the %s party." msgstr "" -#: src/gui/socialwindow.cpp:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 msgid "Cannot create party. You are already in a party" msgstr "" -#: src/gui/socialwindow.cpp:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "" @@ -3063,33 +3070,33 @@ msgstr "" msgid "Name: %s" msgstr "" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "" -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "" -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "" @@ -3241,23 +3248,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "" @@ -3962,424 +3969,429 @@ msgid "" msgstr "" #: src/localplayer.cpp:384 -msgid "You were killed by " +#, c-format +msgid "You were killed by %s" msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "" -#: src/localplayer.cpp:1896 +#: src/localplayer.cpp:1903 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "" -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4435,7 +4447,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "" @@ -4451,15 +4463,19 @@ msgstr "" msgid "Incorrect slot." msgstr "" -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "" -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "" @@ -4504,16 +4520,16 @@ msgstr "" msgid "All whispers unignore failed." msgstr "" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "" @@ -4603,11 +4619,11 @@ msgstr "" msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4736,54 +4752,54 @@ msgstr "" msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, 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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "" @@ -5121,7 +5137,7 @@ msgstr "" msgid "Trade completed." msgstr "" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "" @@ -5130,7 +5146,7 @@ msgstr "" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "" @@ -5139,7 +5155,7 @@ msgstr "" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "" @@ -5148,7 +5164,7 @@ msgstr "" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "" @@ -5157,7 +5173,7 @@ msgstr "" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "" @@ -5489,50 +5505,50 @@ msgstr "" msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "" @@ -5553,47 +5569,47 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index eeea65927..0d1cb855e 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -9,11 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" -"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/" -"manaplus/team/nl_BE/)\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" +"Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/" +"team/nl_BE/)\n" "Language: nl_BE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,113 +42,113 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configureren" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Video" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Verbinden met server" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Inloggen" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Spelwereld binnenkomen" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Aanvragen personage" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Verbinden met de spelserver" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Wijzigen spelservers" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Fout" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Aanvragen registratie details" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Paswoord Wijziging" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Paswoord is gewijzigd!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Email Wijziging" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Email is gewijzigd!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Registratie ongedaan gemaakt!" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Tot ziens..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Ongeldige update host %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Fout bij het creëren van de update map!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Onbekend commando." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Kan geen lege berichten sturen!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -157,160 +157,160 @@ msgstr "" "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds " "bestaat, of het is jezelf." -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Aanvragen om bij kanaal %s toegevoegd te worden." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Groepsnaam ontbreekt." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Guild-naam ontbreekt." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Gelieve een naam te specifiëren" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Ga terug naar chat" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Bericht sluit chat." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Ga nu terug naar chat." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Bericht sluit nu chat." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "vriend" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "genegeerd" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutraal" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Speler reeds %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Speler succesvol %s!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Speler kan niet %s zijn!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Speler is niet genegeerd!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Speler niet langer genegeerd!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Speler kan niet worden genegeerd!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Speler reeds verwijderd!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Speler succesvol verwijderd!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Speler kan niet worden verwijderd!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Client uptime: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uren" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d seconden" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Aangemaakt:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Verwijdered:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "" @@ -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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Algemeen" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Debug" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Scherafdruk opgeslagen als:" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Opslaan van screenshot mislukt!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "De verbinding met de server is verbroken." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Netwerkfout" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Inkomende handelsaanvragen negeren" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Inkomende handelsaanvragen accepteren" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Kon Map Niet Laden" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Fout bij het laden van %s" @@ -391,7 +391,7 @@ msgstr "Naam" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Aanvallen" @@ -410,7 +410,7 @@ msgstr "Beweeg" msgid "Result" msgstr "Resultaat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Reset" @@ -433,16 +433,16 @@ msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -454,8 +454,8 @@ msgid "Quit" msgstr "Afsluiten" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Maximum" @@ -479,14 +479,14 @@ msgstr "Verkopen" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Annuleren" @@ -518,7 +518,7 @@ msgid "The email address entries mismatch." msgstr "De email adres ingaven zijn niet gelijk." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Wijzig wachtwoord" @@ -584,8 +584,8 @@ msgstr "Haarstijl:" msgid "Race:" msgstr "Ras:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Aanmaken" @@ -627,47 +627,47 @@ msgstr "Weet je zeker dat je deze personage wilt verwijderen?" msgid "Account and Character Management" msgstr "Account en personage beheer" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Verwissel Login" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Registreren" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Wijzig Email" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Ongeldig paswoord" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Geef uw wachtwoord om uw personage te verwijderen" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Geef wachtwoord:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Verwijderen" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Kies" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Niveau %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(leeg)" @@ -741,12 +741,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Aanwezig: %s; %d speler zijn aanwezig." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Fluisteren naar %s: %s" @@ -910,7 +910,7 @@ msgid "Did You Know?" msgstr "Weet u?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Sluiten" @@ -938,8 +938,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Afdoen" @@ -981,26 +981,26 @@ msgid "Filter:" msgstr "Filter:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Uitrusten" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Gebruiken" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Neerleggen..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Splitsen" @@ -1014,17 +1014,17 @@ msgid "Weight:" msgstr "Gewicht:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Opslaan" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Afhalen" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Neerleggen" @@ -1247,31 +1247,27 @@ msgstr "" msgid "Need" msgstr "Nood" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Wachten op server" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Volgende" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Indienen" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Wissen" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> Volgende" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Aan:" @@ -1290,6 +1286,7 @@ msgid "Outfit: %d" msgstr "Kleren: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Sleutel: %s" @@ -1373,7 +1370,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Volledig genegeerd" @@ -1425,7 +1422,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "ontkleed" @@ -1477,8 +1474,8 @@ msgstr "Spelers" msgid "Pick up" msgstr "Raap op" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Aan chat toevoegen" @@ -1490,8 +1487,8 @@ msgstr "Plaats voorwerp op de kaart" msgid "Rename" msgstr "Hernoem" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Verwijder" @@ -1500,8 +1497,8 @@ msgid "Warp" msgstr "" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Inladen oude kleren" +msgid "Clear outfit" +msgstr "" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1539,119 +1536,118 @@ msgstr "away aanzetten" msgid "Disable away" msgstr "away afzetten" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Verlaat" #: src/gui/popupmenu.cpp:654 -#, fuzzy msgid "Copy to clipboard" -msgstr "Kopieer naar chat" +msgstr "" #: src/gui/popupmenu.cpp:849 msgid "Change guild position" msgstr "Wijzig uw guild positie" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Kaart bordje hernoemen " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Naam: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Plaats 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Plaats de helft" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Plaats alles" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Laat alles vallen" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Haal 10 op" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Haal de helft op" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Haal alles op" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Laden van oude voorwerpsnelkoppelingen" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Laden van oude neerleggingsnelkoppeling" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Verberg" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Toon" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Kopieer naar chat" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(standaard)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Beweeg naar boven" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Beweeg naar beneden" @@ -1748,11 +1744,11 @@ msgstr "Download voorbereiden" msgid "Error retreiving server list!" msgstr "Fout tijdens ophalen server lijst" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "vereist een nieuwere versie" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "vereist v%s" @@ -2700,194 +2696,204 @@ msgstr "Niv: %d" msgid "Lvl: %d (%+d)" msgstr "Niv: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guild" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "gebruiker %s uitgenodigd in guild %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Guild %s verlating aangevraagd." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, 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:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Verlaten Guild?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, 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:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Groep" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "Gebruiker %s uitgenodigd in groep." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, 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:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "Verlaten Groep?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, 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:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Aanv" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Guild aanmaken" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Groep aanmaken" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Sociaal" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Nodig uit" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Uitnodiging voor groep %s aanvaard." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Uitnodiging voor groep %s geweigerd." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Uitnodiging voor guild %s aanvaard." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Uitnodiging voor guild %s geweigerd." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Maken van guild %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Maken van groep %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Guild Naam" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Kies uw guild naam" -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "Uitnodiging tot guild ontvangen, maar er is er al één." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, 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:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Guild Uitnodiging Aanvaarden" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Uitnodiging tot groep ontvangen, maar er is er al één." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 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:1467 +#: src/gui/socialwindow.cpp:1595 #, 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:1475 +#: src/gui/socialwindow.cpp:1603 #, 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:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Groepsuitnodiging aanvaarden" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Groep Naam" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Kies uw groepsnaam." @@ -3079,33 +3085,33 @@ msgstr "" msgid "Name: %s" msgstr "Naam: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Actualiseren..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Verbinden..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Spelen" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 Het updateproces is onvolledig." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 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:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 probeer later opnieuw." -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Voltooid" @@ -3257,23 +3263,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Wie Is Online - Bijwerken" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Bijwerken" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Wie Is Online - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Wie Is Online - fout" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Wie Is Online - Bijgewerkt" @@ -3987,425 +3993,429 @@ msgid "" msgstr "" #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "U bent gedoodt door " +#, c-format +msgid "You were killed by %s" +msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Geprobeerd een nietbestaand voorwerp op te rapen." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "Voorwerp is te zwaar." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "Voorwerp is te ver weg." -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "Voorwerp behoort bij iemand anders." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 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:1476 +#: src/localplayer.cpp:1481 #, 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:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) standaard bewegingen" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(I) geïnverteerde bewegingen" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) bewegingen met enkele vreemde bewegingen" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) bewegingen met vreemde bewegingen" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) dubbel normaal + raar" -#: src/localplayer.cpp:1896 -#, fuzzy +#: src/localplayer.cpp:1903 msgid "(?) unknown move" -msgstr "(?) onbekend volgen" +msgstr "" -#: src/localplayer.cpp:1918 -#, fuzzy, c-format +#: src/localplayer.cpp:1925 +#, c-format msgid "(%d) crazy move number %d" -msgstr "(?) vreemde beweging" +msgstr "" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) manuele vreemde beweging" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) vreemde beweging" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) standaard bewegingen tot aan doel" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) bewegen tot aan doel in bereik 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) bewegen tot aan doel in bereik 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) bewegen tot aan doel in bereik 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) bewegen tot aan doel in bereik 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) bewegen tot aan doel in bereik 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) beweeg tot aan doel in aanvalsbereik" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) beweeg tot aan doel" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) standaard volgen" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) relatief volgen" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) gespiegeld volgen" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) huisdier volgen" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) onbekend volgen" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) aanval" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) standaard aanval" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) wissel aanval zonder schild" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) wissel aanval met schild" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) ga en val aan" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) ga, val aan, raap op" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) zonder auto aanval" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) klein raap op 1x1 velden" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) standaard raap op 2x1 velden" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) vooruit raap op 2x3 velden" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) raap op 3x3 velden" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) go en raap op met bereik 4" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(G) ga en raap op met bereik 8" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) ga en raap op zonder bereiklimiet" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) raap op" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) normale map tonen" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) debug map tonen" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) ultra map tonen" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) ultra map tonen 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) lege map tonen" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) zwart & witte map tonen" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) gebruik #flar voor magie aanval" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) gebruik #chiza voor magie aanval" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) gebruik #ingrav voor magie aanval" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) gebruik #frillyar voor magie aanval" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gebruik #upmarmu voor magie aanval" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) magie aanval" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) standaard imitatie" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) kleren imitatie" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) imitatie" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Weg" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) op toetsenbord" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) weg" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) weg" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) spel camera modus" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) vrije camera modus" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Volg: " -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Volgen onderbroken" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "Imitatie: " -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Imitatie onderbroken" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "" -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Opties:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Log bestand te gebruiken" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Chat log bestand te gebruiken" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Toon de versie" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Toon deze help" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Configuratie map te gebruiken" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Login met deze gebruikersnaam" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password : Loging met dit wachtwoord" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character : Login met dit karakter" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login servernaam of IP" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Login serverpoort" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr " --update-host : Updateserver te gebruiken" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Kies standaard karakterserver en karakter" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : update downloads overslaan" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Map om spelgegevens te laden" -#: src/main.cpp:70 +#: src/main.cpp:73 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:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir: Map te gebruiken om screenshots te bewaren" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Start spel in veilige modus" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Zet OpenGL af voor deze sessie" @@ -4463,7 +4473,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Verkeerde naam." @@ -4479,15 +4489,19 @@ msgstr "Ongeldig haar." msgid "Incorrect slot." msgstr "" -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Info" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Personage verwijderd." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "Kon personage niet verwijderen." @@ -4532,16 +4546,16 @@ msgstr "" msgid "All whispers unignore failed." msgstr "" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "Online gebruikers: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Spel" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "Aanvraag op de stoppen is geweigerd!" @@ -4631,11 +4645,11 @@ msgstr "" msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4772,39 +4786,39 @@ msgstr "Oud wachtwoord is ongeldig." msgid "New password too short." msgstr "Nieuw wachtwoord is te kort." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Verkeerd wachtwoord." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Geweigered door de server." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Client is te oud." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4813,15 +4827,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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Deze gebruikersnaam is al genomen." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Gebruikersnaam is compleet verwijderd" @@ -5169,7 +5183,7 @@ msgstr "Handel geannuleerd." msgid "Trade completed." msgstr "Handel voltooid." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Kracht" @@ -5178,7 +5192,7 @@ msgstr "Kracht" msgid "Strength %+.1f" msgstr "Kracht %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Behendigheid" @@ -5187,7 +5201,7 @@ msgstr "Behendigheid" msgid "Agility %+.1f" msgstr "Behendigheid %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Handigheid" @@ -5196,7 +5210,7 @@ msgstr "Handigheid" msgid "Dexterity %+.1f" msgstr "Handigheid %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Vitaliteit" @@ -5205,7 +5219,7 @@ msgstr "Vitaliteit" msgid "Vitality %+.1f" msgstr "Vitality %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Intelligentie" @@ -5538,50 +5552,50 @@ msgstr "Onbekende connectiefout." msgid "Got disconnected from server!" msgstr "De verbinding met de server werd verbroken!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Geluk" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Verdediging" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "M.Aanval" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "M.Verdediging" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% Nauwkeurigheid" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% Ontwijking" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Aanvalsvertraging" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Wandelvertraging" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "Aanvalsbereik" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "" @@ -5602,143 +5616,47 @@ msgstr "Verbinding met server beëindigd. " msgid "%s is not in your party!" msgstr "%s is niet in jouw groep!" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Say '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Blink naam" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Zwevende '...' bel" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Zwevende bel" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "naamloos" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Aanval %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Verdediging %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "Leven %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "Magie %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Onbekend voorwerp" - -#~ msgid "(?) move" -#~ msgstr "(?) beweeg" - -#~ msgid "(?) map view" -#~ msgstr "(?) map tonen" - -#~ msgid "(D) design camera mode" -#~ msgstr "(D) design camera modus" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(I)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" @@ -4,14 +4,14 @@ # # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. -# <matwa@poczta.pl>, 2011. +# <matwa@poczta.pl>, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-12-08 19:05+0000\n" -"Last-Translator: derpella <matwa@poczta.pl>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/" "pl/)\n" "Language: pl\n" @@ -43,113 +43,113 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Konfiguracja" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Wydajność programu" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Obraz" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "Skórki" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "ÅÄ…czenie z serwerem" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Logowanie" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Wchodzenie do Å›wiata gry" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Sprawdzanie postaci" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "ÅÄ…czenie siÄ™ z serwerem gry" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Zmiana serwera" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "BÅ‚Ä…d" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Sprawdzanie szczegółów rejestracji" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Zmiana hasÅ‚a" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "HasÅ‚o zmienione z powodzeniem!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Zmiana adresu e-mail" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Adres e-mail zmieniony z powodzeniem!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Wyrejestrowano z powodzeniem" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Å»egnaj, bÄ™dziemy czekać na Twój powrót..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "NieprawidÅ‚owy serwer aktualizacji: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "BÅ‚Ä…d podczas tworzenia katalogu aktualizacji!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Nieznane polecenie." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Nie można wysÅ‚ać pustych szeptów!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -157,105 +157,105 @@ msgid "" msgstr "" "Nie można utworzyć zakÅ‚adki szeptu dla \"%s\"! Już istnieje, albo to Ty." -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "ProÅ›ba o doÅ‚Ä…czenie do kanaÅ‚u %s." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Brakuje nazwy grupy." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Brak nazwy gildii." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "ProszÄ™ wpisać prawidÅ‚owÄ… nazwÄ™." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Return wÅ‚Ä…cza czat." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Wiadomość zamyka czat." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Return od teraz wÅ‚Ä…cza czat." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Wiadomość od teraz zamyka czat." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "znajomy" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "lekceważony" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutralny" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Gracz jest już %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Gracz jest teraz %s!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Gracz nie może być %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Gracz nie byÅ‚ ignorowany!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Gracz już nie jest ignorowany!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Gracz nie może być odignorowany!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "dodany/a do czarnej listy" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "wróg" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Gracz zostaÅ‚ usuniÄ™ty!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Gracz usuniÄ™ty z powodzeniem!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Gracz nie mógÅ‚ zostać usuniÄ™ty!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Czas pracy programu: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -263,7 +263,7 @@ msgstr[0] "%d tydzieÅ„" msgstr[1] "%d tygodni/e" msgstr[2] "%d tygodni/e" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" @@ -271,7 +271,7 @@ msgstr[0] "%d dzieÅ„" msgstr[1] "%d dni" msgstr[2] "%d dni" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -279,7 +279,7 @@ msgstr[0] "%d godzina" msgstr[1] "%d godzin/y" msgstr[2] "%d godzin/y" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -287,7 +287,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minut/y" msgstr[2] "%d minut/y" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -295,27 +295,27 @@ msgstr[0] "%d sekunda" msgstr[1] "%d sekund/y" msgstr[2] "%d sekund/y" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "rozmiar cache czcionki" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Rozmiar cache:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Stworzono:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "UsuniÄ™to:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Obrazy źródÅ‚owe:" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "Osierocone obrazy źródÅ‚owe:" @@ -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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Ogólny" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Debug" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Zrzut ekranu zapisany jako" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Zapisywanie zrzutu ekranu nie powiodÅ‚o siÄ™!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "PoÅ‚Ä…czenie z serwerem zostaÅ‚o zerwane." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "BÅ‚Ä…d sieci" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Ignorowanie przychodzÄ…cych próśb o handel" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Akceptowanie przychodzÄ…cych próśb o handel" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" -msgstr "Nie można zaÅ‚Ä…dować mapy" +msgstr "Nie można zaÅ‚adować mapy" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "BÅ‚Ä…d podczas Å‚Ä…dowania %s" @@ -395,7 +395,7 @@ msgstr "Nazwa" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atak" @@ -414,7 +414,7 @@ msgstr "Podejdź" msgid "Result" msgstr "Rezultat" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Resetuj" @@ -437,16 +437,16 @@ msgstr "Ilość:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -458,8 +458,8 @@ msgid "Quit" msgstr "Wyjdź" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Maks." @@ -483,14 +483,14 @@ msgstr "Sprzedaj" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Anuluj" @@ -522,7 +522,7 @@ msgid "The email address entries mismatch." msgstr "Pola adresu e-mail siÄ™ nie zgadzajÄ…." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "ZmieÅ„ hasÅ‚o" @@ -588,8 +588,8 @@ msgstr "Fryzura:" msgid "Race:" msgstr "Rasa:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Utwórz" @@ -631,47 +631,47 @@ msgstr "Czy jesteÅ› pewny/a, że chcesz usunąć tÄ™ postać?" msgid "Account and Character Management" msgstr "ZarzÄ…dzanie kontem i postaciami" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Przeloguj siÄ™" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Wyrejestruj" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Zmiana adresu e-mail" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "NieprawidÅ‚owe hasÅ‚o" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Wprowadź hasÅ‚o aby usunąć postać" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Wprowadź hasÅ‚o:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "UsuÅ„" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Wybierz" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Poziom %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(puste)" @@ -745,12 +745,12 @@ msgstr "???" msgid "Chat" msgstr "Czat" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "%s obecny/a. %d graczy online." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Szepczesz do %s: %s" @@ -784,7 +784,7 @@ msgstr "Cel" #: src/gui/debugwindow.cpp:74 msgid "Net" -msgstr "Siatka" +msgstr "Sieć" #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222 #: src/gui/debugwindow.cpp:251 @@ -914,7 +914,7 @@ msgid "Did You Know?" msgstr "Cz wiesz że..." #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Zamknij" @@ -942,8 +942,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Zdejmij" @@ -985,26 +985,26 @@ msgid "Filter:" msgstr "Filtr:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Załóż" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Użyj" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Upuść..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Podziel" @@ -1018,17 +1018,17 @@ msgid "Weight:" msgstr "Waga:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Przechowaj" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Pobierz" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Upuść" @@ -1253,31 +1253,27 @@ msgstr "pasek statusu" msgid "Need" msgstr "Potrzeba" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Oczekiwanie na serwer" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "Przerwij" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Dalej" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Zatwierdź" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Wyczyść" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr ">Dalej" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Do:" @@ -1296,6 +1292,7 @@ msgid "Outfit: %d" msgstr "Strój: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Klawisz: %s" @@ -1379,7 +1376,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "CaÅ‚kowicie ignoruj" @@ -1431,7 +1428,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Rozbierz" @@ -1483,8 +1480,8 @@ msgstr "Gracze" msgid "Pick up" msgstr "PodnieÅ›" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Dodaj do czatu" @@ -1496,8 +1493,8 @@ msgstr "Portal" msgid "Rename" msgstr "ZmieÅ„ nazwÄ™" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "UsuÅ„" @@ -1506,8 +1503,8 @@ msgid "Warp" msgstr "Teleport" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Przywróć stare stroje" +msgid "Clear outfit" +msgstr "UsuÅ„ ubiór" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1523,11 +1520,11 @@ msgstr "Edytuj zaklÄ™cie" #: src/gui/popupmenu.cpp:636 msgid "Disable highlight" -msgstr "WyÅ‚Ä…cz podÅ›wietlenie" +msgstr "WyÅ‚Ä…cz alarm" #: src/gui/popupmenu.cpp:638 msgid "Enable highlight" -msgstr "WÅ‚Ä…cz podÅ›wietlenie" +msgstr "WÅ‚Ä…cz alarm" #: src/gui/popupmenu.cpp:640 msgid "Don't remove name" @@ -1545,7 +1542,7 @@ msgstr "WÅ‚Ä…cz tryb AFK" msgid "Disable away" msgstr "WyÅ‚Ä…cz tryb AFK" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Opuść" @@ -1558,105 +1555,105 @@ msgid "Change guild position" msgstr "ZmieÅ„ pozycjÄ™ gildii" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "ZmieÅ„ nazwÄ™ drogowskazu" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Nick:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "Komentarz gracza " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "Komentarz: " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "Dodaj do handlu" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "Dodaj 10 do handlu" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "Dodaj poÅ‚owÄ™ do handlu" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Dodaj wszystko do handlu" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Przechowaj 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Przechowaj poÅ‚owÄ™" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Przechowaj wszystko" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Upuść wszystko" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Odbierz 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Odbierz poÅ‚owÄ™" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Odbierz wszystko" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Przywróć stare skróty przedmiotów" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Przywróć stare skróty upuszczania" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Ukryj" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Pokaż" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Zresetuj żółty pasek" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Skopiuj do czatu" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(domyÅ›lne)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "W górÄ™" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "W dół" @@ -1753,11 +1750,11 @@ msgstr "Przygotowanie Å›ciÄ…gania" msgid "Error retreiving server list!" msgstr "BÅ‚Ä…d przy uzyskiwaniu listy serwerów!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "wymaga nowszej wersji" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "wymaga v%s" @@ -2702,194 +2699,204 @@ msgstr "Poziom: %d" msgid "Lvl: %d (%+d)" msgstr "Poziom: %d(%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gildia" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Zaproszono gracza %s do gildii %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Poproszono o wyjÅ›cie z gildii %s." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "Zaproszenie do gildii" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Kogo chcesz zaprosić do gildii %s?" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "OpuÅ›cić gildiÄ™?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Na pewno opuÅ›cić gildiÄ™ %s?" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupa" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "Gracz %s zaproszony do grupy." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "Poproszono o wyjÅ›cie z grupy %s." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "Zaproszenie do grupy" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Kogo chcesz zaprosić do grupy %s?" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "OpuÅ›cić grupÄ™?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Na pewno opuÅ›cić grupÄ™ %s?" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "GPS" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Atk" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Priorytetowe moby" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "Atakuj moby" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Ignoruj moby" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Utwórz gildiÄ™" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Utwórz grupÄ™" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "SpoÅ‚eczność" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "ZaproÅ›" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Zaakceptowano zaproszenie do grupy od %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Odrzucono zaproszenie do grupy od %s." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Akceptowano zaproszenie do gildii od %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Odrzucono zaproszenie do gildii od %s." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Tworzenie gildii o nazwie %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Tworzenie grupy o nazwie %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Nazwa gildii" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Wybierz nazwÄ™ gildii." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "Gildia o tej nazwie już istnieje." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s zaprosiÅ‚/a CiÄ™ do gildii %s." -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Akceptuj zaproszenie do gildii" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Grupa o takiej nazwie już istnieje." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "ZostaÅ‚eÅ›/aÅ› zaproszony/a do grupy." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, 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:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s zaprosiÅ‚/a CiÄ™ do grupy." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s zaprosiÅ‚/a CiÄ™ do grupy %s ." -#: src/gui/socialwindow.cpp:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Zaakceptuj zaproszenie do grupy" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Nazwa grupy" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Wybierz nazwÄ™ grupy." @@ -3081,33 +3088,33 @@ msgstr "" msgid "Name: %s" msgstr "ImiÄ™: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Aktualizacja..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "ÅÄ…czenie..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Graj" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 Proces aktualizacji jest niekompletny." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 Jest mocno zalecane abyÅ›" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 Spróbuj ponownie później." -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "ZakoÅ„czono" @@ -3259,23 +3266,23 @@ msgstr "Obwódka lokalizacji domowej" msgid "Road Point" msgstr "Drogowskaz" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Kto jest online- aktualizacja" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Aktualizuj" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Gracze online- " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Gracze online- bÅ‚Ä…d" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Gracze online- aktualizacja" @@ -3982,40 +3989,41 @@ msgstr "" "siÄ™ problemy." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "ZostaÅ‚eÅ›/aÅ› zabity/a przez " +#, c-format +msgid "You were killed by %s" +msgstr "ZostaÅ‚eÅ›/aÅ› zabity/a przez %s" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Próbowano podnieść nieistniejÄ…cy przedmiot." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "Przedmiot zbyt ciężki." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "Przedmiot za daleko" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "Inwentarz jest peÅ‚ny." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "Za duży stos." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "Przedmiot należy do kogoÅ› innego." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 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:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4023,384 +4031,388 @@ 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:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) domyÅ›lne poruszanie siÄ™" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(I) odwrócone ruchy" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) trochÄ™ szalonych ruchów" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) dużo szalonych ruchów" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) podwójne normalne + szalone" -#: src/localplayer.cpp:1896 +#: src/localplayer.cpp:1903 msgid "(?) unknown move" msgstr "(?) nieznany sposób poruszania siÄ™" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) szalone ruchy numer %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) wÅ‚asne szalone ruchy" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) szalone ruchy" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) domyÅ›lne przybliżenie do celu" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) podejdź do 1 pola od celu" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) podejdź do 2 pól od celu" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) podejdź do 3 pól od celu" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) podejdź do 5 pól od celu" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) podejdź do 7 pól od celu" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) podejdź do celu na zasiÄ™g ataku" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "(a) zasiÄ™g ataku Å‚ucznika" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) pól do celu" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) domyÅ›lne podążanie" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) relatywne podążanie" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) lustrzane podążanie" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) niewolnicze podążanie" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) nieznane podążanie" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) atak" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) domyÅ›lny atak" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) zdejmij tarczÄ™ do ataku" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) załóż tarczÄ™ do ataku" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) idź, atakuj" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) idź, atakuj, podnieÅ›" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) bez autoataku" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) podnoÅ› w promieniu 1x1" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) podnoÅ› w promieniu 2x1" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) podnoÅ› w promieniu 2x3" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) podnoÅ› w promieniu 3x3" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) podejdź i podnoÅ› do 4 pól" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(G) podejdź i podnoÅ› do 8 pól" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) podejdź i podnoÅ› w zasiÄ™gu wzroku" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) podnoÅ›" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) normalny widok mapy" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) widok debug" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) pÅ‚aska mapa" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) pÅ‚aska mapa 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) mapa bez tekstur" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) dwukolorowa mapa" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) użyj #flar jako M.A." -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) użyj #chiza jako M.A." -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) użyj #ingrav jako M.A." -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) użyj #frillyar jako M.A." -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) użyj #upmarmu jako M.A." -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) magiczny atak" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "(a) atakuj wszystkich graczy" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "(f) nie atakuj przyjaciół" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "(b) atakuj nielubianych" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "(d) nie atakuj nikogo" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "(?) atak PvP" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) domyÅ›lna imitacja" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) Imituj strój" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) imitacja" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "AFK" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) przy klawiaturze" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) AFK" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) stan" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) tryb kamery gry" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) wolny tryb kamery" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Modyfikatory gry wÅ‚Ä…czone." -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Modyfikatory gry wyÅ‚Ä…czone." -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "Modyfikatory gry nieznane" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Podążasz za: " -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Podążanie anulowane." -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "Imitujesz: " -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Imitacja anulowana" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Widzisz " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opcje] [manaplus-file]" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr " używane do wprowadzania wÅ‚asnych parametrów" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr " do klienta manaplus." -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Opcje:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Używany plik logów" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Używany katalog logów" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Pokaż wersjÄ™" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Pokaż tÄ… pomoc" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Katalog konfiguracyjny" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Zaloguj siÄ™ tym loginem" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password : Zaloguj siÄ™ tym hasÅ‚em" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character : Zaloguj siÄ™ tÄ… postaciÄ…" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nazwa serwera lub IP" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Port serwera" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr " --update-host : Użyj tego serwera aktualizacji" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Wybierz domyÅ›lny serwer i postać" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : OmiÅ„ aktualizacjÄ™" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Katalog z danymi gry" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Katalog z lokalnymi danymi" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Katalog ze zrzutami ekranu" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Rozpocznij grÄ™ w trybie bezpieczeÅ„stwa" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr " -T --test :Rozpocznij test sterowników i autokonfiguracjÄ™" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : WyÅ‚Ä…cz OpenGL w tej sesji" @@ -4456,7 +4468,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "NieprawidÅ‚owe imiÄ™." @@ -4472,15 +4484,19 @@ msgstr "NieprawidÅ‚owe wÅ‚osy." msgid "Incorrect slot." msgstr "NieprawidÅ‚owe miejsce inwentarza." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "NieprawidÅ‚owa rasa." + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Info" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Postać skasowana." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "Nie udaÅ‚o siÄ™ skasować postaci." @@ -4525,16 +4541,16 @@ msgstr "Wszystkie szepty odignorowane." msgid "All whispers unignore failed." msgstr "Nie udaÅ‚o siÄ™ odignorować wszystkich szeptów." -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "Gracze online: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Gra" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "Żądanie wyjÅ›cia odrzucone!" @@ -4624,11 +4640,11 @@ msgstr "Nieznana odpowiedź na zaproszenie do gildii." msgid "%s has left your guild." msgstr "%s opuÅ›ciÅ‚/a TwojÄ… gildiÄ™." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "ZostaÅ‚eÅ›/aÅ› wyrzucony/a z gildii." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "ZostaÅ‚eÅ›/aÅ› wykopany/a z gildii." -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%s wyrzuciÅ‚/a CiÄ™ z gildii." @@ -4771,39 +4787,39 @@ msgstr "Stare hasÅ‚o nieprawidÅ‚owe." msgid "New password too short." msgstr "Nowe hasÅ‚o jest zbyt krótkie." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "Niezarejestrowany ID." -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "NieprawidÅ‚owe hasÅ‚o." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "Ważność konta wygasÅ‚a." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Nie przyjÄ™ty przez serwer." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 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:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Klient jest zbyt nieaktualny." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4812,15 +4828,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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Serwer jest przeciążony." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Login jest już w użyciu." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Login pernamentnie usuniÄ™ty." @@ -5168,7 +5184,7 @@ msgstr "Handel anulowany." msgid "Trade completed." msgstr "Handel zakoÅ„czony." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "SiÅ‚a" @@ -5177,7 +5193,7 @@ msgstr "SiÅ‚a" msgid "Strength %+.1f" msgstr "SiÅ‚a %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Zwinność" @@ -5186,7 +5202,7 @@ msgstr "Zwinność" msgid "Agility %+.1f" msgstr "Szybkość %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "ZrÄ™czność" @@ -5195,7 +5211,7 @@ msgstr "ZrÄ™czność" msgid "Dexterity %+.1f" msgstr "ZrÄ™czność %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Witalność" @@ -5204,7 +5220,7 @@ msgstr "Witalność" msgid "Vitality %+.1f" msgstr "Witalność %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Inteligencja" @@ -5538,50 +5554,50 @@ msgstr "Nieznany bÅ‚Ä…d poÅ‚Ä…czenia." msgid "Got disconnected from server!" msgstr "RozÅ‚Ä…czono z serwerem!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Szczęście" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Obrona" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "Atak mag." -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "Obrona mag." -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% celnoÅ›ci" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% uników" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% ciosów kryt." -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Opóźnienie ataku" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Opóźnienie chodu" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "ZasiÄ™g ataku" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "Obrażenia na sek." @@ -5602,47 +5618,47 @@ msgstr "PoÅ‚Ä…czenie z serwerem przerwane." msgid "%s is not in your party!" msgstr "%s nie jest w twojej grupie!" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Pisz '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Mruganie nicka" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "BÄ…belek \"...\" nad gÅ‚owÄ…" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "BÄ…belek nad gÅ‚owÄ…" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "nienazwany" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Atak %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Obrona %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Nieznany przedmiot" @@ -4,15 +4,15 @@ # # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. -# <freya.df@gmail.com>, 2011. +# <freya.df@gmail.com>, 2011, 2012. # freya <freya.df@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/" "pt/)\n" "Language: pt\n" @@ -43,113 +43,113 @@ msgstr "A" msgid "I" msgstr "l" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configurar" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "VÃdeo" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "Temas" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Conectando ao servidor" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "Efetuando login" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Entrando no domÃnio do jogo" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Requisitando personagens" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Erro" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Não é possÃvel enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,160 +158,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:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Não foi possÃvel deixar de ignorar o jogador!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "Na Lista Negra" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" -msgstr "" +msgstr "Inimigo" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "Tamanho do cache de fonte" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Tamanho de Cache:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Recursos de imagens:" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "Recursos de imagens orfãos:" @@ -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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Geral" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Depurador" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Screenshot salva como " -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Falha ao salvar screenshot!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Não foi possÃvel carregar o mapa" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -392,7 +392,7 @@ msgstr "Nome" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" @@ -411,7 +411,7 @@ msgstr "Mover" msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Resetar" @@ -434,16 +434,16 @@ msgstr "Quantidade:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -455,8 +455,8 @@ msgid "Quit" msgstr "Sair" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Máximo" @@ -480,14 +480,14 @@ msgstr "Vender" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Cancelar" @@ -519,7 +519,7 @@ msgid "The email address entries mismatch." msgstr "Os emails informados não são iguais." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Alterar senha" @@ -585,8 +585,8 @@ msgstr "Estilo do Cabelo:" msgid "Race:" msgstr "Corrida:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Criar" @@ -628,47 +628,47 @@ msgstr "Tem certeza que deseja excluir este personagem?" msgid "Account and Character Management" msgstr "Gerenciamento de Conta e Personagem" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Trocar Login" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Cancelar Registro" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Alterar email" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Senha Incorreta" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Entre com a Senha para Deletar o usuario" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Entre com a senha" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Excluir" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Escolher" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "NÃvel %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(vazio)" @@ -742,12 +742,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -911,7 +911,7 @@ msgid "Did You Know?" msgstr "Você sabia?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fechar" @@ -939,8 +939,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Desequipar" @@ -982,26 +982,26 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Dividir" @@ -1015,17 +1015,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1248,31 +1248,27 @@ msgstr "Barra de Status" msgid "Need" msgstr "Precisa" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Aguarde" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "Pare de esperar" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Próximo" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Enviar" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Limpar" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> Próximo" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Para:" @@ -1291,6 +1287,7 @@ msgid "Outfit: %d" msgstr "Roupas: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Tecla: %s" @@ -1346,7 +1343,7 @@ msgstr "Lista Negra" #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 #: src/gui/popupmenu.cpp:702 msgid "Set as enemy" -msgstr "" +msgstr "Definir como inimigo." #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 @@ -1374,7 +1371,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorar completamente" @@ -1426,7 +1423,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Deixar sem Roupas" @@ -1478,8 +1475,8 @@ msgstr "Jogadores" msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Nome no chat" @@ -1491,8 +1488,8 @@ msgstr "Mapa Item" msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "A Remover" @@ -1501,8 +1498,8 @@ msgid "Warp" msgstr "Urdidura" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Carregar Antigas Roupas" +msgid "Clear outfit" +msgstr "Limpar equipamento" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1540,119 +1537,118 @@ msgstr "Habilitar longe do teclado" msgid "Disable away" msgstr "Desabilitar longe do teclado" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Sair" #: src/gui/popupmenu.cpp:654 -#, fuzzy msgid "Copy to clipboard" -msgstr "Copiar para o chat" +msgstr "CopiaCopiar para a área de transferência" #: src/gui/popupmenu.cpp:849 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:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Resetar barra amarela" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copiar para o chat" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Mover a cima" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Mover a baixo" @@ -1749,11 +1745,11 @@ msgstr "Preparando download" msgid "Error retreiving server list!" msgstr "Erro ao recuperar lista!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "requer uma versão mais nova" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "requer v%s" @@ -1980,7 +1976,7 @@ msgstr "Habilitar joystick" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "" +msgstr "Use joystick se a janela cliente estiver inativo" #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -1992,7 +1988,7 @@ msgstr "Parar" #: src/gui/setup_joystick.cpp:149 msgid "Rotate the stick and dont press buttons" -msgstr "" +msgstr "Girar o bastão e não pressionar os botões" #: src/gui/setup_keyboard.cpp:80 msgid "Keyboard" @@ -2176,7 +2172,7 @@ msgstr "Habilitar Analisador de bot" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection (do not disable)" -msgstr "" +msgstr "Habilitar proteção contra bugs no servidor (não pode ser desabilitado)" #: src/gui/setup_other.cpp:178 msgid "Enable debug log" @@ -2316,7 +2312,7 @@ msgstr "Na Lista Negra " #: src/gui/setup_relations.cpp:76 msgid "Enemy" -msgstr "" +msgstr "Inimigo" #: src/gui/setup_relations.cpp:240 msgid "Allow trading" @@ -2364,59 +2360,59 @@ msgstr "Enorme (15)" #: src/gui/setup_theme.cpp:146 msgid "Chinese (China)" -msgstr "" +msgstr "Chinês (China)" #: src/gui/setup_theme.cpp:147 msgid "Czech" -msgstr "" +msgstr "Tcheco" #: src/gui/setup_theme.cpp:148 msgid "English" -msgstr "" +msgstr "Inglês" #: src/gui/setup_theme.cpp:149 msgid "Finnish" -msgstr "" +msgstr "Finlandês" #: src/gui/setup_theme.cpp:150 msgid "French" -msgstr "" +msgstr "Francês" #: src/gui/setup_theme.cpp:151 msgid "German" -msgstr "" +msgstr "Alemão" #: src/gui/setup_theme.cpp:152 msgid "Indonesian" -msgstr "" +msgstr "Indonésio" #: src/gui/setup_theme.cpp:153 msgid "Polish" -msgstr "" +msgstr "Polonês" #: src/gui/setup_theme.cpp:154 msgid "Japanese" -msgstr "" +msgstr "Japonês" #: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" -msgstr "" +msgstr "Holandês (Bélgica / Flandres)" #: src/gui/setup_theme.cpp:156 msgid "Portuguese" -msgstr "" +msgstr "Português" #: src/gui/setup_theme.cpp:157 msgid "Portuguese (Brazilian)" -msgstr "" +msgstr "Português (Brasileiro)" #: src/gui/setup_theme.cpp:158 msgid "Russian" -msgstr "" +msgstr "Russo" #: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" -msgstr "" +msgstr "Espanhol (castelhano)" #: src/gui/setup_theme.cpp:191 msgid "Theme" @@ -2428,7 +2424,7 @@ msgstr "Tema" #: src/gui/setup_theme.cpp:194 msgid "Language" -msgstr "" +msgstr "Linguagem" #: src/gui/setup_theme.cpp:195 msgid "Main Font" @@ -2698,194 +2694,204 @@ msgstr "NÃvel: %d" msgid "Lvl: %d (%+d)" msgstr "NÃvel: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guilda" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Convidou o jogador %s para a guilda %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "SaÃda da Guilda %s requisitada." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "Convite de membros para a Guilda." -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, 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:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Sair da guilda?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, 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:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupo" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "Convidou usuário %s para o grupo." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "SaÃda do grupo %s requisitada." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "Convite de membros para o grupo" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, 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:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "Sair do grupo?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, 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:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Atq" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Mobs Prioritarios" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "Atacar Mobs" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Ignorar mobss" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Criar guilda" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Criar grupo" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Convidar" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Aceitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Rejeitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Aceitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Rejeitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Criando guilda chamada %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Criando grupo chamado %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Nome da guilda" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Escolha o nome da sua guilda." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "Requisição de guilda recebida, mas já existe uma." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, 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:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Aceitar convite para a guilda" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Requisição de grupo recebida, mas já existe um." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "Você foi convidado para entrar em um grupo." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." msgstr "Você foi convidado para entrar no grupo %s." -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s te convidou para entrar em seu grupo." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Aceitar convite para o grupo" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Nome do grupo" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Escolha o nome do seu grupo." @@ -3076,33 +3082,33 @@ msgstr "" msgid "Name: %s" msgstr "Nome: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Atualizando..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Jogar" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 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:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 É altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "ConcluÃdo" @@ -3254,23 +3260,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -3923,7 +3929,7 @@ msgstr "Trocar feitiço de ataque" #: src/keyboardconfig.cpp:329 msgid "Switch pvp attack" -msgstr "" +msgstr "Trocar ataque de pvp" #: src/keyboardconfig.cpp:330 msgid "Change move type" @@ -3979,430 +3985,434 @@ msgstr "" "comprometer a jogabilidade." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "Você foi morto por " +#, c-format +msgid "You were killed by %s" +msgstr "Você foi morto por %s" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 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:1476 +#: src/localplayer.cpp:1481 #, 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:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/localplayer.cpp:1896 -#, fuzzy +#: src/localplayer.cpp:1903 msgid "(?) unknown move" -msgstr "(?) Seguir em modo desconhecido" +msgstr "(?) Movimento desconhecido" -#: src/localplayer.cpp:1918 -#, fuzzy, c-format +#: src/localplayer.cpp:1925 +#, c-format msgid "(%d) crazy move number %d" -msgstr "(?) movimentos loucos" +msgstr "(%d) movimento louco numero %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) movimentos loucos" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "(a) Alcance de arqueiros" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) Ataque" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" -msgstr "" +msgstr "(a) atacar todos inimigos" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" -msgstr "" +msgstr "(f) não atacar amigos" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" -msgstr "" +msgstr "(b) atacar más relações" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" -msgstr "" +msgstr "(d) não atacar jogadores" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" -msgstr "" +msgstr "(?) Ataque PVP" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) MÃmica padrão" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) MÃmica de roupas" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) MÃmica" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) Ausente" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) Ausente" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo ativados" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2234 -#, fuzzy +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" -msgstr "Modificadores de jogo ativados" +msgstr "Modificador de jogo desconhecido" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Você vê " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [opções] [manaplus-arquivo]" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "usado para definir parâmetros customizados" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "para o cliente manaplus. " -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:65 +#: src/main.cpp:68 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:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:68 +#: src/main.cpp:71 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:70 +#: src/main.cpp:73 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:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:75 +#: src/main.cpp:77 +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 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4458,7 +4468,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Nome errado." @@ -4474,15 +4484,19 @@ msgstr "Cabelo incorreto." msgid "Incorrect slot." msgstr "Slot incorreto." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "Corrida incorreta:" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Informações" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Personagem deletado." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "Falha ao deletar personagem." @@ -4527,16 +4541,16 @@ msgstr "Todos sussurros não-ignorados. " msgid "All whispers unignore failed." msgstr "Todos sussurros não-ignorados falharam. " -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "Jogadores online: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Jogo" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "Requisição de saÃda negada!" @@ -4626,11 +4640,11 @@ msgstr "Resposta desconhecida de convite para guilda." msgid "%s has left your guild." msgstr "%s saiu de sua Guilda." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "Você foi expulso da Guilda." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "Você foi expulso da guilda." -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%s foi expulso da Guilda." @@ -4766,41 +4780,41 @@ msgstr "Senha antiga incorreta." msgid "New password too short." msgstr "Nova senha é muito curta." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "ID não registrado." -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Senha incorreta." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "A conta expirou." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Rejeitado pelo servidor." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 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 " "algum GM." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Cliente muito antigo." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4809,15 +4823,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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Server lotado." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Este nome de usuário já está em uso." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Usuário deletado." @@ -5164,7 +5178,7 @@ msgstr "Negociação cancelada." msgid "Trade completed." msgstr "Negociação realizada." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Força" @@ -5173,7 +5187,7 @@ msgstr "Força" msgid "Strength %+.1f" msgstr "Força %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Agilidade" @@ -5182,7 +5196,7 @@ msgstr "Agilidade" msgid "Agility %+.1f" msgstr "Agilidade %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Destreza" @@ -5191,7 +5205,7 @@ msgstr "Destreza" msgid "Dexterity %+.1f" msgstr "Destreza %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Vitalidade" @@ -5200,7 +5214,7 @@ msgstr "Vitalidade" msgid "Vitality %+.1f" msgstr "Vitalidade %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Inteligência" @@ -5534,50 +5548,50 @@ msgstr "Erro de conexão desconhecido." msgid "Got disconnected from server!" msgstr "Você foi desconectado do servidor!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Sorte" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Defesa" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "Atq. Mágico" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "Def. Mágica" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% Exatidão" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% Evasão" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% CrÃticos" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Atraso de ataque" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Atraso de movimento" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "Atraso de alcance" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "Dano por seg." @@ -5598,143 +5612,47 @@ 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:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Bolha Flutuante" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "sem nome" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Ataque %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Defesa %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Item desconhecido" - -#~ msgid "(?) move" -#~ msgstr "(?) mover" - -#~ msgid "(?) map view" -#~ msgstr "(?) Visualizador de mapa" - -#~ msgid "(D) design camera mode" -#~ msgstr "(D) Modo de jogo câmera design" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(I)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(4)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 38e5b43df..f82ba68ac 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <alasmirt@gmail.com>, 2011. +# <alasmirt@gmail.com>, 2011, 2012. # alastrim <alasmirt@gmail.com>, 2011. # Andrei Karas <akaras@inbox.ru>, 2011. -# <freya.df@gmail.com>, 2011. +# <freya.df@gmail.com>, 2011, 2012. # freya <freya.df@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" -"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/" "manaplus/team/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -45,113 +45,113 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "por peso" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "Performance" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "VÃdeo" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "Temas" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "por quantidade" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "por tipo" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Habilitar rolagem preguisoça " -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Rolagem preguiçosa" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Erro" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, 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:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, 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:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "Não é possÃvel enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,160 +160,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:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Não foi possÃvel deixar de ignorar o jogador!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "Na Lista Negra" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" -msgstr "" +msgstr "inimigo" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "Tamanho de fonte Cache" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Tamanho de cache:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Recursos de imagem:" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "Recurso de imagem orfão:" @@ -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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Geral" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Depurador" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Screenshot salva como " -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Falha ao salvar screenshot!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Não foi possÃvel carregar o mapa" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -394,7 +394,7 @@ msgstr "Nome" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Atacar" @@ -413,7 +413,7 @@ msgstr "Mover" msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "Resetar" @@ -436,16 +436,16 @@ msgstr "Quantidade:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -457,8 +457,8 @@ msgid "Quit" msgstr "Sair" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "Máximo" @@ -482,14 +482,14 @@ msgstr "Vender" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Cancelar" @@ -521,7 +521,7 @@ msgid "The email address entries mismatch." msgstr "Os emails informados não são iguais." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Alterar senha" @@ -587,8 +587,8 @@ msgstr "Estilo do Cabelo:" msgid "Race:" msgstr "Corrida:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Criar" @@ -630,47 +630,47 @@ msgstr "Tem certeza que deseja excluir este personagem?" msgid "Account and Character Management" msgstr "Gerenciamento de Conta e Personagem" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Trocar Login" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Cancelar Registro" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Alterar email" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Senha incorreta" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Entre com a senha para apagar o personagem" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Entre com a senha:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Excluir" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Escolher" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "NÃvel %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(vazio)" @@ -744,12 +744,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -913,7 +913,7 @@ msgid "Did You Know?" msgstr "Você Sabia?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fechar" @@ -941,8 +941,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "Desequipar" @@ -984,26 +984,26 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Dividir" @@ -1017,17 +1017,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1250,31 +1250,27 @@ msgstr "Barra de Status" msgid "Need" msgstr "Precisa" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Aguarde" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "Parar de esperar" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Próximo" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Enviar" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "Limpar" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> Próximo" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "Para:" @@ -1293,6 +1289,7 @@ msgid "Outfit: %d" msgstr "Roupas: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Tecla: %s" @@ -1348,7 +1345,7 @@ msgstr "Lista Negra" #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694 #: src/gui/popupmenu.cpp:702 msgid "Set as enemy" -msgstr "" +msgstr "Definir como inimigo" #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177 @@ -1376,7 +1373,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "Ignorar completamente" @@ -1428,7 +1425,7 @@ 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:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Despir" @@ -1480,8 +1477,8 @@ msgstr "Jogadores" msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Nome no chat" @@ -1493,8 +1490,8 @@ msgstr "Mapa Item" msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Remover" @@ -1503,8 +1500,8 @@ msgid "Warp" msgstr "Urdidura" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Carregar velhas roupas" +msgid "Clear outfit" +msgstr "Limpar conjunto de roupas" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1542,119 +1539,118 @@ msgstr "Habilitar modo indisponÃvel" msgid "Disable away" msgstr "Desabilitar modo indisponÃvel" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Sair" #: src/gui/popupmenu.cpp:654 -#, fuzzy msgid "Copy to clipboard" -msgstr "Copiar para chat" +msgstr "Copiar para a área de transferência" #: src/gui/popupmenu.cpp:849 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:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "Zerar barra amarela" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Copiar para chat" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Mover para cima" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Mover para baixo" @@ -1751,11 +1747,11 @@ msgstr "Preparando download" msgid "Error retreiving server list!" msgstr "Erro ao recuperar lista!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "requer uma versão mais nova" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "requer v%s" @@ -1982,7 +1978,7 @@ msgstr "Habilitar joystick" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "" +msgstr "Usar joystick se a janela do cliente estiver inativa" #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -1994,7 +1990,7 @@ msgstr "Parar" #: src/gui/setup_joystick.cpp:149 msgid "Rotate the stick and dont press buttons" -msgstr "" +msgstr "Gire o bastão e não aperte os botões" #: src/gui/setup_keyboard.cpp:80 msgid "Keyboard" @@ -2178,7 +2174,7 @@ msgstr "Habilitar Analisador de bot" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection (do not disable)" -msgstr "" +msgstr "Habilitar proteção para servidores com bugs (não desabilitar)" #: src/gui/setup_other.cpp:178 msgid "Enable debug log" @@ -2318,7 +2314,7 @@ msgstr "Na Lista Negra " #: src/gui/setup_relations.cpp:76 msgid "Enemy" -msgstr "" +msgstr "Inimigo" #: src/gui/setup_relations.cpp:240 msgid "Allow trading" @@ -2366,59 +2362,59 @@ msgstr "Enorme (15)" #: src/gui/setup_theme.cpp:146 msgid "Chinese (China)" -msgstr "" +msgstr "Chinês(China)" #: src/gui/setup_theme.cpp:147 msgid "Czech" -msgstr "" +msgstr "Tcheco" #: src/gui/setup_theme.cpp:148 msgid "English" -msgstr "" +msgstr "Inglês" #: src/gui/setup_theme.cpp:149 msgid "Finnish" -msgstr "" +msgstr "Finlandês" #: src/gui/setup_theme.cpp:150 msgid "French" -msgstr "" +msgstr "Francês" #: src/gui/setup_theme.cpp:151 msgid "German" -msgstr "" +msgstr "Alemão" #: src/gui/setup_theme.cpp:152 msgid "Indonesian" -msgstr "" +msgstr "Indonésio" #: src/gui/setup_theme.cpp:153 msgid "Polish" -msgstr "" +msgstr "Polonês" #: src/gui/setup_theme.cpp:154 msgid "Japanese" -msgstr "" +msgstr "Japonês" #: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" -msgstr "" +msgstr "Holandês" #: src/gui/setup_theme.cpp:156 msgid "Portuguese" -msgstr "" +msgstr "Português" #: src/gui/setup_theme.cpp:157 msgid "Portuguese (Brazilian)" -msgstr "" +msgstr "Português (Brasileiro)" #: src/gui/setup_theme.cpp:158 msgid "Russian" -msgstr "" +msgstr "Russo" #: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" -msgstr "" +msgstr "Espanhol" #: src/gui/setup_theme.cpp:191 msgid "Theme" @@ -2430,7 +2426,7 @@ msgstr "Tema" #: src/gui/setup_theme.cpp:194 msgid "Language" -msgstr "" +msgstr "Linguagem" #: src/gui/setup_theme.cpp:195 msgid "Main Font" @@ -2700,194 +2696,204 @@ msgstr "NÃvel: %d" msgid "Lvl: %d (%+d)" msgstr "NÃvel: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Guilda" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Convidou o jogador %s para a guilda %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "SaÃda da Guilda %s requisitada." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "Convite de membros para a Guilda." -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, 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:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Sair da guilda?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, 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:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupo" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "Convidou usuário %s para o grupo." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "SaÃda do grupo %s requisitada." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "Convite de membros para o grupo" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, 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:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "Sair do grupo?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, 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:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "Nav" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Ataque" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Mobs prioritarios " -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "Atacar mobs" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Ignorar mobs" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Criar guilda" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Criar grupo" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "Social" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "Convidar" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "Aceitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Rejeitou convite para o grupo de %s." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "Aceitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Rejeitou convite para a guilda de %s." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Criando guilda chamada %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Criando grupo chamado %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Nome da guilda" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Escolha o nome da sua guilda." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "Requisição de guilda recebida, mas já existe uma." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, 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:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "Aceitar convite para a guilda" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Requisição de grupo recebida, mas já existe um." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "Você foi convidado para entrar em um grupo." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." msgstr "Você foi convidado para entrar no grupo %s." -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s te convidou para entrar em seu grupo." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, 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:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "Aceitar convite para o grupo" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 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:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Nome do grupo" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Escolha o nome do seu grupo." @@ -3078,33 +3084,33 @@ msgstr "" msgid "Name: %s" msgstr "Nome: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Atualizando..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Conectando..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Jogar" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 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:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 É altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "ConcluÃdo" @@ -3256,23 +3262,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -3925,7 +3931,7 @@ msgstr "Trocar feitiço de ataque" #: src/keyboardconfig.cpp:329 msgid "Switch pvp attack" -msgstr "" +msgstr "Mudar ataque em pvp" #: src/keyboardconfig.cpp:330 msgid "Change move type" @@ -3981,430 +3987,433 @@ msgstr "" "comprometer a jogabilidade." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "Você foi morto por " +#, c-format +msgid "You were killed by %s" +msgstr "Você foi morto por %s" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 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:1476 +#: src/localplayer.cpp:1481 #, 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:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/localplayer.cpp:1896 -#, fuzzy +#: src/localplayer.cpp:1903 msgid "(?) unknown move" -msgstr "(?) Seguir em modo desconhecido" +msgstr "(?) movimento desconhecido" -#: src/localplayer.cpp:1918 -#, fuzzy, c-format +#: src/localplayer.cpp:1925 +#, c-format msgid "(%d) crazy move number %d" -msgstr "(?) Movimentos loucos" +msgstr "(%d) movimento louco número %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) Movimentos loucos" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "(a) Alcance ataque de arqueiro" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) Ataque" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" -msgstr "" +msgstr "(a) atacar qualquer jogador" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" -msgstr "" +msgstr "(f) não atacar amigos" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" -msgstr "" +msgstr "(b) atacar más relações" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" -msgstr "" +msgstr "(d) não atacar jogadores" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" -msgstr "" +msgstr "(?) ataque em pvp" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) MÃmica padrão" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) MÃmica de roupas" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) MÃmica" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) Ausente" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) Ausente" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/localplayer.cpp:2234 -#, fuzzy +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" -msgstr "Modificadores de jogo desativados" +msgstr "Modificadores são desconhecidos" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Seguindo cancelado" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Você vê " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "Manaplus [opções] [manaplus-arquivo]" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "Usado para parâmetros customizados" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "Para o cliente Manaplus." -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:65 +#: src/main.cpp:68 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:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:68 +#: src/main.cpp:71 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:70 +#: src/main.cpp:73 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:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:75 +#: src/main.cpp:77 +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 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4460,7 +4469,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Nome errado." @@ -4476,15 +4485,19 @@ msgstr "Cabelo incorreto." msgid "Incorrect slot." msgstr "Slot incorreto." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "Corrida incorreta." + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Informações" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "Personagem deletado." -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "Falha ao deletar personagem." @@ -4529,16 +4542,16 @@ msgstr "Todos sussurros não-ignorados." msgid "All whispers unignore failed." msgstr "Todos sussurros não-ignorados falharam. " -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "Jogadores online: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Jogo" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "Requisição de saÃda negada!" @@ -4628,11 +4641,11 @@ msgstr "Resposta desconhecida de convite para guilda." msgid "%s has left your guild." msgstr "%s saiu de sua Guilda." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "Você foi expulso da Guilda." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "Você foi expulso da guilda." -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%s foi expulso da Guilda." @@ -4768,41 +4781,41 @@ msgstr "Senha antiga incorreta." msgid "New password too short." msgstr "Nova senha é muito curta." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "ID não registrado." -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Senha incorreta." -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "A conta expirou." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Rejeitado pelo servidor." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 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 " "algum GM." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Cliente muito antigo." -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4811,15 +4824,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:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Servidor lotado." -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Este nome de usuário já está em uso." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Usuário apagado permanentemente. " @@ -5166,7 +5179,7 @@ msgstr "Negociação cancelada." msgid "Trade completed." msgstr "Negociação realizada." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Força" @@ -5175,7 +5188,7 @@ msgstr "Força" msgid "Strength %+.1f" msgstr "Força %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "Agilidade" @@ -5184,7 +5197,7 @@ msgstr "Agilidade" msgid "Agility %+.1f" msgstr "Agilidade %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "Destreza" @@ -5193,7 +5206,7 @@ msgstr "Destreza" msgid "Dexterity %+.1f" msgstr "Destreza %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "Vitalidade" @@ -5202,7 +5215,7 @@ msgstr "Vitalidade" msgid "Vitality %+.1f" msgstr "Vitalidade %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Inteligência" @@ -5536,50 +5549,50 @@ msgstr "Erro de conexão desconhecido." msgid "Got disconnected from server!" msgstr "Você foi desconectado do servidor!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Sorte" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Defesa" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "Atq. Mágico" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "Def. Mágica" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% Exatidão" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% Evasão" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% CrÃticos" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Atraso de ataque" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Atraso de movimento" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "Atraso de alcance" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "Dano por seg." @@ -5600,143 +5613,47 @@ 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:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Bolha Flutuante" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "sem nome" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Ataque %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Defesa %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "Item desconhecido" - -#~ msgid "(?) move" -#~ msgstr "(?) mover" - -#~ msgid "(?) map view" -#~ msgstr "(?) Visualizador de mapa" - -#~ msgid "(D) design camera mode" -#~ msgstr "(D) Modo de jogo câmera design" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(l)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Andrei Karas <akaras@inbox.ru>, 2011. +# Andrei Karas <akaras@inbox.ru>, 2011, 2012. # Necromonger <Necromong@inbox.ru>, 2011. # <Necromong@inbox.ru>, 2011. # <reslayer@mail.ru>, 2011. @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-12-08 14:11+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:28+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/" "ru/)\n" "Language: ru\n" @@ -45,113 +45,113 @@ msgstr "О" msgid "I" msgstr "Б" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "ÐаÑтройка" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "ПроизводительноÑÑ‚ÑŒ" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Видео" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "Темы" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "Идет подключение к Ñерверу..." -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "ÐвторизациÑ" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "Входим в игровой мир" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "Получение ÑпиÑка перÑонажей" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "Подключение к игровому Ñерверу" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "Смена игрового Ñервера" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Ошибка" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ñ€ÐµÐ³Ð¸Ñтрационных данных" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "Изменить Пароль" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "Пароль изменен!" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "Сменить Email" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "Email изменен!" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð°" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "Хорошо, возвращайтеÑÑŒ в любое времÑ..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s не ÑущеÑтвует, и не может быть Ñоздано! Выход." -#: src/client.cpp:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "Ðекорректный Ñервер обновлений: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸ Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹!" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Ошибка: %s не ÑущеÑтвует, и не может быть Ñоздан! Выход." -#: src/commandhandler.cpp:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°." -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ пуÑтые ÑообщениÑ!" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,105 +160,105 @@ msgstr "" "Ðевозможно Ñоздать вкладку Ð´Ð»Ñ Ð»Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ¾Ð¼ \"%s\"! Или вкладка " "уже Ñоздана, или Ñтот игрок Ð’Ñ‹ Ñами." -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° приÑоединение к каналу %s." -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ðе указано название группы" -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "Ðе задано Ð¸Ð¼Ñ Ð³Ð¸Ð»ÑŒÐ´Ð¸Ð¸." -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "ПожалуйÑта, укажите имÑ" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "Enter переключает Ð’Ð°Ñ Ð½Ð° окно чата." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "Сообщение закрывает чат." -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "Теперь Return переключает чат." -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "Теперь Ñообщение закрывает чат." -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "друг" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "пренебрегаемый" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "нейтральный" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "Игрок уже %s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "Игрок удачно %s!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "Игрок не может быть %s!" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "Игрок не был игнорируемым!" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "Игрок больше не игнорируетÑÑ!" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "Игрок не может быть удален из ÑпиÑка игнорированиÑ!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "добавлен в черный ÑпиÑок" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "враг" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "Игрок и так уже удален!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "Игрок удален!" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "Игрок не может быть удален!" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "Ð’Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ клиента: %s" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -266,7 +266,7 @@ msgstr[0] "%d неделÑ" msgstr[1] "%d недели" msgstr[2] "%d недель" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" @@ -274,7 +274,7 @@ msgstr[0] "%d день" msgstr[1] "%d днÑ" msgstr[2] "%d дней" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -282,7 +282,7 @@ msgstr[0] "%d чаÑ" msgstr[1] "%d чаÑа" msgstr[2] "%d чаÑов" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -290,7 +290,7 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -298,27 +298,27 @@ msgstr[0] "%d Ñекунда" msgstr[1] "%d Ñекунды" msgstr[2] "%d Ñекунд" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "размер кеша шрифта" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "Размер кеша:" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "Создано:" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "Удалено:" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "Изображений:" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "Удаленных изображений:" @@ -329,43 +329,43 @@ msgstr "" "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или " "\"0\"." -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "Общие" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "Отладка" -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "Снимок Ñкрана Ñохранен как " -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "Ошибка при Ñохранении Ñнимка Ñкрана!" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "Соединение Ñ Ñервером потерÑно." -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "Ошибка Ñети" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "Игнорировать Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾ торговле" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "Принимать Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾ торговле" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "Ðе удалоÑÑŒ загрузить карту" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ %s" @@ -400,7 +400,7 @@ msgstr "ИмÑ" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "Ðтака" @@ -419,7 +419,7 @@ msgstr "Движение" msgid "Result" msgstr "Результат" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "СброÑить" @@ -442,16 +442,16 @@ msgstr "КоличеÑтво:" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -463,8 +463,8 @@ msgid "Quit" msgstr "Выход" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "МакÑ" @@ -488,14 +488,14 @@ msgstr "Продать" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "Отмена" @@ -527,7 +527,7 @@ msgid "The email address entries mismatch." msgstr "ÐÐ´Ñ€ÐµÑ E-mail не Ñовпадает" #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "Изменить пароль" @@ -593,8 +593,8 @@ msgstr "Стрижка:" msgid "Race:" msgstr "РаÑа:" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "Создать" @@ -636,47 +636,47 @@ msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтого Ð¿ÐµÑ msgid "Account and Character Management" msgstr "Управление учётной запиÑью" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "Сменить героÑ" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Удалить региÑтрацию" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "Сменить Ð°Ð´Ñ€ÐµÑ E-mail" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "Ðправильный пароль" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "Введите пароль Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€Ñонажа" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "Введите пароль:" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Удалить" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "Выбрать" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "Уровень: %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "(пуÑто)" @@ -750,12 +750,12 @@ msgstr "???" msgid "Chat" msgstr "Чат" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "ПриÑутÑтвуют: %s; Ð’Ñего %d игроков." -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "Ð’Ñ‹ прошептали %s: %s" @@ -919,7 +919,7 @@ msgid "Did You Know?" msgstr "Ð’Ñ‹ знаете?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Закрыть" @@ -947,8 +947,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "СнÑÑ‚ÑŒ" @@ -990,26 +990,26 @@ msgid "Filter:" msgstr "Фильтр:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "Ðадеть" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "ИÑпользовать" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "БроÑить" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "Разделить" @@ -1023,17 +1023,17 @@ msgid "Weight:" msgstr "ВеÑ:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "Сохранить" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "Получить" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "БроÑить" @@ -1258,31 +1258,27 @@ msgstr "ÑтатуÑ" msgid "Need" msgstr "Ðужно" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "Ожидание ответа от Ñервера" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "ОÑтановить ожидание" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "Следующий" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "Применить" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "ОчиÑтить" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "> Далее" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "ДлÑ:" @@ -1301,6 +1297,7 @@ msgid "Outfit: %d" msgstr "ÐарÑд: %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "Клавиша: %s" @@ -1384,7 +1381,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "@@ignore|ПолноÑтью игнорировать@@" @@ -1436,7 +1433,7 @@ msgid "Show Items" msgstr "Показать предметы" #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "Раздеть" @@ -1488,8 +1485,8 @@ msgstr "Игроки" msgid "Pick up" msgstr "ПоднÑÑ‚ÑŒ" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "Добавить в чат" @@ -1501,8 +1498,8 @@ msgstr "Ðлмент карты" msgid "Rename" msgstr "Переименовать" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "Удалить" @@ -1511,8 +1508,8 @@ msgid "Warp" msgstr "Прыгнуть" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" -msgstr "Загрузить Ñтарые нарÑды" +msgid "Clear outfit" +msgstr "ОчиÑтить нарÑд" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 msgid "Spells" @@ -1550,7 +1547,7 @@ msgstr "Рарешить режим отошел" msgid "Disable away" msgstr "Запретить режим отошел" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "Покинуть" @@ -1563,105 +1560,105 @@ msgid "Change guild position" msgstr "Сменить позицию в гильдии" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "Переименовать знак на карте" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "ИмÑ: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "Комментарий " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "Комментарий: " -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "Добавить к Ñделке" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "Добавить к Ñделке 10" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "Добавить к Ñделке половину" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "Добавить к торговле вÑе" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "Сохранить 10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "Сохранить половину" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "Сохранить вÑе" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "БроÑить вÑе" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "Получить 10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "Получить половину" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "Получить вÑе" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "Загрузить Ñтарые горÑчие клавиши предметов" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "Загрузить Ñтарые данные" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "СпрÑтать" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "Показать" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "ÑброÑить наÑтройки" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "Скопировать в чат" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(по умолчанию)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "Передвинуть выше" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "Передвинуть ниже" @@ -1758,11 +1755,11 @@ msgstr "Подготовка к загрузке" msgid "Error retreiving server list!" msgstr "Ðе удалоÑÑŒ получить ÑпиÑок Ñерверов!" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "требуетÑÑ Ð±Ð¾Ð»ÐµÐµ Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "требуетÑÑ v%s" @@ -2714,194 +2711,204 @@ msgstr "Уровень: %d" msgid "Lvl: %d (%+d)" msgstr "Уровень: %d (%+d)" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "ГильдиÑ" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "Пользователь %s приглашен в гильдию %s." -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "Выход из гильдии %s запрошен." -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "Приглашение игрока в Гильдию" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "Кого вы хотите приглаÑить в гильдию %s?" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "Покинуть Гильдию?" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "Ð’Ñ‹ дейÑтвительно хотите выйти из гильдии %s?" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Группа" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "ПриглаÑить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s в группу." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "Запрошен выход из группы %s." -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "ПриглаÑить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² группу" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "Кого вы хотите приглаÑить в группу %s?" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "Покинуть группу?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "Ð’Ñ‹ дейÑтвительно хотите покинуть группу %s?" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "Ðав" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "Ðтк" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "Приоритетные монÑтры" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "Ðтакуемые монÑтры" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "Игнорируемые монÑтры" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "Создать Гильдию" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "Создать группу" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "ОбщеÑтво" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "ПриглаÑить" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "И" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "Д" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "ПринÑто приглашение в группу от %s." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "Отклонено приглашение в группу от %s." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "ПринÑто приглашение в гильдию от %s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "Отклонено приглашение в гильдию от %s." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "Создание гильдии Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s." -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "Создание группы Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s." -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "Ð˜Ð¼Ñ Ð³Ð¸Ð»ÑŒÐ´Ð¸Ð¸" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "Выберите Ð¸Ð¼Ñ Ð´Ð»Ñ Ð³Ð¸Ð»ÑŒÐ´Ð¸Ð¸." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "Получено приглашение в гильдию, но оно не первое." -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%s приглашает приÑоединитьÑÑ Ðº гильдии %s." -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "ПринÑÑ‚ÑŒ приглашение в гильдию" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "Получено приглашение в группу, но оно не порвое." -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "Ð’Ð°Ñ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐ°ÑŽÑ‚ в группу." -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." msgstr "Ð’Ð°Ñ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐ°ÑŽÑ‚ приÑоединитьÑÑ Ðº группе %s." -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%s приглашает Ð’Ð°Ñ Ðº Ñебе в группу." -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, c-format msgid "%s has invited you to join the %s party." msgstr "%s приглашает приÑоединитьÑÑ Ðº %s группе." -#: src/gui/socialwindow.cpp:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "ПринÑÑ‚ÑŒ приглашение в группу" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 msgid "Cannot create party. You are already in a party" msgstr "Ðе удалоÑÑŒ Ñоздать группу. Ð’Ñ‹ уже ÑоÑтоите в другой." -#: src/gui/socialwindow.cpp:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "Ð˜Ð¼Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "Выберите Ð¸Ð¼Ñ Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ¹ группы." @@ -3093,33 +3100,33 @@ msgstr "" msgid "Name: %s" msgstr "ИмÑ: %s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "Обновление..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "Соединение..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "Играть" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 ПроцеÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ завершен!" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 ÐаÑтоÑтельно рекомендуетÑÑ" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "##1 попытатьÑÑ ÐµÑ‰Ðµ раз немного погодÑ." -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "Завершено" @@ -3271,23 +3278,23 @@ msgstr "Бордюр домашней позиции" msgid "Road Point" msgstr "Точка дороги" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "Кто онлайн - обновление" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "Обновить" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "Кто онлайн - " -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "Кто онлайн - ошибка" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "Кто онлайн - обновление" @@ -3997,40 +4004,41 @@ msgstr "" "веÑти." #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "Ð’Ñ‹ были убиты " +#, c-format +msgid "You were killed by %s" +msgstr "Ð’Ð°Ñ ÑƒÐ±Ð¸Ð» %s" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "Попытка поднÑÑ‚ÑŒ неÑущеÑтвующий предмет." -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "Предмет Ñлишком Ñ‚Ñжелый." -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "Предмет Ñлишком далеко" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "Инвентарь переполнен." -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "Слишком много предметов." -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "Предмет принадлежит кому-то еще." -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° при поднÑтии предмета." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1476 +#: src/localplayer.cpp:1481 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4038,385 +4046,390 @@ msgstr[0] "Ð’Ñ‹ поднÑли %d [@@%d|%s@@]." msgstr[1] "Ð’Ñ‹ поднÑли %d [@@%d|%s@@]." msgstr[2] "Ð’Ñ‹ поднÑли %d [@@%d|%s@@]." -#: src/localplayer.cpp:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "(D) Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "(I) обратное движение" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "(c) обычное движение иногда Ñ Ñумашедшими движениÑми" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "(C) движение Ñ Ñумашедшими движениÑми" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "(d) нормальные и Ñумашедшие движениÑ" -#: src/localplayer.cpp:1896 +#: src/localplayer.cpp:1903 msgid "(?) unknown move" msgstr "(?) неизвеÑтное движение" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "(%d) ÑумаÑшедшее движение %d" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "(a) пользовательÑкие Ñумашедшие движениÑ" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "(?) неизвеÑтные ÑумаÑшедшие движениÑ" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "(0) обычное движение к цели" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "(1) движение к цели на раÑÑтоÑние 1" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "(2) движение к цели на раÑÑтоÑние 2" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "(3) движение к цели на раÑÑтоÑние 3" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "(5) движение к цели на раÑÑтоÑние 5" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "(7) движение к цели на раÑÑтоÑние 7" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "(A) движение к цели на раÑÑтоÑние атаки" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "(a) атака лучника" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?) неизвеÑтное движение к цели" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "(D) Ñледование по умолчанию" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "(R) отноÑительное Ñледование" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "(M) зеркальное Ñледование" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "(P) Ñледование как животное" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "(?) неизвеÑтное Ñледование" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) неизвеÑÑ‚Ð½Ð°Ñ Ð°Ñ‚Ð°ÐºÐ°" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "(D) Ð¾Ð±Ñ‹Ñ‡Ð½Ð°Ñ Ð°Ñ‚Ð°ÐºÐ°" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "(s) переключение атаки без щита" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "(S) переключение атаки Ñо щитом" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) идти и атаковать" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "(A) идти, атаковать, Ñобирать" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "(d) без автоатаки" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "(S) поднÑтие в облаÑти 1x1" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "(D) поднÑтие из облаÑти 2x1" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "(F) поднÑтие из облаÑти Ñпереди 2x3" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "(3) поднÑтие из облаÑти 3x3" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "(g) движение и поднÑтие на раÑÑтоÑнии 4" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "(g) движение и поднÑтие на раÑÑтоÑнии 8" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "(A) движение и поднÑтие на макÑимальном раÑÑтоÑнии" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?) неизвеÑтный режим поднÑтиÑ" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "(N) обычный режим карты" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "(D) отладочный режим карты" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "(u) Ñпециальный режим карты" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "(U) Ñпециальный режим карты 2" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "(e) режим пуÑтой карты" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "(b) черно-белый режим карты" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "(f) иÑпользовать #flar Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "(c) иÑпользовать #chiza Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "(I) иÑпользовать #ingrav Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "(F) иÑпользовать #frillyar Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "(U) иÑпользовать #upmarmu Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "(?) неизвеÑÑ‚Ð½Ð°Ñ Ð¼Ð°Ð³Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ð°Ñ‚Ð°ÐºÐ°" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "(a) атаковать вÑех игроков" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "(f) атаковать вÑех кроме друзей" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "(b) атаковать врагов" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "(d) не атаковать игроков" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "(?) pvp атака" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "(D) Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ð¿Ð¾ умолчанию" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "(O) Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ð½Ð°Ñ€Ñдов" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "(?) неизвеÑÑ‚Ð½Ð°Ñ Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "Отошел" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "(O) возле компьютера" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "(A) отошел" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "(?) неизвеÑтный режим отошел" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "(G) Ð¸Ð³Ñ€Ð¾Ð²Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð°" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "(F) ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð°" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "Игровые модификаторы включены" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "Игровые модификаторы выключены" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "Игровые модификаторы в неизвеÑтном положении" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "Следование: " -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "Следование отменено" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "ИмитациÑ: " -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "Ð˜Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "Ð’Ñ‹ видите " -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "manaplus [параметры] [файл-manaplus]" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "[файл-manaplus] : Файл manaplus Ñто xml файл (.manaplus)" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr " иÑпользуетÑÑ Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… параметров" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr " в клиенте." -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "Опции:" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : ИÑпользовать указанный файл как лог" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : ИÑпользовать указанный каталог Ð´Ð»Ñ Ð»Ð¾Ð³Ð°" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr " -v --version : Показать верÑию" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr " -h --help : Показать Ñту Ñправку" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : ИÑпользовать указанный каталог конфигурации" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr " -U --username : Войти Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ логином" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr " -P --password : Войти Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ паролем" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr " -c --character : ИÑпользовать указанный перÑонаж" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr " -s --server : Ð˜Ð¼Ñ Ð¸Ð»Ð¸ IP Ñервера авторизации" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr " -p --port : Порт Ñервера авторизации" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr " --update-host : ИÑпользовать Ñтот узел обновлений" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Выбрать перÑонаж и Ñервер перÑонажей по умолчанию" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : ПропуÑтить обновление" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Загрузить игровые данные из Ñтого каталога" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Каталог Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… данных" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : СохранÑÑ‚ÑŒ Ñкриншоты в указанном каталоге" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr " --safemode : ЗапуÑк игры в безопаÑном режиме" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" +" -T --tests : ЗапуÑкает проверку драйверов и автоконфигурацию" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Ðе иÑпользовать OpenGL Ð´Ð»Ñ Ñтой ÑеÑÑии" @@ -4473,7 +4486,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "Ðекорректное имÑ." @@ -4489,15 +4502,19 @@ msgstr "Ðекорректный тип волоÑ." msgid "Incorrect slot." msgstr "Ðекорректный Ñлот." -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ñ€Ð°ÑÑа." + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "СведениÑ" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "ПерÑонаж удален" -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "Ðевозможно удалить перÑонажа." @@ -4542,16 +4559,16 @@ msgstr "Убрано игнорирование вÑех приватных Ñо msgid "All whispers unignore failed." msgstr "Ðе удалоÑÑŒ убрать игнорирование вÑех приватных Ñообщение." -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "Пользователей онлайн: %d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "Игра" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° выход отклонен!" @@ -4641,11 +4658,11 @@ msgstr "ÐеизвеÑтный ответ на приглашение в Ð³Ð¸Ð»Ñ msgid "%s has left your guild." msgstr "%s покинул Вашу гильдию." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." msgstr "Ð’Ñ‹ были кикнуты из гильдии." -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%s был вышвырнут из Вашей гильдии." @@ -4779,39 +4796,39 @@ msgstr "Старый пароль указан неверно." msgid "New password too short." msgstr "Ðовый пароль Ñлишком короткий." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "ÐезарегиÑтрированный ID" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "Ðеверный пароль" -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ проÑрочена." -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "Получен отказ от Ñервера.." -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "Ð’Ð°Ñ Ð½Ð°Ð²Ñегда забанили. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ ГМ-ов." -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "Клиент уÑтарел" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4819,15 +4836,15 @@ msgid "" msgstr "" "Ð’Ð°Ñ Ð·Ð°Ð±Ð°Ð½Ð¸Ð»Ð¸ до %s. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ ГМ-ов через форум." -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "Сервер переполнен" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "Ðто Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ занÑто." -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "Пользователь удален" @@ -5173,7 +5190,7 @@ msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°." msgid "Trade completed." msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "Сила (str)" @@ -5182,7 +5199,7 @@ msgstr "Сила (str)" msgid "Strength %+.1f" msgstr "Сила (str) %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "ВыноÑливоÑÑ‚ÑŒ (agi)" @@ -5191,7 +5208,7 @@ msgstr "ВыноÑливоÑÑ‚ÑŒ (agi)" msgid "Agility %+.1f" msgstr "ВыноÑливоÑÑ‚ÑŒ (agi) %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "ЛовкоÑÑ‚ÑŒ (dex)" @@ -5200,7 +5217,7 @@ msgstr "ЛовкоÑÑ‚ÑŒ (dex)" msgid "Dexterity %+.1f" msgstr "ЛовкоÑÑ‚ÑŒ (dex) %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "ЖивучеÑÑ‚ÑŒ (vit)" @@ -5209,7 +5226,7 @@ msgstr "ЖивучеÑÑ‚ÑŒ (vit)" msgid "Vitality %+.1f" msgstr "ЖивучеÑÑ‚ÑŒ (vit) %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "Интеллект (int)" @@ -5547,50 +5564,50 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° подключениÑ." msgid "Got disconnected from server!" msgstr "Отключено от Ñервера!" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "Удача (luk)" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "Защита" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "Маг. Ðтака" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "Маг.Защита" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "% ТочноÑти" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "% УклонениÑ" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "% КритичеÑкий удар" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "Задержка атаки" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "Задержка движениÑ" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "Зона атаки" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "Урон в Ñек." @@ -5611,47 +5628,47 @@ msgstr "Подключение к Ñерверу прервано." msgid "%s is not in your party!" msgstr "%s не в группе!" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "Печатать '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "Мигать именем" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "Плавающий '...' пузырек" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "Плавающий пузырек" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "безымÑнный" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "Ðтака %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "Защита %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "Мана %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "ÐеизвеÑтный предмет" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3a2071b23..c8b454e0c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-12-10 01:54+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2012-01-25 20:17+0300\n" +"PO-Revision-Date: 2012-01-25 17:27+0000\n" +"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/" "team/zh_CN/)\n" "Language: zh_CN\n" @@ -43,268 +43,268 @@ msgstr "A" msgid "I" msgstr "I" -#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "é”法攻击" -#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "性能" -#: src/client.cpp:890 src/gui/setup_video.cpp:315 +#: src/client.cpp:959 src/gui/setup_video.cpp:315 msgid "Video" msgstr "视频" -#: src/client.cpp:895 +#: src/client.cpp:964 msgid "Themes" msgstr "主题" -#: src/client.cpp:977 +#: src/client.cpp:1046 msgid "Connecting to server" msgstr "é”法防御" -#: src/client.cpp:1008 +#: src/client.cpp:1077 msgid "Logging in" msgstr "å°è¯•æ¡èµ·ä¸å˜åœ¨çš„物å“。" -#: src/client.cpp:1041 +#: src/client.cpp:1110 msgid "Entering game world" msgstr "æ¡èµ·ç‰©å“å‘生ä¸å˜åœ¨çš„物å“。" -#: src/client.cpp:1142 +#: src/client.cpp:1211 msgid "Requesting characters" msgstr "请求角色" -#: src/client.cpp:1173 +#: src/client.cpp:1242 msgid "Connecting to the game server" msgstr "连接到游æˆæœåŠ¡å™¨" -#: src/client.cpp:1183 +#: src/client.cpp:1252 msgid "Changing game servers" msgstr "更改游æˆæœåŠ¡å™¨" -#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 +#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 -#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170 +#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "错误" -#: src/client.cpp:1242 +#: src/client.cpp:1311 msgid "Requesting registration details" msgstr "请求注册的详细信æ¯" -#: src/client.cpp:1268 +#: src/client.cpp:1337 msgid "Password Change" msgstr "密ç 更改" -#: src/client.cpp:1269 +#: src/client.cpp:1338 msgid "Password changed successfully!" msgstr "更改密ç æˆåŠŸï¼" -#: src/client.cpp:1288 +#: src/client.cpp:1357 msgid "Email Change" msgstr "更改电å邮件" -#: src/client.cpp:1289 +#: src/client.cpp:1358 msgid "Email changed successfully!" msgstr "更改电å邮件æˆåŠŸï¼" -#: src/client.cpp:1309 +#: src/client.cpp:1378 msgid "Unregister Successful" msgstr "注销æˆåŠŸ" -#: src/client.cpp:1310 +#: src/client.cpp:1379 msgid "Farewell, come back any time..." msgstr "å†è§ï¼Œéšæ—¶æ¬¢è¿Žå›žæ¥... ..." -#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 -#: src/client.cpp:1979 src/client.cpp:1986 +#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632 +#: src/client.cpp:2064 src/client.cpp:2071 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s ä¸å˜åœ¨ï¼Œå¹¶ä¸”æ— æ³•åˆ›å»ºï¼é€€å‡ºã€‚" -#: src/client.cpp:1685 +#: src/client.cpp:1770 #, c-format msgid "Invalid update host: %s" msgstr "æ— æ•ˆçš„æ›´æ–°ä¸»æœº: %s" -#: src/client.cpp:1719 src/client.cpp:1725 +#: src/client.cpp:1804 src/client.cpp:1810 msgid "Error creating updates directory!" msgstr "创建更新目录错误ï¼" -#: src/client.cpp:1746 +#: src/client.cpp:1831 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "错误：%s ä¸å˜åœ¨å¹¶ä¸”æ— æ³•åˆ›å»ºï¼é€€å‡ºã€‚" -#: src/commandhandler.cpp:210 +#: src/commandhandler.cpp:212 msgid "Unknown command." msgstr "未知命令。" -#: src/commandhandler.cpp:330 +#: src/commandhandler.cpp:332 msgid "Cannot send empty whispers!" msgstr "æ— æ³•å‘é€ç©ºç™½å¯†è¯ï¼" -#: src/commandhandler.cpp:344 +#: src/commandhandler.cpp:346 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "æ— æ³•åŒ \"%s\" 建立一个ç§äººè°ˆè¯æ ‡ç¾é¡µï¼æˆ–者已ç»å˜åœ¨ï¼Œæˆ–者那就是自己。" -#: src/commandhandler.cpp:364 +#: src/commandhandler.cpp:366 #, c-format msgid "Requesting to join channel %s." msgstr "è¯·æ±‚åŠ å…¥é¢‘é“%s。" -#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "帮会å称缺失。" -#: src/commandhandler.cpp:391 +#: src/commandhandler.cpp:393 msgid "Guild name is missing." msgstr "公会å称是缺少的。" -#: src/commandhandler.cpp:404 src/commandhandler.cpp:522 -#: src/commandhandler.cpp:563 src/commandhandler.cpp:603 +#: src/commandhandler.cpp:406 src/commandhandler.cpp:523 +#: src/commandhandler.cpp:564 src/commandhandler.cpp:604 msgid "Please specify a name." msgstr "请指定一个å称。" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:457 msgid "Message closes chat." msgstr "讯æ¯å…³é—èŠå¤©ã€‚" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:468 msgid "Return now toggles chat." msgstr "<回车>键现在切æ¢èŠå¤©ã€‚" -#: src/commandhandler.cpp:473 +#: src/commandhandler.cpp:474 msgid "Message now closes chat." msgstr "讯æ¯çŽ°åœ¨å…³é—èŠå¤©ã€‚" -#: src/commandhandler.cpp:501 +#: src/commandhandler.cpp:502 msgid "friend" msgstr "朋å‹" -#: src/commandhandler.cpp:506 +#: src/commandhandler.cpp:507 msgid "disregarded" msgstr "æ— è§†" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:512 msgid "neutral" msgstr "ä¸æ€§" -#: src/commandhandler.cpp:530 +#: src/commandhandler.cpp:531 #, c-format msgid "Player already %s!" msgstr "玩家已ç»%s!" -#: src/commandhandler.cpp:544 +#: src/commandhandler.cpp:545 #, c-format msgid "Player successfully %s!" msgstr "玩家æˆåŠŸ%s!" -#: src/commandhandler.cpp:552 +#: src/commandhandler.cpp:553 #, c-format msgid "Player could not be %s!" msgstr "玩家ä¸èƒ½ä¸º %s" -#: src/commandhandler.cpp:575 +#: src/commandhandler.cpp:576 msgid "Player wasn't ignored!" msgstr "是ä¸èƒ½å¿½è§†çš„ï¼" -#: src/commandhandler.cpp:582 +#: src/commandhandler.cpp:583 msgid "Player no longer ignored!" msgstr "玩家ä¸å†è¢«å¿½ç•¥ï¼" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:585 msgid "Player could not be unignored!" msgstr "玩家ä¸èƒ½è¢«å¿½ç•¥!" -#: src/commandhandler.cpp:590 +#: src/commandhandler.cpp:591 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:595 +#: src/commandhandler.cpp:596 msgid "enemy" msgstr "" -#: src/commandhandler.cpp:610 +#: src/commandhandler.cpp:611 msgid "Player already erased!" msgstr "玩家已ç»è¢«åˆ 除!" -#: src/commandhandler.cpp:621 +#: src/commandhandler.cpp:622 msgid "Player successfully erased!" msgstr "玩家æˆåŠŸåˆ 除ï¼" -#: src/commandhandler.cpp:623 +#: src/commandhandler.cpp:624 msgid "Player could not be erased!" msgstr "çŽ©å®¶æ— æ³•åˆ é™¤ï¼" -#: src/commandhandler.cpp:930 src/commandhandler.cpp:976 +#: src/commandhandler.cpp:931 src/commandhandler.cpp:977 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:940 +#: src/commandhandler.cpp:941 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:949 +#: src/commandhandler.cpp:950 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:957 +#: src/commandhandler.cpp:958 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:965 +#: src/commandhandler.cpp:966 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:973 +#: src/commandhandler.cpp:974 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1052 +#: src/commandhandler.cpp:1053 msgid "font cache size" msgstr "å—体缓å˜å¤§å°" -#: src/commandhandler.cpp:1064 +#: src/commandhandler.cpp:1065 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1069 msgid "Created:" msgstr "创建于：" -#: src/commandhandler.cpp:1070 +#: src/commandhandler.cpp:1071 msgid "Deleted:" msgstr "åˆ é™¤ï¼š" -#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179 +#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181 +#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235 msgid "Resource orphaned images:" msgstr "" @@ -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:252 src/gui/widgets/chattab.cpp:405 +#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405 msgid "General" msgstr "常规" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 +#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407 msgid "Debug" msgstr "调试 " -#: src/game.cpp:506 +#: src/game.cpp:508 msgid "Screenshot saved as " msgstr "截图ä¿å˜ä¸º" -#: src/game.cpp:514 +#: src/game.cpp:516 msgid "Saving screenshot failed!" msgstr "ä¿å˜å±å¹•å¿«ç…§å¤±è´¥ï¼" -#: src/game.cpp:554 +#: src/game.cpp:558 msgid "The connection to the server was lost." msgstr "æœåŠ¡å™¨çš„连接丢失。" -#: src/game.cpp:557 +#: src/game.cpp:559 msgid "Network Error" msgstr "网络错误" -#: src/game.cpp:1258 +#: src/game.cpp:1270 msgid "Ignoring incoming trade requests" msgstr "忽略新进的交易请求" -#: src/game.cpp:1268 +#: src/game.cpp:1280 msgid "Accepting incoming trade requests" msgstr "接å—ä¼ å…¥çš„äº¤æ˜“è¯·æ±‚" -#: src/game.cpp:1773 +#: src/game.cpp:1786 msgid "Could Not Load Map" msgstr "ä¸èƒ½åŠ 载地图" -#: src/game.cpp:1774 +#: src/game.cpp:1787 #, c-format msgid "Error while loading %s" msgstr "åŠ è½½%s时出现错误" @@ -384,7 +384,7 @@ msgstr "姓å" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272 msgid "Attack" msgstr "攻击" @@ -403,7 +403,7 @@ msgstr "移动" msgid "Result" msgstr "结果" -#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128 msgid "Reset" msgstr "é‡ç½®" @@ -426,16 +426,16 @@ msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770 msgid "+" msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782 msgid "-" msgstr "-" @@ -447,8 +447,8 @@ msgid "Quit" msgstr "退出" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 -#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 +#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570 +#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800 msgid "Max" msgstr "最大" @@ -472,14 +472,14 @@ msgstr "出售" #: 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:1840 src/gui/popupmenu.cpp:1870 -#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 -#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053 -#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129 +#: 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:1077 src/gui/textcommandeditor.cpp:241 +#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updaterwindow.cpp:161 +#: src/gui/updaterwindow.cpp:168 msgid "Cancel" msgstr "å–消" @@ -511,7 +511,7 @@ msgid "The email address entries mismatch." msgstr "电å邮件地å€ä¸åŒ¹é…。" #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:140 msgid "Change Password" msgstr "æ›´æ¢å¯†ç " @@ -577,8 +577,8 @@ msgstr "å‘型：" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 -#: src/gui/socialwindow.cpp:1139 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483 +#: src/gui/socialwindow.cpp:1260 msgid "Create" msgstr "建立" @@ -620,47 +620,47 @@ msgstr "ä½ ç¡®å®šæƒ³åˆ é™¤è¿™ä¸ªè§’è‰²ï¼Ÿ" msgid "Account and Character Management" msgstr "å¸å·å’Œè§’色管ç†" -#: src/gui/charselectdialog.cpp:138 +#: src/gui/charselectdialog.cpp:139 msgid "Switch Login" msgstr "登录" -#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "注销" -#: src/gui/charselectdialog.cpp:161 +#: src/gui/charselectdialog.cpp:163 msgid "Change Email" msgstr "å˜æ›´ç”µå邮件" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:256 msgid "Incorrect password" msgstr "ä¸æ£ç¡®çš„密ç " -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password for deleting character" msgstr "åˆ é™¤å—符输入的密ç " -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:289 msgid "Enter password:" msgstr "输入密ç ：" -#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "åˆ é™¤" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 msgid "Choose" msgstr "选择" -#: src/gui/charselectdialog.cpp:472 +#: src/gui/charselectdialog.cpp:474 #, c-format msgid "Level %d" msgstr "ç‰çº§ %d" -#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 +#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486 msgid "(empty)" msgstr "()" @@ -734,12 +734,12 @@ msgstr "？？？" msgid "Chat" msgstr "èŠå¤©" -#: src/gui/chatwindow.cpp:649 +#: src/gui/chatwindow.cpp:650 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:1036 +#: src/gui/chatwindow.cpp:1037 #, c-format msgid "Whispering to %s: %s" msgstr "对%s密è¯åˆ°ï¼š%s" @@ -903,7 +903,7 @@ msgid "Did You Know?" msgstr "ä½ çŸ¥é“å—？" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "å…³é—" @@ -931,8 +931,8 @@ 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:1802 src/gui/popupmenu.cpp:1898 -#: src/gui/popupmenu.cpp:1945 +#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:1955 msgid "Unequip" msgstr "å¸ä¸‹è£…备" @@ -974,26 +974,26 @@ msgid "Filter:" msgstr "过滤器：" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804 -#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814 +#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957 msgid "Equip" msgstr "装备" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808 -#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904 -#: src/gui/popupmenu.cpp:1951 +#: 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 msgid "Use" msgstr "使用" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909 -#: src/gui/popupmenu.cpp:1956 +#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919 +#: src/gui/popupmenu.cpp:1966 msgid "Drop..." msgstr "掉è½... ..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822 -#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975 msgid "Split" msgstr "分离" @@ -1007,17 +1007,17 @@ msgid "Weight:" msgstr "é‡é‡ï¼š" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921 -#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931 +#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73 msgid "Store" msgstr "å˜å‚¨" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839 msgid "Retrieve" msgstr "å–回" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818 -#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "丢弃" @@ -1238,31 +1238,27 @@ msgstr "状æ€æ " msgid "Need" msgstr "需è¦" -#: src/gui/npcdialog.cpp:51 -msgid "Waiting for server" -msgstr "ç‰å¾…æœåŠ¡å™¨ä¸" - #: src/gui/npcdialog.cpp:52 +msgid "Stop waiting" +msgstr "" + +#: src/gui/npcdialog.cpp:53 msgid "Next" msgstr "下一个" -#: src/gui/npcdialog.cpp:54 +#: src/gui/npcdialog.cpp:55 msgid "Submit" msgstr "æ交" -#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 +#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42 #: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632 +#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632 msgid "Clear" msgstr "清除" -#: src/gui/npcdialog.cpp:223 -msgid "> Next" -msgstr "" - #: src/gui/npcpostdialog.cpp:48 msgid "To:" msgstr "至：" @@ -1281,6 +1277,7 @@ msgid "Outfit: %d" msgstr "套装： %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 +#: src/gui/windowmenu.cpp:302 #, c-format msgid "Key: %s" msgstr "按键：%s" @@ -1364,7 +1361,7 @@ 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/playerrelations.cpp:447 +#: src/playerrelations.cpp:465 msgid "Completely ignore" msgstr "完全忽略" @@ -1416,7 +1413,7 @@ msgid "Show Items" msgstr "显示项目" #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740 -#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126 +#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136 msgid "Undress" msgstr "" @@ -1468,8 +1465,8 @@ msgstr "玩家" msgid "Pick up" msgstr "拾å–" -#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838 -#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969 +#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979 msgid "Add to chat" msgstr "åŠ å…¥èŠå¤©" @@ -1481,8 +1478,8 @@ msgstr "地图项" msgid "Rename" msgstr "é‡å‘½å" -#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085 -#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100 +#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110 msgid "Remove" msgstr "" @@ -1491,7 +1488,7 @@ msgid "Warp" msgstr "" #: src/gui/popupmenu.cpp:589 -msgid "Load old outfits" +msgid "Clear outfit" msgstr "" #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96 @@ -1530,7 +1527,7 @@ msgstr "å¯ç”¨è¿œ" msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262 msgid "Leave" msgstr "留下" @@ -1543,105 +1540,105 @@ msgid "Change guild position" msgstr "更改公会的立场" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1326 +#: src/gui/popupmenu.cpp:1335 msgid "Rename map sign " msgstr "é‡å‘½åçš„åœ°å›¾æ ‡å¿—" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1328 +#: src/gui/popupmenu.cpp:1337 msgid "Name: " msgstr "å称：" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1378 +#: src/gui/popupmenu.cpp:1382 msgid "Player comment " msgstr "玩家评论" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1380 +#: src/gui/popupmenu.cpp:1384 msgid "Comment: " msgstr "评论：" -#: src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1786 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1780 +#: src/gui/popupmenu.cpp:1790 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1781 +#: src/gui/popupmenu.cpp:1791 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1782 +#: src/gui/popupmenu.cpp:1792 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1802 msgid "Store 10" msgstr "商店10" -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1803 msgid "Store half" msgstr "商店的一åŠ" -#: src/gui/popupmenu.cpp:1794 +#: src/gui/popupmenu.cpp:1804 msgid "Store all" msgstr "商店所有" -#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910 -#: src/gui/popupmenu.cpp:1957 +#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1967 msgid "Drop all" msgstr "所有" -#: src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1843 msgid "Retrieve 10" msgstr "拿出10" -#: src/gui/popupmenu.cpp:1834 +#: src/gui/popupmenu.cpp:1844 msgid "Retrieve half" msgstr "拿出一åŠ" -#: src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1845 msgid "Retrieve all" msgstr "检索所有" -#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1973 +#: src/gui/popupmenu.cpp:1983 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038 +#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048 msgid "Hide" msgstr "éšè—" -#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044 +#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054 msgid "Show" msgstr "显示" -#: src/gui/popupmenu.cpp:2050 +#: src/gui/popupmenu.cpp:2060 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242 +#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88 -#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 -#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 +#: 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 msgid "(default)" msgstr "(默认)" -#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093 +#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103 msgid "Move up" msgstr "x" -#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095 +#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105 msgid "Move down" msgstr "" @@ -1738,11 +1735,11 @@ msgstr "准备下载" msgid "Error retreiving server list!" msgstr "æ¢å¤æœåŠ¡å™¨åˆ—表错误ï¼" -#: src/gui/serverdialog.cpp:678 +#: src/gui/serverdialog.cpp:681 msgid "requires a newer version" msgstr "需è¦è¾ƒæ–°ç‰ˆæœ¬" -#: src/gui/serverdialog.cpp:680 +#: src/gui/serverdialog.cpp:683 #, c-format msgid "requires v%s" msgstr "éœ€è¦ v%s" @@ -2682,194 +2679,204 @@ msgstr "ç‰çº§: %d" msgid "Lvl: %d (%+d)" msgstr "ç‰çº§: %d（%+d）" -#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "帮会" -#: src/gui/socialwindow.cpp:147 +#: src/gui/socialwindow.cpp:173 #, c-format msgid "Invited user %s to guild %s." msgstr "邀请用户%såŠ å…¥å…¬ä¼š%s" -#: src/gui/socialwindow.cpp:161 +#: src/gui/socialwindow.cpp:187 #, c-format msgid "Guild %s quit requested." msgstr "退出公会%s的请求。" -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:214 msgid "Member Invite to Guild" msgstr "会员邀请到公会" -#: src/gui/socialwindow.cpp:189 +#: src/gui/socialwindow.cpp:215 #, c-format msgid "Who would you like to invite to guild %s?" msgstr "ä½ è¦é‚€è¯·è°åŠ 入工会%s?" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:224 msgid "Leave Guild?" msgstr "离开公会？" -#: src/gui/socialwindow.cpp:199 +#: src/gui/socialwindow.cpp:225 #, c-format msgid "Are you sure you want to leave guild %s?" msgstr "ä½ ç¡®å®šè¦ç¦»å¼€å·¥ä¼š%så—？" -#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "t" -#: src/gui/socialwindow.cpp:347 +#: src/gui/socialwindow.cpp:373 #, c-format msgid "Invited user %s to party." msgstr "邀请用户%såŠ å…¥å›¢é˜Ÿ." -#: src/gui/socialwindow.cpp:361 +#: src/gui/socialwindow.cpp:387 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:388 +#: src/gui/socialwindow.cpp:414 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:389 +#: src/gui/socialwindow.cpp:415 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:398 +#: src/gui/socialwindow.cpp:424 msgid "Leave Party?" msgstr "离开团队?" -#: src/gui/socialwindow.cpp:399 +#: src/gui/socialwindow.cpp:425 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:625 +#: src/gui/socialwindow.cpp:649 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:903 +#: src/gui/socialwindow.cpp:927 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:944 +#: src/gui/socialwindow.cpp:968 msgid "Priority mobs" msgstr "" -#: src/gui/socialwindow.cpp:976 +#: src/gui/socialwindow.cpp:1000 msgid "Attack mobs" msgstr "攻击暴徒" -#: src/gui/socialwindow.cpp:1011 +#: src/gui/socialwindow.cpp:1035 msgid "Ignore mobs" msgstr "" -#: src/gui/socialwindow.cpp:1074 +#: src/gui/socialwindow.cpp:1195 msgid "Create Guild" msgstr "创建帮会" -#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 +#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631 msgid "Create Party" msgstr "建立" -#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93 msgid "Social" msgstr "" -#: src/gui/socialwindow.cpp:1140 +#: src/gui/socialwindow.cpp:1261 msgid "Invite" msgstr "邀请" -#: src/gui/socialwindow.cpp:1286 +#. TRANSLATORS: here P is title for visible players tab in social window +#: src/gui/socialwindow.cpp:1277 +msgid "P" +msgstr "" + +#. TRANSLATORS: here F is title for friends tab in social window +#: src/gui/socialwindow.cpp:1281 +msgid "F" +msgstr "" + +#: src/gui/socialwindow.cpp:1414 #, c-format msgid "Accepted party invite from %s." msgstr "接å—%s团队的邀请." -#: src/gui/socialwindow.cpp:1296 +#: src/gui/socialwindow.cpp:1424 #, c-format msgid "Rejected party invite from %s." msgstr "æ‹’ç»%s的团队邀请." -#: src/gui/socialwindow.cpp:1313 +#: src/gui/socialwindow.cpp:1441 #, c-format msgid "Accepted guild invite from %s." msgstr "已接å—公会邀请æ¥è‡ª%s." -#: src/gui/socialwindow.cpp:1326 +#: src/gui/socialwindow.cpp:1454 #, c-format msgid "Rejected guild invite from %s." msgstr "æ‹’ç»%s的公会邀请." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1501 #, c-format msgid "Creating guild called %s." msgstr "创建公会的å为%s" -#: src/gui/socialwindow.cpp:1396 +#: src/gui/socialwindow.cpp:1524 #, c-format msgid "Creating party called %s." msgstr "创建团队åå—为%sçš„" -#: src/gui/socialwindow.cpp:1410 +#: src/gui/socialwindow.cpp:1538 msgid "Guild Name" msgstr "公会å称" -#: src/gui/socialwindow.cpp:1411 +#: src/gui/socialwindow.cpp:1539 msgid "Choose your guild's name." msgstr "é€‰æ‹©ä½ çš„å…¬ä¼šçš„åå—." -#: src/gui/socialwindow.cpp:1425 +#: src/gui/socialwindow.cpp:1553 msgid "Received guild request, but one already exists." msgstr "" -#: src/gui/socialwindow.cpp:1431 +#: src/gui/socialwindow.cpp:1559 #, c-format msgid "%s has invited you to join the guild %s." msgstr "%sé‚€è¯·ä½ åŠ å…¥å…¬ä¼š%s" -#: src/gui/socialwindow.cpp:1437 +#: src/gui/socialwindow.cpp:1565 msgid "Accept Guild Invite" msgstr "接å—邀请" -#: src/gui/socialwindow.cpp:1452 +#: src/gui/socialwindow.cpp:1580 msgid "Received party request, but one already exists." msgstr "接å—到一个已ç»å˜åœ¨çš„帮会邀请。" -#: src/gui/socialwindow.cpp:1463 +#: src/gui/socialwindow.cpp:1591 msgid "You have been invited you to join a party." msgstr "æ‚¨å·²è¢«é‚€è¯·æ‚¨åŠ å…¥å…šã€‚" -#: src/gui/socialwindow.cpp:1467 +#: src/gui/socialwindow.cpp:1595 #, c-format msgid "You have been invited to join the %s party." msgstr "æ‚¨å·²è¢«é‚€è¯·åŠ å…¥%s的团队。" -#: src/gui/socialwindow.cpp:1475 +#: src/gui/socialwindow.cpp:1603 #, c-format msgid "%s has invited you to join their party." msgstr "%så·²ç»é‚€è¯·ä½ åŠ å…¥ä»–ä»¬çš„å¸®ä¼šã€‚" -#: src/gui/socialwindow.cpp:1480 +#: src/gui/socialwindow.cpp:1608 #, c-format msgid "%s has invited you to join the %s party." msgstr "%så·²ç»é‚€è¯·ä½ åŠ å…¥å¸®ä¼š%s。" -#: src/gui/socialwindow.cpp:1489 +#: src/gui/socialwindow.cpp:1617 msgid "Accept Party Invite" msgstr "接å—帮会邀请" -#: src/gui/socialwindow.cpp:1504 +#: src/gui/socialwindow.cpp:1632 msgid "Cannot create party. You are already in a party" msgstr "æ— æ³•å»ºç«‹å›¢é˜Ÿ.您已ç»åœ¨ä¸€ä¸ªé˜Ÿä¼ä¸äº†" -#: src/gui/socialwindow.cpp:1509 +#: src/gui/socialwindow.cpp:1637 msgid "Party Name" msgstr "" -#: src/gui/socialwindow.cpp:1510 +#: src/gui/socialwindow.cpp:1638 msgid "Choose your party's name." msgstr "选择nçš„å称。" @@ -3059,33 +3066,33 @@ msgstr "æ·»åŠ ç‰©å“å¤±è´¥ã€‚ä½ ä¸èƒ½è¦†ç›–窗å£ä¸çš„该类物å“。" msgid "Name: %s" msgstr "姓å：%s" -#: src/gui/updaterwindow.cpp:138 +#: src/gui/updaterwindow.cpp:139 msgid "Updating..." msgstr "æ›´æ–°..." -#: src/gui/updaterwindow.cpp:159 +#: src/gui/updaterwindow.cpp:166 msgid "Connecting..." msgstr "连接ä¸..." -#: src/gui/updaterwindow.cpp:162 +#: src/gui/updaterwindow.cpp:169 msgid "Play" msgstr "开始" -#: src/gui/updaterwindow.cpp:565 +#: src/gui/updaterwindow.cpp:570 msgid "##1 The update process is incomplete." msgstr "##1 更新过程ä¸å®Œæ•´ã€‚" #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updaterwindow.cpp:567 +#: src/gui/updaterwindow.cpp:572 msgid "##1 It is strongly recommended that" msgstr "##1 强烈建议" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updaterwindow.cpp:569 +#: src/gui/updaterwindow.cpp:574 msgid "##1 you try again later." msgstr "" -#: src/gui/updaterwindow.cpp:745 +#: src/gui/updaterwindow.cpp:750 msgid "Completed" msgstr "已完æˆ" @@ -3237,23 +3244,23 @@ msgstr "家居广场边界" msgid "Road Point" msgstr "路点" -#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563 +#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572 msgid "Who Is Online - Updating" msgstr "è°åœ¨çº¿ - æ›´æ–°" -#: src/gui/whoisonline.cpp:111 +#: src/gui/whoisonline.cpp:113 msgid "Update" msgstr "æ›´æ–°" -#: src/gui/whoisonline.cpp:194 +#: src/gui/whoisonline.cpp:196 msgid "Who Is Online - " msgstr "è°åœ¨çº¿ -" -#: src/gui/whoisonline.cpp:577 +#: src/gui/whoisonline.cpp:586 msgid "Who Is Online - error" msgstr "è°åœ¨çº¿ - 错误" -#: src/gui/whoisonline.cpp:611 +#: src/gui/whoisonline.cpp:625 msgid "Who Is Online - Update" msgstr "è°åœ¨çº¿ - æ›´æ–°" @@ -3958,423 +3965,428 @@ msgid "" msgstr "" #: src/localplayer.cpp:384 -msgid "You were killed by " -msgstr "ä½ è¢«æ‰“æ»" +#, c-format +msgid "You were killed by %s" +msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1440 +#: src/localplayer.cpp:1442 msgid "Item is too heavy." msgstr "项目是太é‡äº†ã€‚" -#: src/localplayer.cpp:1442 +#: src/localplayer.cpp:1445 msgid "Item is too far away." msgstr "物å“太远了。" -#: src/localplayer.cpp:1444 +#: src/localplayer.cpp:1448 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1446 +#: src/localplayer.cpp:1451 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1449 +#: src/localplayer.cpp:1454 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1452 +#: src/localplayer.cpp:1457 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1476 +#: src/localplayer.cpp:1481 #, 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:1891 +#: src/localplayer.cpp:1898 msgid "(D) default moves" msgstr "" -#: src/localplayer.cpp:1892 +#: src/localplayer.cpp:1899 msgid "(I) invert moves" msgstr "" -#: src/localplayer.cpp:1893 +#: src/localplayer.cpp:1900 msgid "(c) moves with some crazy moves" msgstr "" -#: src/localplayer.cpp:1894 +#: src/localplayer.cpp:1901 msgid "(C) moves with crazy moves" msgstr "" -#: src/localplayer.cpp:1895 +#: src/localplayer.cpp:1902 msgid "(d) double normal + crazy" msgstr "" -#: src/localplayer.cpp:1896 +#: src/localplayer.cpp:1903 msgid "(?) unknown move" msgstr "" -#: src/localplayer.cpp:1918 +#: src/localplayer.cpp:1925 #, c-format msgid "(%d) crazy move number %d" msgstr "" -#: src/localplayer.cpp:1923 +#: src/localplayer.cpp:1930 msgid "(a) custom crazy move" msgstr "" -#: src/localplayer.cpp:1927 +#: src/localplayer.cpp:1934 msgid "(?) crazy move" msgstr "" -#: src/localplayer.cpp:1941 +#: src/localplayer.cpp:1948 msgid "(0) default moves to target" msgstr "" -#: src/localplayer.cpp:1942 +#: src/localplayer.cpp:1949 msgid "(1) moves to target in distance 1" msgstr "" -#: src/localplayer.cpp:1943 +#: src/localplayer.cpp:1950 msgid "(2) moves to target in distance 2" msgstr "" -#: src/localplayer.cpp:1944 +#: src/localplayer.cpp:1951 msgid "(3) moves to target in distance 3" msgstr "" -#: src/localplayer.cpp:1945 +#: src/localplayer.cpp:1952 msgid "(5) moves to target in distance 5" msgstr "" -#: src/localplayer.cpp:1946 +#: src/localplayer.cpp:1953 msgid "(7) moves to target in distance 7" msgstr "" -#: src/localplayer.cpp:1947 +#: src/localplayer.cpp:1954 msgid "(A) moves to target in attack range" msgstr "" -#: src/localplayer.cpp:1948 +#: src/localplayer.cpp:1955 msgid "(a) archer attack range" msgstr "" -#: src/localplayer.cpp:1949 +#: src/localplayer.cpp:1956 msgid "(?) move to target" msgstr "(?)ç§»åŠ¨åˆ°ç›®æ ‡" -#: src/localplayer.cpp:1968 +#: src/localplayer.cpp:1975 msgid "(D) default follow" msgstr "" -#: src/localplayer.cpp:1969 +#: src/localplayer.cpp:1976 msgid "(R) relative follow" msgstr "" -#: src/localplayer.cpp:1970 +#: src/localplayer.cpp:1977 msgid "(M) mirror follow" msgstr "" -#: src/localplayer.cpp:1971 +#: src/localplayer.cpp:1978 msgid "(P) pet follow" msgstr "" -#: src/localplayer.cpp:1972 +#: src/localplayer.cpp:1979 msgid "(?) unknown follow" msgstr "" -#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018 +#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025 msgid "(?) attack" msgstr "(?) 攻击" -#: src/localplayer.cpp:1992 src/localplayer.cpp:2014 +#: src/localplayer.cpp:1999 src/localplayer.cpp:2021 msgid "(D) default attack" msgstr "" -#: src/localplayer.cpp:1993 +#: src/localplayer.cpp:2000 msgid "(s) switch attack without shield" msgstr "" -#: src/localplayer.cpp:1994 +#: src/localplayer.cpp:2001 msgid "(S) switch attack with shield" msgstr "" -#: src/localplayer.cpp:2015 +#: src/localplayer.cpp:2022 msgid "(G) go and attack" msgstr "(G) 去攻击" -#: src/localplayer.cpp:2016 +#: src/localplayer.cpp:2023 msgid "(A) go, attack, pickup" msgstr "" -#: src/localplayer.cpp:2017 +#: src/localplayer.cpp:2024 msgid "(d) without auto attack" msgstr "" -#: src/localplayer.cpp:2051 +#: src/localplayer.cpp:2058 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/localplayer.cpp:2052 +#: src/localplayer.cpp:2059 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/localplayer.cpp:2053 +#: src/localplayer.cpp:2060 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/localplayer.cpp:2054 +#: src/localplayer.cpp:2061 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/localplayer.cpp:2055 +#: src/localplayer.cpp:2062 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/localplayer.cpp:2056 +#: src/localplayer.cpp:2063 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/localplayer.cpp:2057 +#: src/localplayer.cpp:2064 msgid "(A) go and pick up in max distance" msgstr "" -#: src/localplayer.cpp:2058 +#: src/localplayer.cpp:2065 msgid "(?) pick up" msgstr "(?)æ‹¿èµ·" -#: src/localplayer.cpp:2071 +#: src/localplayer.cpp:2078 msgid "(N) normal map view" msgstr "" -#: src/localplayer.cpp:2072 +#: src/localplayer.cpp:2079 msgid "(D) debug map view" msgstr "" -#: src/localplayer.cpp:2073 +#: src/localplayer.cpp:2080 msgid "(u) ultra map view" msgstr "" -#: src/localplayer.cpp:2074 +#: src/localplayer.cpp:2081 msgid "(U) ultra map view 2" msgstr "" -#: src/localplayer.cpp:2075 +#: src/localplayer.cpp:2082 msgid "(e) empty map view" msgstr "" -#: src/localplayer.cpp:2076 +#: src/localplayer.cpp:2083 msgid "(b) black & white map view" msgstr "" -#: src/localplayer.cpp:2095 +#: src/localplayer.cpp:2102 msgid "(f) use #flar for magic attack" msgstr "" -#: src/localplayer.cpp:2096 +#: src/localplayer.cpp:2103 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/localplayer.cpp:2097 +#: src/localplayer.cpp:2104 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/localplayer.cpp:2098 +#: src/localplayer.cpp:2105 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/localplayer.cpp:2099 +#: src/localplayer.cpp:2106 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/localplayer.cpp:2100 +#: src/localplayer.cpp:2107 msgid "(?) magic attack" msgstr "" -#: src/localplayer.cpp:2119 +#: src/localplayer.cpp:2126 msgid "(a) attack all players" msgstr "" -#: src/localplayer.cpp:2120 +#: src/localplayer.cpp:2127 msgid "(f) attack not friends" msgstr "" -#: src/localplayer.cpp:2121 +#: src/localplayer.cpp:2128 msgid "(b) attack bad relations" msgstr "" -#: src/localplayer.cpp:2122 +#: src/localplayer.cpp:2129 msgid "(d) dont attack players" msgstr "" -#: src/localplayer.cpp:2123 +#: src/localplayer.cpp:2130 msgid "(?) pvp attack" msgstr "" -#: src/localplayer.cpp:2142 +#: src/localplayer.cpp:2149 msgid "(D) default imitation" msgstr "" -#: src/localplayer.cpp:2143 +#: src/localplayer.cpp:2150 msgid "(O) outfits imitation" msgstr "" -#: src/localplayer.cpp:2144 +#: src/localplayer.cpp:2151 msgid "(?) imitation" msgstr "" -#: src/localplayer.cpp:2172 +#: src/localplayer.cpp:2179 msgid "Away" msgstr "è·ç¦»" -#: src/localplayer.cpp:2191 +#: src/localplayer.cpp:2198 msgid "(O) on keyboard" msgstr "" -#: src/localplayer.cpp:2192 +#: src/localplayer.cpp:2199 msgid "(A) away" msgstr "" -#: src/localplayer.cpp:2193 src/localplayer.cpp:2208 +#: src/localplayer.cpp:2200 src/localplayer.cpp:2215 msgid "(?) away" msgstr "" -#: src/localplayer.cpp:2206 +#: src/localplayer.cpp:2213 msgid "(G) game camera mode" msgstr "" -#: src/localplayer.cpp:2207 +#: src/localplayer.cpp:2214 msgid "(F) free camera mode" msgstr "" -#: src/localplayer.cpp:2232 +#: src/localplayer.cpp:2239 msgid "Game modifiers are enabled" msgstr "" -#: src/localplayer.cpp:2233 +#: src/localplayer.cpp:2240 msgid "Game modifiers are disabled" msgstr "" -#: src/localplayer.cpp:2234 +#: src/localplayer.cpp:2241 msgid "Game modifiers are unknown" msgstr "" -#: src/localplayer.cpp:3750 +#: src/localplayer.cpp:3758 msgid "Follow: " msgstr "è·Ÿéš:" -#: src/localplayer.cpp:3752 src/localplayer.cpp:3767 +#: src/localplayer.cpp:3760 src/localplayer.cpp:3775 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3759 +#: src/localplayer.cpp:3767 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3761 src/localplayer.cpp:3769 +#: src/localplayer.cpp:3769 src/localplayer.cpp:3777 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:4117 +#: src/localplayer.cpp:4125 msgid "You see " msgstr "ä½ çœ‹" -#: src/main.cpp:47 +#: src/main.cpp:50 msgid "manaplus [options] [manaplus-file]" msgstr "" -#: src/main.cpp:48 +#: src/main.cpp:51 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:50 +#: src/main.cpp:53 msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:51 +#: src/main.cpp:54 msgid " to the manaplus client." msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:56 msgid "Options:" msgstr "选项：" -#: src/main.cpp:54 +#: src/main.cpp:57 msgid " -l --log-file : Log file to use" msgstr "-l--log-file 日志文件" -#: src/main.cpp:55 +#: src/main.cpp:58 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:59 msgid " -v --version : Display the version" msgstr "-v --version: 显示版本" -#: src/main.cpp:57 +#: src/main.cpp:60 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:61 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:62 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:63 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:64 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:65 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:66 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:67 msgid " --update-host : Use this update host" msgstr "--update-host: 使用æ¤æ›´æ–°ä¸»æœº" -#: src/main.cpp:65 +#: src/main.cpp:68 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:70 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:68 +#: src/main.cpp:71 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:70 +#: src/main.cpp:73 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:75 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:73 +#: src/main.cpp:76 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:75 +#: src/main.cpp:77 +msgid " -T --tests : Start testing drivers and auto configuring" +msgstr "" + +#: src/main.cpp:80 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4430,7 +4442,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:235 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245 msgid "Wrong name." msgstr "错误的å称。" @@ -4446,15 +4458,19 @@ msgstr "ä¸æ£ç¡®çš„头å‘。" msgid "Incorrect slot." msgstr "" -#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:167 +msgid "Incorrect race." +msgstr "" + +#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "ä¿¡æ¯" -#: src/net/ea/charserverhandler.cpp:179 +#: src/net/ea/charserverhandler.cpp:182 msgid "Character deleted." msgstr "è§’è‰²å·²åˆ é™¤ã€‚" -#: src/net/ea/charserverhandler.cpp:185 +#: src/net/ea/charserverhandler.cpp:188 msgid "Failed to delete character." msgstr "åˆ é™¤è§’è‰²å¤±è´¥ã€‚" @@ -4499,16 +4515,16 @@ msgstr "" msgid "All whispers unignore failed." msgstr "" -#: src/net/ea/gamehandler.cpp:87 +#: src/net/ea/gamehandler.cpp:92 #, c-format msgid "Online users: %d" msgstr "在线用户数：%d" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Game" msgstr "游æˆ" -#: src/net/ea/gamehandler.cpp:99 +#: src/net/ea/gamehandler.cpp:104 msgid "Request to quit denied!" msgstr "" @@ -4598,11 +4614,11 @@ msgstr "未知工会邀请å“应." msgid "%s has left your guild." msgstr "%så·²ç»ç¦»å¼€å·¥ä¼š." -#: src/net/ea/guildhandler.cpp:498 -msgid "You was kicked from guild." -msgstr "ä½ å·²ç»è¢«å·¥ä¼šå¼€é™¤ï¼." +#: src/net/ea/guildhandler.cpp:499 +msgid "You were kicked from guild." +msgstr "" -#: src/net/ea/guildhandler.cpp:511 +#: src/net/ea/guildhandler.cpp:512 #, c-format msgid "%s has kicked from your guild." msgstr "%så·²ç»è¢«å·¥ä¼šå¼€é™¤." @@ -4735,39 +4751,39 @@ msgstr "旧密ç ä¸æ£ç¡®ã€‚" msgid "New password too short." msgstr "新密ç 太çŸã€‚" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251 #: 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:203 +#: src/net/ea/loginhandler.cpp:213 msgid "Unregistered ID." msgstr "未注册的ID。" -#: src/net/ea/loginhandler.cpp:206 +#: src/net/ea/loginhandler.cpp:216 msgid "Wrong password." msgstr "错误的密ç 。" -#: src/net/ea/loginhandler.cpp:209 +#: src/net/ea/loginhandler.cpp:219 msgid "Account expired." msgstr "账户过期失效。" -#: src/net/ea/loginhandler.cpp:212 +#: src/net/ea/loginhandler.cpp:222 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:215 +#: src/net/ea/loginhandler.cpp:225 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "您已被永久ç¦æ¢è¿›å…¥æ¸¸æˆã€‚请è”ç³»GM团队。" -#: src/net/ea/loginhandler.cpp:219 +#: src/net/ea/loginhandler.cpp:229 msgid "Client too old." msgstr "客户端太旧。" -#: src/net/ea/loginhandler.cpp:222 +#: src/net/ea/loginhandler.cpp:232 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4776,15 +4792,15 @@ msgstr "" "ä½ è¢«æš‚æ—¶ç¦æ¢è¿›å…¥æ¸¸æˆç›´åˆ°%s.\n" "请通过论å›è”ç³»GM组" -#: src/net/ea/loginhandler.cpp:229 +#: src/net/ea/loginhandler.cpp:239 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:232 +#: src/net/ea/loginhandler.cpp:242 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:238 +#: src/net/ea/loginhandler.cpp:248 msgid "Username permanently erased." msgstr "" @@ -5124,7 +5140,7 @@ msgstr "交易å–消。" msgid "Trade completed." msgstr "交易完æˆã€‚" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265 msgid "Strength" msgstr "力é‡" @@ -5133,7 +5149,7 @@ msgstr "力é‡" msgid "Strength %+.1f" msgstr "力é‡%+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266 msgid "Agility" msgstr "æ•æ·" @@ -5142,7 +5158,7 @@ msgstr "æ•æ·" msgid "Agility %+.1f" msgstr "æ•æ· %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269 msgid "Dexterity" msgstr "æ•æ·" @@ -5151,7 +5167,7 @@ msgstr "æ•æ·" msgid "Dexterity %+.1f" msgstr "çµå·§%+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267 msgid "Vitality" msgstr "生命" @@ -5160,7 +5176,7 @@ msgstr "生命" msgid "Vitality %+.1f" msgstr "活力%+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268 msgid "Intelligence" msgstr "智慧" @@ -5492,50 +5508,50 @@ msgstr "未知的连接错误。" msgid "Got disconnected from server!" msgstr "å’ŒæœåŠ¡å™¨å¤±åŽ»è¿žæŽ¥" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Luck" msgstr "幸è¿" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:273 msgid "Defense" msgstr "防御" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:275 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:277 #, no-c-format msgid "% Accuracy" msgstr "％精度" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 #, no-c-format msgid "% Evade" msgstr "ï¼…é—ªé¿" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 #, no-c-format msgid "% Critical" msgstr "ï¼…" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:282 msgid "Attack Delay" msgstr "攻击延迟" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:284 msgid "Walk Delay" msgstr "æ¥è¡Œå»¶è¿Ÿ" -#: src/net/tmwa/generalhandler.cpp:283 +#: src/net/tmwa/generalhandler.cpp:286 msgid "Attack Range" msgstr "攻击范围" -#: src/net/tmwa/generalhandler.cpp:285 +#: src/net/tmwa/generalhandler.cpp:288 msgid "Damage per sec." msgstr "æ¯ç§’伤害" @@ -5556,134 +5572,47 @@ msgstr "连接到æœåŠ¡å™¨ç»ˆæ¢ã€‚" msgid "%s is not in your party!" msgstr "%sä¸åœ¨ä½ 的帮会ä¸ï¼" -#: src/playerrelations.cpp:461 +#: src/playerrelations.cpp:479 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:525 +#: src/playerrelations.cpp:543 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:528 +#: src/playerrelations.cpp:546 msgid "Floating bubble" msgstr "æµåŠ¨çš„泡沫" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "未知怪兽" -#: src/resources/itemdb.cpp:63 +#: src/resources/itemdb.cpp:61 #, c-format msgid "Attack %+d" msgstr "攻击 %+d" -#: src/resources/itemdb.cpp:64 +#: src/resources/itemdb.cpp:62 #, c-format msgid "Defense %+d" msgstr "防御 %+d" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:169 +#: src/resources/itemdb.cpp:167 msgid "Unknown item" msgstr "未知物å“" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(I)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d281151e2..d2c003559 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -443,6 +443,8 @@ SET(SRCS resources/wallpaper.h utils/base64.cpp utils/base64.h + utils/checkutils.cpp + utils/checkutils.h utils/copynpaste.cpp utils/copynpaste.h utils/dtor.h @@ -450,8 +452,10 @@ SET(SRCS utils/mathutils.h utils/paths.cpp utils/paths.h - utils/sha256.cpp - utils/sha256.h + utils/physfsrwops.cpp + utils/physfsrwops.h + utils/process.cpp + utils/process.h utils/stringutils.cpp utils/stringutils.h utils/mutex.h @@ -459,6 +463,10 @@ SET(SRCS utils/mkdir.h utils/xml.cpp utils/xml.h + test/testlauncher.cpp + test/testlauncher.h + test/testmain.cpp + test/testmain.h actor.cpp actor.h actorsprite.cpp @@ -794,6 +802,8 @@ SET(SRCS_MANASERV enet/utility.h enet/win32.c enet/win32.h + utils/sha256.cpp + utils/sha256.h net/manaserv/attributes.cpp net/manaserv/attributes.h net/manaserv/adminhandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index fce320166..b39145c63 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -448,6 +448,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/wallpaper.h \ utils/base64.cpp \ utils/base64.h \ + utils/checkutils.cpp \ + utils/checkutils.h \ utils/copynpaste.cpp \ utils/copynpaste.h \ utils/dtor.h \ @@ -457,8 +459,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mkdir.h \ utils/paths.cpp \ utils/paths.h \ - utils/sha256.cpp \ - utils/sha256.h \ + utils/physfsrwops.cpp \ + utils/physfsrwops.h \ + utils/process.cpp \ + utils/process.h \ utils/specialfolder.cpp \ utils/specialfolder.h \ utils/stringutils.cpp \ @@ -466,6 +470,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mutex.h \ utils/xml.cpp \ utils/xml.h \ + test/testlauncher.cpp \ + test/testlauncher.h \ + test/testmain.cpp \ + test/testmain.h \ actor.cpp \ actor.h \ actorsprite.cpp \ @@ -620,6 +628,8 @@ manaplus_SOURCES += enet/callbacks.c \ enet/unix.h \ enet/utility.h \ enet/win32.h \ + utils/sha256.cpp \ + utils/sha256.h \ net/manaserv/attributes.cpp \ net/manaserv/attributes.h \ net/manaserv/adminhandler.cpp \ diff --git a/src/actor.cpp b/src/actor.cpp index 150f6042b..6a11c6e91 100644 --- a/src/actor.cpp +++ b/src/actor.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actor.h b/src/actor.h index 9afaff93d..51cba0c60 100644 --- a/src/actor.h +++ b/src/actor.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index 2a92cf506..c718c31f2 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -39,6 +39,8 @@ #include "resources/imageset.h" #include "resources/resourcemanager.h" +#include "utils/checkutils.h" + #include "debug.h" #define EFFECTS_FILE "effects.xml" @@ -70,7 +72,7 @@ ActorSprite::~ActorSprite() for (ActorSpriteListenerIterator iter = mActorSpriteListeners.begin(), e = mActorSpriteListeners.end(); iter != e; ++iter) { - if (*iter) + if (reportFalse(*iter)) (*iter)->actorSpriteDestroyed(*this); } } @@ -164,7 +166,7 @@ static EffectDescription *default_effect = nullptr; static std::map<int, EffectDescription *> effects; static bool effects_initialized = false; -static EffectDescription *getEffectDescription(xmlNodePtr node, int *id) +static EffectDescription *getEffectDescription(XmlNodePtr node, int *id) { EffectDescription *ed = new EffectDescription; @@ -180,9 +182,9 @@ static EffectDescription *getEffectDescription(int effectId) if (!effects_initialized) { XML::Document doc(EFFECTS_FILE); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) + if (!root || !xmlNameEqual(root, "being-effects")) { logger->log1("Error loading being effects file: " EFFECTS_FILE); @@ -193,13 +195,13 @@ static EffectDescription *getEffectDescription(int effectId) { int id; - if (xmlStrEqual(node->name, BAD_CAST "effect")) + if (xmlNameEqual(node, "effect")) { EffectDescription *EffectDescription = getEffectDescription(node, &id); effects[id] = EffectDescription; } - else if (xmlStrEqual(node->name, BAD_CAST "default")) + else if (xmlNameEqual(node, "default")) { EffectDescription *effectDescription = getEffectDescription(node, &id); @@ -245,7 +247,7 @@ void ActorSprite::setStatusEffectBlock(int offset, Uint16 newEffects) void ActorSprite::internalTriggerEffect(int effectId, bool sfx, bool gfx) { - if (!particleEngine) + if (reportTrue(!particleEngine)) return; if (player_node) @@ -256,13 +258,13 @@ void ActorSprite::internalTriggerEffect(int effectId, bool sfx, bool gfx) EffectDescription *ed = getEffectDescription(effectId); - if (!ed) + if (reportTrue(!ed)) { logger->log1("Unknown special effect and no default recorded"); return; } - if (gfx && !ed->mGFXEffect.empty() && particleEngine) + if (gfx && !ed->mGFXEffect.empty()) { Particle *selfFX; @@ -287,7 +289,7 @@ void ActorSprite::updateStatusEffect(int index, bool newStatus) void ActorSprite::handleStatusEffect(StatusEffect *effect, int effectId) { - if (!effect) + if (reportTrue(!effect)) return; // TODO: Find out how this is meant to be used @@ -392,7 +394,7 @@ void ActorSprite::load() void ActorSprite::unload() { - if (!loaded) + if (reportTrue(!loaded)) return; cleanupTargetCursors(); @@ -437,7 +439,7 @@ static const char *cursorSize(int size) void ActorSprite::initTargetCursor() { - static std::string targetCursorFile = "graphics/target-cursor-%s-%s.png"; + static std::string targetCursorFile = "target-cursor-%s-%s.png"; static int targetWidths[NUM_TC] = {44, 62, 82}; static int targetHeights[NUM_TC] = {35, 44, 60}; @@ -476,11 +478,11 @@ void ActorSprite::cleanupTargetCursors() void ActorSprite::loadTargetCursor(const std::string &filename, int width, int height, int type, int size) { - if (size < TC_SMALL || size >= NUM_TC) + if (reportTrue(size < TC_SMALL || size >= NUM_TC)) return; - ResourceManager *resman = ResourceManager::getInstance(); - ImageSet *currentImageSet = resman->getImageSet(filename, width, height); + ImageSet *currentImageSet = Theme::getImageSetFromTheme( + filename, width, height); if (!currentImageSet) { diff --git a/src/actorsprite.h b/src/actorsprite.h index e130269bf..29df6954c 100644 --- a/src/actorsprite.h +++ b/src/actorsprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorspritelistener.h b/src/actorspritelistener.h index 88082af20..314825fc7 100644 --- a/src/actorspritelistener.h +++ b/src/actorspritelistener.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index e0a59b349..fa6d49d38 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index 08a255621..7960c6301 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -123,7 +123,7 @@ class ActorSpriteManager: public ConfigListener */ Being *findNearestLivingBeing(int x, int y, int maxTileDist, ActorSprite::Type type = Being::UNKNOWN, - Being *excluded = 0) const; + Being *excluded = nullptr) const; /** * Returns a being nearest to another being. @@ -292,12 +292,12 @@ class ActorSpriteManager: public ConfigListener protected: bool validateBeing(Being *aroundBeing, Being* being, - Being::Type type, Being* excluded = 0, + Being::Type type, Being* excluded = nullptr, int maxCost = 20) const; Being *findNearestLivingBeing(Being *aroundBeing, int maxdist, Being::Type type, int x, int y, - Being *excluded = 0) const; + Being *excluded = nullptr) const; void loadAttackList(); void storeAttackList(); diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 5277ddf33..f4f3451cb 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 16bcdf2da..4a41eac52 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp index ef2e0a680..c1bf251af 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -33,7 +33,7 @@ AnimationParticle::AnimationParticle(Map *map, Animation *animation): { } -AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode, +AnimationParticle::AnimationParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes): ImageParticle(map, nullptr), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) diff --git a/src/animationparticle.h b/src/animationparticle.h index 984d3dc14..933f2d164 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -25,7 +25,7 @@ #include "imageparticle.h" -#include <libxml/tree.h> +#include "utils/xml.h" class Animation; class Map; @@ -36,7 +36,7 @@ class AnimationParticle : public ImageParticle public: AnimationParticle(Map *map, Animation *animation); - AnimationParticle(Map *map, xmlNodePtr animationNode, + AnimationParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); ~AnimationParticle(); diff --git a/src/auctionmanager.cpp b/src/auctionmanager.cpp index 900d47e29..9e4752e9b 100644 --- a/src/auctionmanager.cpp +++ b/src/auctionmanager.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/auctionmanager.h b/src/auctionmanager.h index bdc0497ae..35b233abf 100644 --- a/src/auctionmanager.h +++ b/src/auctionmanager.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/avatar.h b/src/avatar.h index 6c79dd96a..5ff0a8f75 100644 --- a/src/avatar.h +++ b/src/avatar.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/being.cpp b/src/being.cpp index 9e5ae3ad1..39d0bd450 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -2071,20 +2071,40 @@ void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage, int dx = static_cast<int>(static_cast<float>(width) / p); - if ((!damage && (this != player_node || hp == maxHP) && serverVersion < 1) - || (!hp && maxHP == damage)) - { - graphics->setColor(userPalette->getColorWithAlpha(color1)); - graphics->fillRectangle(gcn::Rectangle( - x, y, dx, height)); - return; + if (serverVersion < 1) + { // old servers + if ((!damage && (this != player_node || hp == maxHP)) + || (!hp && maxHP == damage)) + { + graphics->setColor(userPalette->getColorWithAlpha(color1)); + graphics->fillRectangle(gcn::Rectangle( + x, y, dx, height)); + return; + } + else if (width - dx <= 0) + { + graphics->setColor(userPalette->getColorWithAlpha(color2)); + graphics->fillRectangle(gcn::Rectangle( + x, y, width, height)); + return; + } } - else if (width - dx <= 0) - { - graphics->setColor(userPalette->getColorWithAlpha(color2)); - graphics->fillRectangle(gcn::Rectangle( - x, y, width, height)); - return; + else + { // evol servers + if (hp == maxHP) + { + graphics->setColor(userPalette->getColorWithAlpha(color1)); + graphics->fillRectangle(gcn::Rectangle( + x, y, dx, height)); + return; + } + else if (width - dx <= 0) + { + graphics->setColor(userPalette->getColorWithAlpha(color2)); + graphics->fillRectangle(gcn::Rectangle( + x, y, width, height)); + return; + } } graphics->setColor(userPalette->getColorWithAlpha(color1)); @@ -2183,6 +2203,12 @@ void Being::recalcSpritesOrder() { std::map<int, int>::const_iterator repIt = itemReplacer.find(mSpriteIDs[remSprite]); + if (repIt == itemReplacer.end()) + { + repIt = itemReplacer.find(0); + if (repIt->second == 0) + repIt = itemReplacer.end(); + } if (repIt != itemReplacer.end()) { mSpriteHide[remSprite] = repIt->second; diff --git a/src/being.h b/src/being.h index f1cae8df7..6052644c9 100644 --- a/src/being.h +++ b/src/being.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channel.cpp b/src/channel.cpp index 19859f4ef..dd52fe75d 100644 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channel.h b/src/channel.h index 078ea3a5e..559002296 100644 --- a/src/channel.h +++ b/src/channel.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp index 4ae1ebe2a..83229b454 100644 --- a/src/channelmanager.cpp +++ b/src/channelmanager.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channelmanager.h b/src/channelmanager.h index e90408032..6798bdfa8 100644 --- a/src/channelmanager.h +++ b/src/channelmanager.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp index 0299a6fe3..ad86de8e9 100644 --- a/src/chatlogger.cpp +++ b/src/chatlogger.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -142,11 +142,13 @@ std::string ChatLogger::secureName(std::string &name) const { for (unsigned int f = 0; f < name.length(); f ++) { - if (name[f] < '0' && name[f] > '9' && name[f] < 'a' && name[f] > 'z' - && name[f] < 'A' && name[f] > 'Z' + if ((name[f] < '0' || name[f] > '9') + && (name[f] < 'a' || name[f] > 'z') + && (name[f] < 'A' || name[f] > 'Z') && name[f] != '-' && name[f] != '+' && name[f] != '=' && name[f] != '.' && name[f] != ',' && name[f] != ')' - && name[f] != '(' && name[f] != '[' && name[f] != ']') + && name[f] != '(' && name[f] != '[' && name[f] != ']' + && name[f] != '#') { name[f] = '_'; } diff --git a/src/chatlogger.h b/src/chatlogger.h index 23d5d4a86..91805a8bc 100644 --- a/src/chatlogger.h +++ b/src/chatlogger.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009-2010 Andrei Karas * * This file is part of The ManaPlus Client. diff --git a/src/client.cpp b/src/client.cpp index d2b26f662..c51dffa9e 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -101,6 +101,9 @@ #include "utils/paths.h" #include "utils/stringutils.h" +#include "test/testlauncher.h" +#include "test/testmain.h" + #ifdef __APPLE__ #include <CoreFoundation/CFBundle.h> #endif @@ -259,8 +262,8 @@ Client::Client(const Options &options): mState(STATE_CHOOSE_SERVER), mOldState(STATE_START), mIcon(nullptr), - mLogicCounterId(0), - mSecondsCounterId(0), + mLogicCounterId(nullptr), + mSecondsCounterId(nullptr), mLimitFps(false), mConfigAutoSaved(false), mIsMinimized(false), @@ -269,7 +272,25 @@ Client::Client(const Options &options): mGuiAlpha(1.0f) { mInstance = this; +} +void Client::testsInit() +{ + printf ("testInit\n"); + if (!mOptions.test.empty()) + { + gameInit(); + } + else + { + logger = new Logger; + initLocalDataDir(); + initConfigDir(); + } +} + +void Client::gameInit() +{ logger = new Logger; // Load branding information @@ -591,6 +612,7 @@ Client::Client(const Options &options): { mCurrentServer.hostname = branding.getValue("defaultServer", "").c_str(); + mOptions.serverName = mCurrentServer.hostname; } if (mCurrentServer.port == 0) @@ -644,7 +666,31 @@ Client::Client(const Options &options): Client::~Client() { - logger->log1("Quitting1"); + if (!mOptions.testMode) + gameClear(); + else + testsClear(); +} + +void Client::testsClear() +{ + if (!mOptions.test.empty()) + { + gameClear(); + } + else + { + BeingInfo::clear(); + + //delete logger; + //logger = nullptr; + } +} + +void Client::gameClear() +{ + if (logger) + logger->log1("Quitting1"); config.removeListener("fpslimit", this); config.removeListener("guialpha", this); @@ -681,39 +727,45 @@ Client::~Client() player_relations.store(); - logger->log1("Quitting2"); + if (logger) + logger->log1("Quitting2"); delete gui; gui = nullptr; - logger->log1("Quitting3"); + if (logger) + logger->log1("Quitting3"); delete mainGraphics; mainGraphics = nullptr; - logger->log1("Quitting4"); + if (logger) + logger->log1("Quitting4"); - // Shutdown libxml - xmlCleanupParser(); + XML::cleanupXML(); - logger->log1("Quitting5"); + if (logger) + logger->log1("Quitting5"); BeingInfo::clear(); // Shutdown sound sound.close(); - logger->log1("Quitting6"); + if (logger) + logger->log1("Quitting6"); ActorSprite::unload(); ResourceManager::deleteInstance(); - logger->log1("Quitting8"); + if (logger) + logger->log1("Quitting8"); SDL_FreeSurface(mIcon); - logger->log1("Quitting9"); + if (logger) + logger->log1("Quitting9"); delete userPalette; userPalette = nullptr; @@ -721,7 +773,8 @@ Client::~Client() delete joystick; joystick = nullptr; - logger->log1("Quitting10"); + if (logger) + logger->log1("Quitting10"); config.write(); serverConfig.write(); @@ -729,18 +782,34 @@ Client::~Client() config.clear(); serverConfig.clear(); - logger->log1("Quitting11"); + if (logger) + logger->log1("Quitting11"); delete chatLogger; chatLogger = nullptr; - delete logger; - logger = nullptr; + //delete logger; + //logger = nullptr; mInstance = nullptr; } -int Client::exec() +int Client::testsExec() +{ + if (mOptions.test.empty()) + { + TestMain test; + return test.exec(); + } + else + { + TestLauncher launcher(mOptions.test); + return launcher.exec(); + } + return 0; +} + +int Client::gameExec() { int lastTickTime = tick_time; @@ -1481,6 +1550,12 @@ void Client::initRootDir() */ void Client::initHomeDir() { + initLocalDataDir(); + initConfigDir(); +} + +void Client::initLocalDataDir() +{ mLocalDataDir = mOptions.localDataDir; if (mLocalDataDir.empty()) @@ -1489,7 +1564,7 @@ void Client::initHomeDir() // Use Application Directory instead of .mana mLocalDataDir = std::string(PHYSFS_getUserDir()) + "/Library/Application Support/" + - branding.getValue("appName", "Mana"); + branding.getValue("appName", "ManaPlus"); #elif defined __HAIKU__ mLocalDataDir = std::string(PHYSFS_getUserDir()) + "/config/data/Mana"; @@ -1509,7 +1584,10 @@ void Client::initHomeDir() logger->error(strprintf(_("%s doesn't exist and can't be created! " "Exiting."), mLocalDataDir.c_str())); } +} +void Client::initConfigDir() +{ mConfigDir = mOptions.configDir; if (mConfigDir.empty()) @@ -1520,13 +1598,13 @@ void Client::initHomeDir() #elif defined __HAIKU__ mConfigDir = std::string(PHYSFS_getUserDir()) + "/config/settings/Mana" + - branding.getValue("appName", "Mana"); + branding.getValue("appName", "ManaPlus"); #elif defined WIN32 mConfigDir = getSpecialFolderLocation(CSIDL_APPDATA); if (mConfigDir.empty()) mConfigDir = mLocalDataDir; else - mConfigDir += "/mana/" + branding.getValue("appShort", "Mana"); + mConfigDir += "/mana/" + branding.getValue("appShort", "mana"); #else mConfigDir = std::string(PHYSFS_getUserDir()) + "/.config/mana/" + branding.getValue("appShort", "mana"); @@ -1611,6 +1689,8 @@ void Client::initConfiguration() config.setValue("musicVolume", 60); config.setValue("fpslimit", 60); std::string defaultUpdateHost = branding.getValue("defaultUpdateHost", ""); + if (!checkPath(defaultUpdateHost)) + defaultUpdateHost = ""; config.setValue("updatehost", defaultUpdateHost); config.setValue("customcursor", true); config.setValue("useScreenshotDirectorySuffix", true); @@ -1623,7 +1703,10 @@ void Client::initConfiguration() // bool oldConfig = false; // int emptySize = config.getSize(); - configPath = mConfigDir + "/config.xml"; + if (mOptions.test.empty()) + configPath = mConfigDir + "/config.xml"; + else + configPath = mConfigDir + "/test.xml"; configFile = fopen(configPath.c_str(), "r"); @@ -1660,6 +1743,8 @@ void Client::initUpdatesDir() // If updatesHost is currently empty, fill it from config file if (mUpdateHost.empty()) mUpdateHost = config.getStringValue("updatehost"); + if (!checkPath(mUpdateHost)) + return; // Don't go out of range int he next check if (mUpdateHost.length() < 2) @@ -1771,7 +1856,7 @@ void Client::initScreenshotDir() if (config.getBoolValue("useScreenshotDirectorySuffix")) { std::string configScreenshotSuffix = - branding.getValue("appShort", "Mana"); + branding.getValue("appShort", "mana"); if (!configScreenshotSuffix.empty()) { @@ -1833,7 +1918,7 @@ bool Client::createConfig(std::string &configPath) // Use Application Directory instead of .mana oldHomeDir = std::string(PHYSFS_getUserDir()) + "/Library/Application Support/" + - branding.getValue("appName", "Mana"); + branding.getValue("appName", "ManaPlus"); #else oldHomeDir = std::string(PHYSFS_getUserDir()) + "/." + branding.getValue("appShort", "mana"); @@ -2238,6 +2323,14 @@ void Client::setFramerate(int fpsLimit) SDL_setFramerate(&instance()->mFpsManager, fpsLimit); } +int Client::getFramerate() +{ + if (!instance()->mLimitFps) + return 0; + + return SDL_getFramerate(&instance()->mFpsManager); +} + void Client::closeDialogs() { Net::getNpcHandler()->clearDialogs(); diff --git a/src/client.h b/src/client.h index 3bcc5f597..27e6249bd 100644 --- a/src/client.h +++ b/src/client.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -163,6 +163,7 @@ public: chooseDefault(false), noOpenGL(false), safeMode(false), + testMode(false), serverPort(0) {} @@ -184,6 +185,8 @@ public: std::string localDataDir; std::string screenshotDir; bool safeMode; + bool testMode; + std::string test; std::string serverName; short serverPort; @@ -198,7 +201,13 @@ public: static Client *instance() { return mInstance; } - int exec(); + void gameInit(); + + void testsInit(); + + int gameExec(); + + int testsExec(); static void setState(State state) { instance()->mState = state; } @@ -256,6 +265,8 @@ public: static void setFramerate(int fpsLimit); + static int getFramerate(); + static bool isTmw(); void optionChanged(const std::string &name); @@ -278,19 +289,33 @@ public: private: void initRootDir(); + void initHomeDir(); + void initConfiguration(); + + void initLocalDataDir(); + + void initConfigDir(); + void initUpdatesDir(); + void initScreenshotDir(); + void initServerConfig(std::string serverName); bool copyFile(std::string &configPath, std::string &oldConfigPath); + bool createConfig(std::string &configPath); void accountLogin(LoginData *data); void storeSafeParameters(); + void gameClear(); + + void testsClear(); + static Client *mInstance; Options mOptions; diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 862ac56b4..0f1e60a25 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -202,6 +202,8 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab) handleServerUnIgnoreAll(args, tab); else if (type == "dumpg") handleDumpGraphics(args, tab); + else if (type == "dumpt") + handleDumpTests(args, tab); else if (tab->handleCommand(type, args)) ; else if (type == "hack") @@ -406,7 +408,6 @@ void CommandHandler::handleParty(const std::string &args, ChatTab *tab) void CommandHandler::handleMe(const std::string &args, ChatTab *tab) { - const std::string str = strprintf("*%s*", args.c_str()); outString(tab, strprintf("*%s*", args.c_str()), args); } @@ -1111,7 +1112,7 @@ void CommandHandler::handleDumpGraphics(const std::string &args A_UNUSED, str += ",0"; #endif - str += strprintf(",%f,", Client::getGuiAlpha()); + str += strprintf(",%f,", static_cast<double>(Client::getGuiAlpha())); str += config.getBoolValue("adjustPerfomance") ? "1" : "0"; str += config.getBoolValue("alphaCache") ? "1" : "0"; str += config.getBoolValue("enableMapReduce") ? "1" : "0"; @@ -1123,7 +1124,60 @@ void CommandHandler::handleDumpGraphics(const std::string &args A_UNUSED, str += config.getBoolValue("particleeffects") ? "1" : "0"; str += strprintf(",%d-%d", fps, config.getIntValue("fpslimit")); - outString(tab, str, str); + outStringNormal(tab, str, str); +} + +void CommandHandler::handleDumpTests(const std::string &args A_UNUSED, + ChatTab *tab) +{ + std::string str = config.getStringValue("testInfo"); + outStringNormal(tab, str, str); +} + +void CommandHandler::outStringNormal(ChatTab *tab, const std::string &str, + const std::string &def) +{ + if (!player_node) + return; + + if (!tab) + { + Net::getChatHandler()->talk(str); + return; + } + + switch (tab->getType()) + { + case ChatTab::TAB_PARTY: + { + Net::getPartyHandler()->chat(str); + break; + } + case ChatTab::TAB_GUILD: + { + if (!player_node) + return; + const Guild *guild = player_node->getGuild(); + if (guild) + { + if (guild->getServerGuild()) + Net::getGuildHandler()->chat(guild->getId(), str); + else if (guildManager) + guildManager->chat(str); + } + break; + } + case ChatTab::TAB_WHISPER: + { + WhisperTab *whisper = static_cast<WhisperTab*>(tab); + tab->chatLog(player_node->getName(), str); + Net::getChatHandler()->privateMessage(whisper->getNick(), str); + break; + } + default: + Net::getChatHandler()->talk(def); + break; + } } #ifdef DEBUG_DUMP_LEAKS diff --git a/src/commandhandler.h b/src/commandhandler.h index b97b191ff..16e5e94ce 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -299,9 +299,14 @@ class CommandHandler void handleDumpGraphics(const std::string &args, ChatTab *tab); + void handleDumpTests(const std::string &args, ChatTab *tab); + void outString(ChatTab *tab, const std::string &str, const std::string &def); + void outStringNormal(ChatTab *tab, const std::string &str, + const std::string &def); + void handleCacheInfo(const std::string &args, ChatTab *tab); bool parse2Int(const std::string &args, int *x, int *y); diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index 912c51404..e76a55dcf 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/compoundsprite.h b/src/compoundsprite.h index f29bece7f..1c04e44d2 100644 --- a/src/compoundsprite.h +++ b/src/compoundsprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/configlistener.h b/src/configlistener.h index bf94b1df5..e4bbbee53 100644 --- a/src/configlistener.h +++ b/src/configlistener.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/configuration.cpp b/src/configuration.cpp index b8b742f53..39e0c75d4 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -27,9 +27,6 @@ #include "utils/paths.h" #include "utils/stringutils.h" -#include "utils/xml.h" - -#include <libxml/encoding.h> #include <stdlib.h> @@ -429,13 +426,13 @@ bool Configuration::resetBoolValue(const std::string &key) return defaultValue; } -void ConfigurationObject::initFromXML(xmlNodePtr parent_node) +void ConfigurationObject::initFromXML(XmlNodePtr parent_node) { clear(); for_each_xml_child_node(node, parent_node) { - if (xmlStrEqual(node->name, BAD_CAST "list")) + if (xmlNameEqual(node, "list")) { // list option handling @@ -443,7 +440,7 @@ void ConfigurationObject::initFromXML(xmlNodePtr parent_node) for_each_xml_child_node(subnode, node) { - if (xmlStrEqual(subnode->name, BAD_CAST name.c_str()) + if (xmlNameEqual(subnode, name.c_str()) && subnode->type == XML_ELEMENT_NODE) { ConfigurationObject *cobj = new ConfigurationObject; @@ -455,7 +452,7 @@ void ConfigurationObject::initFromXML(xmlNodePtr parent_node) } } - else if (xmlStrEqual(node->name, BAD_CAST "option")) + else if (xmlNameEqual(node, "option")) { // single option handling @@ -492,9 +489,9 @@ void Configuration::init(const std::string &filename, bool useResManager) return; } - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "configuration")) + if (!rootNode || !xmlNameEqual(rootNode, "configuration")) { logger->log("Warning: No configuration file (%s)", filename.c_str()); return; @@ -503,7 +500,7 @@ void Configuration::init(const std::string &filename, bool useResManager) initFromXML(rootNode); } -void ConfigurationObject::writeToXML(xmlTextWriterPtr writer) +void ConfigurationObject::writeToXML(XmlTextWriterPtr writer) { for (Options::const_iterator i = mOptions.begin(), i_end = mOptions.end(); i != i_end; ++i) @@ -554,7 +551,7 @@ void Configuration::write() fclose(testFile); } - xmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0); + XmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0); if (!writer) { diff --git a/src/configuration.h b/src/configuration.h index 1f03b7387..00479933e 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -24,9 +24,10 @@ #define CONFIGURATION_H #include "utils/stringutils.h" -#include "defaults.h" +#include "utils/xml.h" -#include <libxml/xmlwriter.h> +#include "defaults.h" +#include "localconsts.h" #include <cassert> #include <list> @@ -158,7 +159,7 @@ class ConfigurationObject } delete nextobj; - nextobj = 0; + nextobj = nullptr; } /** @@ -192,8 +193,8 @@ class ConfigurationObject } protected: - virtual void initFromXML(xmlNodePtr node); - virtual void writeToXML(xmlTextWriterPtr writer); + virtual void initFromXML(XmlNodePtr node); + virtual void writeToXML(XmlTextWriterPtr writer); void deleteList(const std::string &name); diff --git a/src/debug.h b/src/debug.h index 00a0ec3d0..64a83e51c 100644 --- a/src/debug.h +++ b/src/debug.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -23,6 +23,19 @@ //#define DEBUG_JOYSTICK 1 #ifdef ENABLE_MEM_DEBUG + //define _DEBUG_NEW_EMULATE_MALLOC 1 #include "debug/debug_new.h" + +#define reportFalse(val) reportFalse1(val, __FILE__, __LINE__) +#define reportFalse1(val, file, line) reportFalseReal(val, file, line) + +#define reportTrue(val) reportTrue1(val, __FILE__, __LINE__) +#define reportTrue1(val, file, line) reportTrueReal(val, file, line) + +#else + +#define reportFalse(val) (val) +#define reportTrue(val) (val) + #endif diff --git a/src/defaults.cpp b/src/defaults.cpp index f18e0f432..8444fafff 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -224,6 +224,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "lang", ""); AddDEF(configData, "selectedJoystick", 0); AddDEF(configData, "useInactiveJoystick", false); + AddDEF(configData, "testInfo", ""); return configData; } @@ -233,14 +234,14 @@ DefaultsData* getBrandingDefaults() // Init config defaults AddDEF(brandingData, "wallpapersPath", ""); AddDEF(brandingData, "wallpapersFile", ""); - AddDEF(brandingData, "appName", "Mana"); - AddDEF(brandingData, "appIcon", "icons/mana.png"); + AddDEF(brandingData, "appName", "ManaPlus"); + AddDEF(brandingData, "appIcon", "icons/manaplus.png"); AddDEF(brandingData, "loginMusic", "Magick - Real.ogg"); AddDEF(brandingData, "defaultServer", ""); AddDEF(brandingData, "defaultPort", DEFAULT_PORT); AddDEF(brandingData, "defaultServerType", "tmwathena"); AddDEF(brandingData, "onlineServerList", - "http://manasource.org/serverlist.xml"); + "http://manaplus.evolonline.org/serverlist.xml"); AddDEF(brandingData, "appShort", "mana"); AddDEF(brandingData, "defaultUpdateHost", ""); AddDEF(brandingData, "helpPath", ""); diff --git a/src/defaults.h b/src/defaults.h index 8a6ec7f60..1d979e928 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 55bf692cd..de12ecaa5 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -32,9 +32,9 @@ EffectManager::EffectManager() { XML::Document doc("effects.xml"); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) + if (!root || !xmlNameEqual(root, "being-effects")) { logger->log1("Error loading being effects file: effects.xml"); return; @@ -46,7 +46,7 @@ EffectManager::EffectManager() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "effect")) + if (xmlNameEqual(node, "effect")) { EffectDescription ed; ed.id = XML::getProperty(node, "id", -1); diff --git a/src/equipment.h b/src/equipment.h index 2b6dae3ce..6e4d04c21 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/event.cpp b/src/event.cpp index 9d27a081a..4f77967bc 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/event.h b/src/event.h index 9ff02f3d0..61bf31e14 100644 --- a/src/event.h +++ b/src/event.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/flooritem.cpp b/src/flooritem.cpp index cf1ee16dc..6e4926f2e 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/flooritem.h b/src/flooritem.h index fb929268a..7e7da33a0 100644 --- a/src/flooritem.h +++ b/src/flooritem.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/game.cpp b/src/game.cpp index 9245e213d..aa9ba1536 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -216,7 +216,9 @@ static void createGuiWindows() minimap = new Minimap; helpWindow = new HelpWindow; debugWindow = new DebugWindow; - itemShortcutWindow = new ShortcutWindow("ItemShortcut", "items.xml"); + itemShortcutWindow = new ShortcutWindow( + "ItemShortcut", "items.xml", 83, 460); + for (int f = 0; f < SHORTCUT_TABS; f ++) { itemShortcutWindow->addTab(toString(f + 1), @@ -488,7 +490,7 @@ static bool saveScreenshot() filenameSuffix.str(""); filename.str(""); filename << screenshotDirectory << "/"; - filenameSuffix << branding.getValue("appShort", "ManaPlus") + filenameSuffix << branding.getValue("appName", "ManaPlus") << "_Screenshot_" << screenshotCount << ".png"; filename << filenameSuffix.str(); testExists.open(filename.str().c_str(), std::ios::in); @@ -572,6 +574,7 @@ void Game::logic() } closeDialogs(); Client::setFramerate(config.getIntValue("fpslimit")); + mNextAdjustTime = cur_time + adjustDelay; if (Client::getState() != STATE_ERROR) errorMessage = ""; } @@ -603,7 +606,10 @@ void Game::adjustPerfomance() return; } - int maxFps = config.getIntValue("fpslimit"); + int maxFps = Client::getFramerate(); + if (maxFps != config.getIntValue("fpslimit")) + return; + if (!maxFps) maxFps = 30; else if (maxFps < 10) @@ -1579,7 +1585,6 @@ void Game::handleActive(SDL_Event &event) player_node->setHalfAway(true); } } - Client::setFramerate(fpsLimit); } if (player_node) player_node->updateName(); @@ -1589,19 +1594,22 @@ void Game::handleActive(SDL_Event &event) if (event.active.state & SDL_APPMOUSEFOCUS) Client::setMouseFocused(event.active.gain); - if (player_node && player_node->getAway()) + if (!fpsLimit) { - if (Client::getInputFocused() || Client::getMouseFocused()) - fpsLimit = config.getIntValue("fpslimit"); + if (player_node && player_node->getAway()) + { + if (Client::getInputFocused() || Client::getMouseFocused()) + fpsLimit = config.getIntValue("fpslimit"); + else + fpsLimit = config.getIntValue("altfpslimit"); + } else - fpsLimit = config.getIntValue("altfpslimit"); - Client::setFramerate(fpsLimit); - } - else - { - fpsLimit = config.getIntValue("fpslimit"); - Client::setFramerate(fpsLimit); + { + fpsLimit = config.getIntValue("fpslimit"); + } } + Client::setFramerate(fpsLimit); + mNextAdjustTime = cur_time + adjustDelay; } /** diff --git a/src/game.h b/src/game.h index 4e5337d29..c6d942fe1 100644 --- a/src/game.h +++ b/src/game.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphics.cpp b/src/graphics.cpp index 47b0cae3d..bbd398aa5 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphics.h b/src/graphics.h index 2502c0418..4c47e690d 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphicsvertexes.cpp b/src/graphicsvertexes.cpp index 0e28c2b76..4a299620d 100644 --- a/src/graphicsvertexes.cpp +++ b/src/graphicsvertexes.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h index 13b7bf0c8..046bf90ce 100644 --- a/src/graphicsvertexes.h +++ b/src/graphicsvertexes.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index 759d4c245..eff4652ce 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h index 2aeb6c20c..a029f739a 100644 --- a/src/gui/beingpopup.h +++ b/src/gui/beingpopup.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp index f5e556848..c41f22de7 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/buydialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h index 6bc10a103..57f66c922 100644 --- a/src/gui/buydialog.h +++ b/src/gui/buydialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp index 2a614ed74..5aa421bad 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/buyselldialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h index 2c7e5c101..d8e4444d8 100644 --- a/src/gui/buyselldialog.h +++ b/src/gui/buyselldialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index 3c412b424..518ed3da1 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index fccb5cb1c..acbd6b55a 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index a7ebaebca..8082b8d58 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index fca8b4946..525384a09 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index d621caa96..a1233fdcc 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -124,24 +124,24 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot): mAttributesLeft = new Label( strprintf(_("Please distribute %d points"), 99)); - int w = 200; + int w = 280; int h = 330; setContentSize(w, h); - mPlayerBox->setDimension(gcn::Rectangle(80, 30, 110, 85)); + mPlayerBox->setDimension(gcn::Rectangle(145, 35, 110, 87)); mNameLabel->setPosition(5, 5); mNameField->setDimension( - gcn::Rectangle(45, 5, w - 45 - 7, mNameField->getHeight())); - mPrevHairColorButton->setPosition(90, 35); - mNextHairColorButton->setPosition(165, 35); + gcn::Rectangle(60, 5, w - 60 - 7, mNameField->getHeight())); + mPrevHairColorButton->setPosition(155, 35); + mNextHairColorButton->setPosition(230, 35); mHairColorLabel->setPosition(5, 40); - mPrevHairStyleButton->setPosition(90, 64); - mNextHairStyleButton->setPosition(165, 64); + mPrevHairStyleButton->setPosition(155, 64); + mNextHairStyleButton->setPosition(230, 64); mHairStyleLabel->setPosition(5, 70); if (serverVersion >= 2) { - mPrevRaceButton->setPosition(90, 93); - mNextRaceButton->setPosition(165, 93); + mPrevRaceButton->setPosition(155, 93); + mNextRaceButton->setPosition(230, 93); mRaceLabel->setPosition(5, 100); } @@ -365,17 +365,18 @@ void CharCreateDialog::setAttributes(const std::vector<std::string> &labels, mAttributeLabel[i] = new Label(labels[i]); mAttributeLabel[i]->setWidth(70); mAttributeLabel[i]->setPosition(5, 140 + i*20); + mAttributeLabel[i]->adjustSize(); add(mAttributeLabel[i]); mAttributeSlider[i] = new Slider(min, max); - mAttributeSlider[i]->setDimension(gcn::Rectangle(75, 140 + i * 20, + mAttributeSlider[i]->setDimension(gcn::Rectangle(140, 140 + i * 20, 100, 10)); mAttributeSlider[i]->setActionEventId("statslider"); mAttributeSlider[i]->addActionListener(this); add(mAttributeSlider[i]); mAttributeValue[i] = new Label(toString(min)); - mAttributeValue[i]->setPosition(180, 140 + i*20); + mAttributeValue[i]->setPosition(245, 140 + i*20); add(mAttributeValue[i]); } diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index c7010d6b1..e369f1777 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 401c9ae33..638691bab 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 9ebab0126..1e32fb311 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 84d61cf65..899bbdc36 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -305,6 +305,7 @@ void ChatWindow::fillCommands() mCommands.push_back("/serverignoreall"); mCommands.push_back("/serverunignoreall"); mCommands.push_back("/dumpg"); + mCommands.push_back("/dumpt"); mCommands.push_back("/pseudoaway "); mCommands.push_back("<PLAYER>"); mCommands.push_back("<MONSTER>"); @@ -419,11 +420,11 @@ void ChatWindow::prevTab() int tab = mChatTabs->getSelectedTabIndex(); - if (tab == 0) + if (tab <= 0) tab = mChatTabs->getNumberOfTabs(); tab--; - mChatTabs->setSelectedTab(tab); + mChatTabs->setSelectedTabByPos(tab); } void ChatWindow::nextTab() @@ -437,7 +438,7 @@ void ChatWindow::nextTab() if (tab == mChatTabs->getNumberOfTabs()) tab = 0; - mChatTabs->setSelectedTab(tab); + mChatTabs->setSelectedTabByPos(tab); } void ChatWindow::closeTab() @@ -459,7 +460,7 @@ void ChatWindow::closeTab() void ChatWindow::defaultTab() { if (mChatTabs) - mChatTabs->setSelectedTab(static_cast<unsigned>(0)); + mChatTabs->setSelectedTabByPos(static_cast<unsigned>(0)); } void ChatWindow::action(const gcn::ActionEvent &event) @@ -1179,7 +1180,8 @@ void ChatWindow::autoComplete() ChatTab *cTab = static_cast<ChatTab*>(mChatTabs->getSelectedTab()); std::vector<std::string> nameList; - cTab->getAutoCompleteList(nameList); + if (cTab) + cTab->getAutoCompleteList(nameList); newName = autoComplete(nameList, name); if (newName == "" && actorSpriteManager) diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 3c1195e8f..82e3d31f2 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp index 298855563..cf9d541ad 100644 --- a/src/gui/confirmdialog.cpp +++ b/src/gui/confirmdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h index 2b5febed0..421be7f96 100644 --- a/src/gui/confirmdialog.h +++ b/src/gui/confirmdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp index da98ea5ac..ba1330881 100644 --- a/src/gui/connectiondialog.cpp +++ b/src/gui/connectiondialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h index 7c0b59faf..76d8a952b 100644 --- a/src/gui/connectiondialog.h +++ b/src/gui/connectiondialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 56a63c72d..d13545bea 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index b955209a5..ff86eaf74 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index b5a7da634..db0878360 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h index d9734e8fe..f3fb61c70 100644 --- a/src/gui/didyouknowwindow.h +++ b/src/gui/didyouknowwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp index a8c92ed47..a286f78e8 100644 --- a/src/gui/emotepopup.cpp +++ b/src/gui/emotepopup.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/emotepopup.h b/src/gui/emotepopup.h index a80562fea..453c4e669 100644 --- a/src/gui/emotepopup.h +++ b/src/gui/emotepopup.h @@ -3,7 +3,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index cb3ace0c7..275bf19bb 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -65,7 +65,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being, mEquipment(equipment), mSelected(-1), mForing(foring), - mImageSet(0) + mImageSet(nullptr) { mBeing = being; mItemPopup = new ItemPopup; @@ -355,7 +355,7 @@ void EquipmentWindow::resetBeing(Being *being) void EquipmentWindow::fillBoxes() { XML::Document *doc = new XML::Document("equipmentwindow.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); if (!root) { delete doc; @@ -371,23 +371,23 @@ void EquipmentWindow::fillBoxes() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "window")) + if (xmlNameEqual(node, "window")) loadWindow(node); - else if (xmlStrEqual(node->name, BAD_CAST "playerbox")) + else if (xmlNameEqual(node, "playerbox")) loadPlayerBox(node); - else if (xmlStrEqual(node->name, BAD_CAST "slot")) + else if (xmlNameEqual(node, "slot")) loadSlot(node, mImageSet); } delete doc; } -void EquipmentWindow::loadWindow(xmlNodePtr windowNode) +void EquipmentWindow::loadWindow(XmlNodePtr windowNode) { setDefaultSize(XML::getProperty(windowNode, "width", 180), XML::getProperty(windowNode, "height", 345), ImageRect::CENTER); } -void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode) +void EquipmentWindow::loadPlayerBox(XmlNodePtr playerBoxNode) { mPlayerBox->setDimension(gcn::Rectangle( XML::getProperty(playerBoxNode, "x", 50), @@ -396,7 +396,7 @@ void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode) XML::getProperty(playerBoxNode, "height", 168))); } -void EquipmentWindow::loadSlot(xmlNodePtr slotNode, ImageSet *imageset) +void EquipmentWindow::loadSlot(XmlNodePtr slotNode, ImageSet *imageset) { int slot = parseSlotName(XML::getProperty(slotNode, "name", "")); if (slot < 0) diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 0a3c2da20..daeaeb3d7 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -85,7 +85,7 @@ class EquipmentWindow : public Window, public gcn::ActionListener void mousePressed(gcn::MouseEvent& mouseEvent); Item* getEquipment(int i) - { return mEquipment ? mEquipment->getEquipment(i) : 0; } + { return mEquipment ? mEquipment->getEquipment(i) : nullptr; } void setBeing(Being *being); @@ -108,11 +108,11 @@ class EquipmentWindow : public Window, public gcn::ActionListener void addBox(int idx, int x, int y, int imageIndex); - void loadWindow(xmlNodePtr windowNode); + void loadWindow(XmlNodePtr windowNode); - void loadPlayerBox(xmlNodePtr playerBoxNode); + void loadPlayerBox(XmlNodePtr playerBoxNode); - void loadSlot(xmlNodePtr slotNode, ImageSet *imageset); + void loadSlot(XmlNodePtr slotNode, ImageSet *imageset); int parseSlotName(std::string name); diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp index 40fa2f4ed..0e98c3473 100644 --- a/src/gui/focushandler.cpp +++ b/src/gui/focushandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 9d814bb69..064f04697 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index b3154fb25..3d79f0cdf 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -105,14 +105,14 @@ Gui::Gui(Graphics *graphics): Window::setWindowContainer(guiTop); setTop(guiTop); + const std::vector<std::string> langs = getLang(); + const bool isJapan = (!langs.empty() && langs[0].size() > 3 + && langs[0].substr(0, 3) == "ja_"); + // Set global font const int fontSize = config.getIntValue("fontSize"); - std::string fontFile = config.getValue("font", ""); - - std::vector<std::string> langs = getLang(); - if (!langs.empty() && langs[0].size() > 3 - && langs[0].substr(0, 3) == "ja_") + if (isJapan) { fontFile = config.getValue("japanFont", ""); if (fontFile.empty()) @@ -134,6 +134,15 @@ Gui::Gui(Graphics *graphics): // Set particle font fontFile = config.getValue("particleFont", ""); + + if (isJapan) + { + fontFile = config.getValue("japanFont", ""); + if (fontFile.empty()) + fontFile = branding.getStringValue("japanFont"); + } + + if (fontFile.empty()) fontFile = branding.getStringValue("particleFont"); diff --git a/src/gui/gui.h b/src/gui/gui.h index 578202b17..cadcc89ac 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index b1175d709..a099c7a7a 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h index 178ae1e16..a6d83e91d 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/helpwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 8ffebebff..01e2bdd17 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -98,7 +98,7 @@ InventoryWindow::WindowList InventoryWindow::instances; InventoryWindow::InventoryWindow(Inventory *inventory): Window("Inventory", false, nullptr, "inventory.xml"), mInventory(inventory), - mDropButton(0), + mDropButton(nullptr), mSplit(false), mCompactMode(false) { diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index aa78705b8..2b35ec9c4 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -128,7 +128,7 @@ class InventoryWindow : public Window, void processEvent(Mana::Channels channel, const Mana::Event &event); - void updateButtons(Item *item = 0); + void updateButtons(Item *item = nullptr); bool isInputFocused() const; diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp index a80434ac0..9e2a97681 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/itemamountwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h index bacd4cfd0..076101c0f 100644 --- a/src/gui/itemamountwindow.h +++ b/src/gui/itemamountwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 2e87cd544..9a9e5f50d 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 66d7e91a2..89f6355fe 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index fa6241ef6..972c660ec 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -70,8 +70,8 @@ KillStats::KillStats(): xpNextLevel = 1; mLine1 = new Label(strprintf(_("Level: %d at %f%%"), - player_node->getLevel(), static_cast<float>(xp) - / static_cast<float>(xpNextLevel) * 100.0f)); + player_node->getLevel(), static_cast<double>(xp) + / static_cast<double>(xpNextLevel) * 100.0)); mLine2 = new Label(strprintf(_("Exp: %d/%d Left: %d"), xp, xpNextLevel, xpNextLevel - xp)); @@ -206,9 +206,9 @@ void KillStats::gainXp(int xp) timeDiff = 1; mLine1->setCaption(strprintf(_("Level: %d at %f%%"), - player_node->getLevel(), static_cast<float>( - PlayerInfo::getAttribute(EXP)) / static_cast<float>( - xpNextLevel) * 100.0f)); + player_node->getLevel(), static_cast<double>( + PlayerInfo::getAttribute(EXP)) / static_cast<double>( + xpNextLevel) * 100.0)); mLine2->setCaption(strprintf(_("Exp: %d/%d Left: %d"), PlayerInfo::getAttribute(EXP), xpNextLevel, diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index 86b3dc28b..b1c80b102 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -184,8 +184,16 @@ void LoginDialog::action(const gcn::ActionEvent &event) serverConfig.setValue("customUpdateHost", mUpdateHostText->getText()); - mLoginData->updateHost = mUpdateHostText->getText(); - *mUpdateHost = mUpdateHostText->getText(); + if (checkPath(mUpdateHostText->getText())) + { + mLoginData->updateHost = mUpdateHostText->getText(); + *mUpdateHost = mUpdateHostText->getText(); + } + else + { + mLoginData->updateHost = ""; + *mUpdateHost = ""; + } } mLoginData->updateType = updateType; serverConfig.setValue("updateType", updateType); diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h index 0696bc680..08799b1c2 100644 --- a/src/gui/logindialog.h +++ b/src/gui/logindialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index d890a462f..74da37341 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/minimap.h b/src/gui/minimap.h index 86996f51c..8b7da5849 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index 665d2b61b..00df97813 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -188,7 +188,7 @@ void MiniStatusWindow::updateBars() void MiniStatusWindow::setIcon(int index, AnimatedSprite *sprite) { if (index >= static_cast<int>(mIcons.size())) - mIcons.resize(index + 1, 0); + mIcons.resize(index + 1, nullptr); delete mIcons[index]; diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index 6fb8f7652..ca18e1b92 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 66a30c8a7..eadd99c21 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -26,6 +26,7 @@ #include "client.h" #include "gui/setup.h" +#include "gui/viewport.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" @@ -48,7 +49,7 @@ #include "debug.h" -#define CAPTION_WAITING _("Waiting for server") +#define CAPTION_WAITING _("Stop waiting") #define CAPTION_NEXT _("Next") #define CAPTION_CLOSE _("Close") #define CAPTION_SUBMIT _("Submit") @@ -62,7 +63,10 @@ NpcDialog::NpcDialog(int npcId) : mDefaultInt(0), mInputState(NPC_INPUT_NONE), mActionState(NPC_ACTION_WAIT), - mLastNextTime(0) + mLastNextTime(0), + mCameraMode(-1), + mCameraX(0), + mCameraY(0) { // Basic Window Setup setWindowName("NpcText"); @@ -220,9 +224,9 @@ void NpcDialog::action(const gcn::ActionEvent &event) return; nextDialog(); - addText(_("> Next"), false); } - else if (mActionState == NPC_ACTION_CLOSE) + else if (mActionState == NPC_ACTION_CLOSE + || mActionState == NPC_ACTION_WAIT) { closeDialog(); } @@ -301,6 +305,7 @@ void NpcDialog::nextDialog() void NpcDialog::closeDialog() { + restoreCamera(); Net::getNpcHandler()->closeDialog(mNpcId); } @@ -501,9 +506,37 @@ void NpcDialog::buildLayout() Layout &layout = getLayout(); layout.setRowHeight(0, Layout::AUTO_SET); - mButton->setEnabled(mActionState != NPC_ACTION_WAIT); - redraw(); mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll()); -}
\ No newline at end of file +} + +void NpcDialog::saveCamera() +{ + if (!viewport || mCameraMode >= 0) + return; + + mCameraMode = viewport->getCameraMode(); + mCameraX = viewport->getCameraRelativeX(); + mCameraY = viewport->getCameraRelativeY(); +} + +void NpcDialog::restoreCamera() +{ + if (!viewport || mCameraMode == -1) + return; + + if (!mCameraMode) + { + if (viewport->getCameraMode() != mCameraMode) + viewport->toggleCameraMode(); + } + else + { + if (viewport->getCameraMode() != mCameraMode) + viewport->toggleCameraMode(); + viewport->setCameraRelativeX(mCameraX); + viewport->setCameraRelativeY(mCameraY); + } + mCameraMode = -1; +} diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index 7e9ea7e10..4d919a3f2 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -172,6 +172,10 @@ class NpcDialog : public Window, public gcn::ActionListener, */ static void destroyAll(); + void saveCamera(); + + void restoreCamera(); + private: typedef std::list<NpcDialog*> DialogList; static DialogList instances; @@ -230,6 +234,9 @@ class NpcDialog : public Window, public gcn::ActionListener, NpcInputState mInputState; NpcActionState mActionState; int mLastNextTime; + int mCameraMode; + int mCameraX; + int mCameraY; }; #endif // NPCDIALOG_H diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index ada48e832..6bcb62baf 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h index bc329096b..b00f7bda0 100644 --- a/src/gui/npcpostdialog.h +++ b/src/gui/npcpostdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp index 5a6ee4846..4a3bdf731 100644 --- a/src/gui/okdialog.cpp +++ b/src/gui/okdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h index 2f32d0d65..5705be568 100644 --- a/src/gui/okdialog.h +++ b/src/gui/okdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index c33c753bc..74e8dbe46 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -985,3 +985,12 @@ void OutfitWindow::setItemSelected(Item *item) mItemColorSelected = 1; } } + +void OutfitWindow::clearCurrentOutfit() +{ + for (unsigned f = 0; f < OUTFIT_ITEM_COUNT; f++) + { + mItems[mCurrentOutfit][f] = -1; + mItemColors[mCurrentOutfit][f] = 1; + } +} diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h index 8dd5fd6a3..b2b46c7e7 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/outfitwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -108,6 +108,8 @@ class OutfitWindow : public Window, gcn::ActionListener std::string keyName(int number) A_PURE; + void clearCurrentOutfit(); + private: Button *mPreviousButton; Button *mNextButton; diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index 348f97de8..fe14cd2d4 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/palette.h b/src/gui/palette.h index d46a3c57c..36d87e305 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 15afc7600..cd3a4c5ad 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -85,7 +85,7 @@ std::string tradePartnerName(""); PopupMenu::PopupMenu(): Popup("PopupMenu", "popupmenu.xml"), mBeingId(0), - mFloorItem(nullptr), + mFloorItemId(0), mItem(nullptr), mItemId(0), mItemColor(1), @@ -367,7 +367,7 @@ void PopupMenu::showPopup(int x, int y, std::vector<ActorSprite*> &beings) being->getId(), (being->getName() + being->getGenderSignWithSpace()).c_str())); } - else if(actor->getType() == ActorSprite::FLOOR_ITEM) + else if (actor->getType() == ActorSprite::FLOOR_ITEM) { FloorItem *floorItem = static_cast<FloorItem*>(actor); const ItemInfo &info = floorItem->getInfo(); @@ -529,7 +529,7 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem) if (!floorItem) return; - mFloorItem = floorItem; + mFloorItemId = floorItem->getId(); mX = x; mY = y; const ItemInfo &info = floorItem->getInfo(); @@ -586,7 +586,7 @@ void PopupMenu::showOutfitsPopup(int x, int y) mBrowserBox->clearRows(); mBrowserBox->addRow(_("Outfits")); - mBrowserBox->addRow("load old outfits", _("Load old outfits")); + mBrowserBox->addRow("clear outfit", _("Clear outfit")); mBrowserBox->addRow("##3---"); mBrowserBox->addRow("cancel", _("Cancel")); @@ -871,7 +871,7 @@ void PopupMenu::showChangePos(int x, int y) else { mBeingId = 0; - mFloorItem = nullptr; + mFloorItemId = 0; mItem = nullptr; mMapItem = nullptr; mNick = ""; @@ -1038,10 +1038,14 @@ void PopupMenu::handleLink(const std::string &link, player_node->setImitate(mNick); } // Pick Up Floor Item action - else if ((link == "pickup") && mFloorItem) + else if ((link == "pickup") && mFloorItemId) { - if (player_node) - player_node->pickUp(mFloorItem); + if (player_node && actorSpriteManager) + { + FloorItem *item = actorSpriteManager->findItem(mFloorItemId); + if (item) + player_node->pickUp(item); + } } // Look To action else if (link == "look") @@ -1106,16 +1110,21 @@ void PopupMenu::handleLink(const std::string &link, chatWindow->addItemText(mItem->getInfo().getName()); } } - else if (mFloorItem) + else if (mFloorItemId && actorSpriteManager) { - if (serverVersion > 0) - { - chatWindow->addItemText(mFloorItem->getInfo().getName( - mFloorItem->getColor())); - } - else + FloorItem *item = actorSpriteManager->findItem(mFloorItemId); + + if (item) { - chatWindow->addItemText(mFloorItem->getInfo().getName()); + if (serverVersion > 0) + { + chatWindow->addItemText(item->getInfo().getName( + item->getColor())); + } + else + { + chatWindow->addItemText(item->getInfo().getName()); + } } } } @@ -1331,11 +1340,6 @@ void PopupMenu::handleLink(const std::string &link, mDialog->setActionEventId("ok"); mDialog->addActionListener(&mRenameListener); } - else if (link == "load old outfits") - { - if (outfitWindow) - outfitWindow->load(true); - } else if (link == "load old spells") { if (spellManager) @@ -1673,6 +1677,11 @@ void PopupMenu::handleLink(const std::string &link, showChangePos(getX(), getY()); return; } + else if (link == "clear outfit") + { + if (outfitWindow) + outfitWindow->clearCurrentOutfit(); + } else if (!link.compare(0, 10, "guild-pos-")) { if (player_node) @@ -1706,10 +1715,11 @@ void PopupMenu::handleLink(const std::string &link, int id = atoi(link.substr(10).c_str()); if (id) { - mFloorItem = actorSpriteManager->findItem(id); - if (mFloorItem) + FloorItem *item = actorSpriteManager->findItem(id); + if (item) { - showPopup(getX(), getY(), mFloorItem); + mFloorItemId = item->getId(); + showPopup(getX(), getY(), item); return; } } @@ -1744,7 +1754,7 @@ void PopupMenu::handleLink(const std::string &link, setVisible(false); mBeingId = 0; - mFloorItem = nullptr; + mFloorItemId = 0; mItem = nullptr; mItemId = 0; mItemColor = 1; diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 2db565ab7..8b9107300 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -160,7 +160,7 @@ class PopupMenu : public Popup, public LinkHandler BrowserBox* mBrowserBox; int mBeingId; - FloorItem* mFloorItem; + int mFloorItemId; Item *mItem; int mItemId; unsigned char mItemColor; diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index 450cfd86e..dff5a570c 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index 5456be26b..dd881d283 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 29030aa72..2122e0d6b 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/register.h b/src/gui/register.h index b0137f141..ecda27d28 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 001a8671a..0e69db026 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2009 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index e0aac7785..6fcad34d4 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 7c5ddb055..e8660f861 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -8,7 +8,7 @@ * * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson * Copyright (C) 2007-2010 The Mana World Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * Js_./ * Per Larsson a.k.a finalman _RqZ{a<^_aa diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp index e1a77f6c9..0e1b16de7 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/selldialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index a775cf0e0..877b74cd8 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 3fd298159..39ff19a89 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -365,7 +365,7 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir): mConnectButton->requestFocus(); } - loadServers(false); + loadServers(true); if (mServers.empty()) downloadServerList(); @@ -558,7 +558,7 @@ void ServerDialog::logic() else if (mDownloadStatus == DOWNLOADING_IN_PROGRESS) { mDescription->setCaption(strprintf(_("Downloading server list..." - "%2.2f%%"), mDownloadProgress * 100)); + "%2.2f%%"), static_cast<double>(mDownloadProgress * 100))); } else if (mDownloadStatus == DOWNLOADING_IDLE) { @@ -609,9 +609,12 @@ void ServerDialog::downloadServerList() if (listFile.empty()) listFile = config.getStringValue("onlineServerList"); - // Fall back to manasource.org when neither branding nor config set it + // Fall back to manaplus.evolonline.org when neither branding nor config set it if (listFile.empty()) - listFile = "http://manasource.org/serverlist.xml"; + { + listFile = "http://manaplus.evolonline.org/" + "serverlist.xml/serverlist.xml"; + } if (mDownload) { @@ -628,9 +631,9 @@ void ServerDialog::downloadServerList() void ServerDialog::loadServers(bool addNew) { XML::Document doc(mDir + "/serverlist.xml", false); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "serverlist")) + if (!rootNode || !xmlNameEqual(rootNode, "serverlist")) { logger->log1("Error loading server list!"); return; @@ -646,7 +649,7 @@ void ServerDialog::loadServers(bool addNew) for_each_xml_child_node(serverNode, rootNode) { - if (!xmlStrEqual(serverNode->name, BAD_CAST "server")) + if (!xmlNameEqual(serverNode, "server")) continue; ServerInfo server; @@ -681,7 +684,7 @@ void ServerDialog::loadServers(bool addNew) for_each_xml_child_node(subNode, serverNode) { - if (xmlStrEqual(subNode->name, BAD_CAST "connection")) + if (xmlNameEqual(subNode, "connection")) { server.hostname = XML::getProperty(subNode, "hostname", ""); server.port = static_cast<short unsigned>( @@ -693,7 +696,7 @@ void ServerDialog::loadServers(bool addNew) server.port = defaultPortForServerType(server.type); } } - else if (xmlStrEqual(subNode->name, BAD_CAST "description")) + else if (xmlNameEqual(subNode, "description")) { server.description = reinterpret_cast<const char*>( subNode->xmlChildrenNode->content); diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h index 39c6f94f7..d2fe0d25b 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/serverdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index d305824d5..bac474950 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -201,7 +201,7 @@ void Setup::doCancel() void Setup::activateTab(const std::string &name) { std::string tmp = gettext(name.c_str()); - mPanel->setSelectedTab(tmp); + mPanel->setSelectedTabByName(tmp); /* for (std::list<SetupTab*>::const_iterator it = mTabs.begin(); it != mTabs.end(); ++it) @@ -212,7 +212,7 @@ void Setup::activateTab(const std::string &name) logger->log("check tab: " + tab->getName()); if (tab->getName() == tmp) { - mPanel->setSelectedTab(name); + mPanel->setSelectedTabByName(name); return; } } diff --git a/src/gui/setup.h b/src/gui/setup.h index b499da4ee..3a6f66297 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index 1737e9004..bc058faf9 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 53aa017b6..88869d730 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp index 1b8209c8f..7e81acaa9 100644 --- a/src/gui/setup_chat.cpp +++ b/src/gui/setup_chat.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h index 402235d99..238021cca 100644 --- a/src/gui/setup_chat.h +++ b/src/gui/setup_chat.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 6f1a4afce..d5885143c 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -1,7 +1,7 @@ /* * Configurable text colors * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h index b6d5209e2..cbcca6dfa 100644 --- a/src/gui/setup_colors.h +++ b/src/gui/setup_colors.h @@ -1,7 +1,7 @@ /* * Configurable text colors * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 7899247e3..290607be4 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index 5bd72cdad..d93d7e821 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index fa7a63b8c..bdd7c2083 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au> * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp index bd445cfa0..d6f5e9972 100644 --- a/src/gui/setup_other.cpp +++ b/src/gui/setup_other.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h index a13bf4ba3..4144a02ab 100644 --- a/src/gui/setup_other.h +++ b/src/gui/setup_other.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp index dd634d1f3..95703fa4c 100644 --- a/src/gui/setup_perfomance.cpp +++ b/src/gui/setup_perfomance.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h index f355c9691..097c1e28c 100644 --- a/src/gui/setup_perfomance.h +++ b/src/gui/setup_perfomance.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index a6bf5b81c..f0bf4c0ea 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index c9ce7b3b3..ebfc78db6 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 8ac61f90c..9ddef9e1a 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index 2c23d4dba..76ea26875 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 794fd3324..259388fd0 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 509deb2fd..0c82ab272 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp index a50a485ec..b6b87edb7 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/shopwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index e1fd8a2a0..53ed7690c 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index eff28def7..0e968efef 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -23,6 +23,7 @@ #include "gui/shortcutwindow.h" #include "configuration.h" +#include "logger.h" #include "gui/setup.h" @@ -58,12 +59,15 @@ ShortcutWindow::ShortcutWindow(const std::string &title, { setWindowName(title); // no title presented, title bar is padding so window can be moved. - gcn::Window::setTitleBarHeight(gcn::Window::getPadding()); + gcn::Window::setTitleBarHeight(gcn::Window::getPadding() + 1); setShowTitle(false); setResizable(true); setDefaultVisible(false); setSaveVisible(true); + mDragOffsetX = 0; + mDragOffsetY = 0; + setupWindow->registerWindowForReset(this); mTabs = nullptr; @@ -104,12 +108,15 @@ ShortcutWindow::ShortcutWindow(const std::string &title, std::string skinFile, { setWindowName(title); // no title presented, title bar is padding so window can be moved. - gcn::Window::setTitleBarHeight(gcn::Window::getPadding()); + gcn::Window::setTitleBarHeight(gcn::Window::getPadding() + 1); setShowTitle(false); setResizable(true); setDefaultVisible(false); setSaveVisible(true); + mDragOffsetX = 0; + mDragOffsetY = 0; + setupWindow->registerWindowForReset(this); mTabs = new TabbedArea; @@ -178,3 +185,34 @@ void ShortcutWindow::widgetHidden(const gcn::Event &event) } } } + +void ShortcutWindow::mousePressed(gcn::MouseEvent &event) +{ + Window::mousePressed(event); + + if (event.isConsumed()) + return; + + if (event.getButton() == gcn::MouseEvent::LEFT) + { + mDragOffsetX = event.getX(); + mDragOffsetY = event.getY(); + } +} + +void ShortcutWindow::mouseDragged(gcn::MouseEvent &event) +{ + Window::mouseDragged(event); + + if (event.isConsumed()) + return; + + if (canMove() && isMovable() && mMoved) + { + int newX = std::max(0, getX() + event.getX() - mDragOffsetX); + int newY = std::max(0, getY() + event.getY() - mDragOffsetY); + newX = std::min(mainGraphics->mWidth - getWidth(), newX); + newY = std::min(mainGraphics->mHeight - getHeight(), newY); + setPosition(newX, newY); + } +} diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index 8627a5dce..bdff5ab0d 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -58,6 +58,10 @@ class ShortcutWindow : public Window void widgetHidden(const gcn::Event &event); + void mousePressed(gcn::MouseEvent &event); + + void mouseDragged(gcn::MouseEvent &event); + private: ShortcutWindow(); ShortcutContainer *mItems; diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 072a9cb85..4ee674325 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -362,7 +362,7 @@ void SkillDialog::loadSkills(const std::string &file) return; XML::Document doc(file); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); int setCount = 0; std::string setName; @@ -370,7 +370,7 @@ void SkillDialog::loadSkills(const std::string &file) SkillListBox *listbox; SkillTab *tab; - if (!root || !xmlStrEqual(root->name, BAD_CAST "skills")) + if (!root || !xmlNameEqual(root, "skills")) { logger->log("Error loading skills file: %s", file.c_str()); @@ -413,7 +413,7 @@ void SkillDialog::loadSkills(const std::string &file) for_each_xml_child_node(set, root) { - if (xmlStrEqual(set->name, BAD_CAST "set")) + if (xmlNameEqual(set, "set")) { setCount++; setName = XML::getProperty(set, "name", @@ -425,7 +425,7 @@ void SkillDialog::loadSkills(const std::string &file) for_each_xml_child_node(node, set) { - if (xmlStrEqual(node->name, BAD_CAST "skill")) + if (xmlNameEqual(node, "skill")) { int id = atoi(XML::getProperty(node, "id", "-1").c_str()); std::string name = XML::getProperty(node, "name", diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 63f7d1790..dcb40927a 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 2bc8aba9b..a1a6c1cee 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -29,6 +29,8 @@ #include "logger.h" #include "map.h" #include "party.h" +#include "playerrelations.h" +#include "gui/whoisonline.h" #include "gui/confirmdialog.h" #include "gui/okdialog.h" @@ -60,6 +62,30 @@ #include "debug.h" +class SortFriendsFunctor +{ + public: + bool operator() (Avatar* m1, Avatar* m2) + { + if (!m1 || !m2) + return false; + + if (m1->getOnline() != m2->getOnline()) + return m1->getOnline() > m2->getOnline(); + + if (m1->getName() != m2->getName()) + { + std::string s1 = m1->getName(); + std::string s2 = m2->getName(); + toLower(s1); + toLower(s2); + return s1 < s2; + } + return false; + } +} friendSorter; + + class SocialTab : public Tab { protected: @@ -457,7 +483,6 @@ public: mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); -// mBeings->getMembers().push_back(new Avatar("test")); updateList(); setCaption(name); } @@ -550,7 +575,6 @@ public: if (actorSpriteManager) { -// std::list<Being*> beings = actorSpriteManager->getAll(); std::vector<std::string> names; actorSpriteManager->getPlayerNames(names, false); @@ -650,7 +674,7 @@ public: return; Map* map = socialWindow->getMap(); - if (!map) + if (!map || map->empty()) return; if (socialWindow->getProcessedPortals()) @@ -848,11 +872,11 @@ public: std::vector<Avatar*> *avatars = mBeings->getMembers(); - std::vector<Avatar*>::iterator i = avatars->begin(); - if (!avatars) return; + std::vector<Avatar*>::iterator i = avatars->begin(); + while (i != avatars->end()) { Avatar *ava = (*i); @@ -1058,6 +1082,103 @@ private: }; + +class SocialFriendsTab : public SocialTab +{ +public: + SocialFriendsTab(std::string name) + { + mBeings = new BeingsListModal(); + + mList = new AvatarListBox(mBeings); + mScroll = new ScrollArea(mList); + + mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + + updateList(); + setCaption(name); + } + + ~SocialFriendsTab() + { + delete mList; + mList = nullptr; + delete mScroll; + mScroll = nullptr; + delete mBeings; + mBeings = nullptr; + } + + void updateList() + { + getPlayersAvatars(); + } + + void updateAvatar(std::string name A_UNUSED) + { + } + + void resetDamage(std::string name A_UNUSED) + { + } + + void getPlayersAvatars() + { + if (!actorSpriteManager) + return; + + std::vector<Avatar*> *avatars = mBeings->getMembers(); + if (!avatars) + return; + + std::vector<Avatar*>::iterator ia = avatars->begin(); + while (ia != avatars->end()) + { + delete *ia; + ++ ia; + } + avatars->clear(); + + std::vector<std::string> *players + = player_relations.getPlayersByRelation(PlayerRelation::FRIEND); + + std::set<std::string> players2 = whoIsOnline->getOnlinePlayers(); + + if (!players) + return; + + std::vector<std::string>::iterator it = players->begin(); + std::vector<std::string>::iterator it_end = players->end(); + for (; it != it_end; ++ it) + { + Avatar *ava = nullptr; + ava = new Avatar(*it); + if (actorSpriteManager->findBeingByName(*it, Being::PLAYER) + || players2.find(*it) != players2.end()) + { + ava->setOnline(true); + } + avatars->push_back(ava); + } + std::sort(avatars->begin(), avatars->end(), friendSorter); + delete players; + } + +protected: + void invite() + { + } + + void leave() + { + } + +private: + BeingsListModal *mBeings; +}; + + class CreatePopup : public Popup, public LinkHandler { public: @@ -1152,9 +1273,14 @@ SocialWindow::SocialWindow() : loadWindowState(); - mPlayers = new SocialPlayersTab("P"); + // TRANSLATORS: here P is title for visible players tab in social window + mPlayers = new SocialPlayersTab(_("P")); mTabs->addTab(mPlayers, mPlayers->mScroll); + // TRANSLATORS: here F is title for friends tab in social window + mFriends = new SocialFriendsTab(_("F")); + mTabs->addTab(mFriends, mFriends->mScroll); + mNavigation = new SocialNavigationTab(); mTabs->addTab(mNavigation, mNavigation->mScroll); @@ -1205,6 +1331,8 @@ SocialWindow::~SocialWindow() mNavigation = nullptr; delete mAttackFilter; mAttackFilter = nullptr; + delete mFriends; + mFriends = nullptr; } bool SocialWindow::addTab(Guild *guild) @@ -1523,6 +1651,7 @@ void SocialWindow::logic() if (mNeedUpdate && nowTime - mLastUpdateTime > 1) { mPlayers->updateList(); + mFriends->updateList(); mNeedUpdate = false; mLastUpdateTime = nowTime; } @@ -1610,7 +1739,7 @@ void SocialWindow::nextTab() if (tab == mTabs->getNumberOfTabs()) tab = 0; - mTabs->setSelectedTab(tab); + mTabs->setSelectedTabByPos(tab); } void SocialWindow::prevTab() @@ -1624,7 +1753,7 @@ void SocialWindow::prevTab() tab = mTabs->getNumberOfTabs(); tab--; - mTabs->setSelectedTab(tab); + mTabs->setSelectedTabByPos(tab); } void SocialWindow::updateAttackFilter() diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index dec8a6c26..1429866ee 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -141,6 +141,7 @@ protected: SocialTab *mAttackFilter; SocialTab *mPlayers; SocialTab *mNavigation; + SocialTab *mFriends; CreatePopup *mCreatePopup; diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp index 6abff3796..4dd53cee1 100644 --- a/src/gui/specialswindow.cpp +++ b/src/gui/specialswindow.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h index 4350a656b..a7eeeb5d5 100644 --- a/src/gui/specialswindow.h +++ b/src/gui/specialswindow.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 7356cc633..877715137 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 170f619e8..5342bd49e 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 5ac14d132..a5fd12d40 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -431,10 +431,20 @@ void StatusWindow::addAttribute(int id, const std::string &name, disp = new DerDisplay(id, name); mDAttrCont->add(disp); } - mAttrs[id] = disp; } +void StatusWindow::clearAttributes() +{ + mAttrCont->clear(); + mDAttrCont->clear(); + Attrs::iterator it = mAttrs.begin(); + Attrs::iterator it_end = mAttrs.end(); + for (; it != it_end; ++ it) + delete (*it).second; + mAttrs.clear(); +} + void StatusWindow::updateHPBar(ProgressBar *bar, bool showMax) { if (!bar) @@ -512,9 +522,14 @@ void StatusWindow::updateProgressBar(ProgressBar *bar, int value, int max, / static_cast<float>(max); if (percent) - bar->setText(strprintf("%2.5f", 100 * progress) + "%"); + { + bar->setText(strprintf("%2.5f%%", + static_cast<double>(100 * progress))); + } else + { bar->setText(toString(value) + "/" + toString(max)); + } bar->setProgress(progress); } diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index d3a619bcb..8e110a354 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -75,6 +75,8 @@ class StatusWindow : public Window, void action(const gcn::ActionEvent &event); + void clearAttributes(); + private: static std::string translateLetter(const char* letters); diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp index a32b13aa4..b30c9eb82 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/textdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h index aed26c1e9..03deae8f6 100644 --- a/src/gui/textdialog.h +++ b/src/gui/textdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -44,7 +44,7 @@ public: * @see Window::Window */ TextDialog(const std::string &title, const std::string &msg, - Window *parent = 0, bool isPassword = false); + Window *parent = nullptr, bool isPassword = false); ~TextDialog(); diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index 15b2618da..8cdbfa430 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h index 9ac041389..6f418152c 100644 --- a/src/gui/textpopup.h +++ b/src/gui/textpopup.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index b3b28bffa..85fd215ac 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -315,9 +315,9 @@ Skin *Theme::readSkin(const std::string &filename) // filename = resman->mapPathToSkin(filename0); XML::Document doc(resolveThemePath(filename)); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset")) + if (!rootNode || !xmlNameEqual(rootNode, "skinset")) return nullptr; const std::string skinSetImage = XML::getProperty(rootNode, "image", ""); @@ -339,7 +339,7 @@ Skin *Theme::readSkin(const std::string &filename) // iterate <widget>'s for_each_xml_child_node(widgetNode, rootNode) { - if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget")) + if (!xmlNameEqual(widgetNode, "widget")) continue; const std::string widgetType = @@ -348,7 +348,7 @@ Skin *Theme::readSkin(const std::string &filename) { for_each_xml_child_node(partNode, widgetNode) { - if (xmlStrEqual(partNode->name, BAD_CAST "part")) + if (xmlNameEqual(partNode, "part")) { const std::string partType = XML::getProperty(partNode, "type", "unknown"); @@ -477,7 +477,7 @@ Skin *Theme::readSkin(const std::string &filename) "'%s'", partType.c_str()); } } - else if (xmlStrEqual(partNode->name, BAD_CAST "option")) + else if (xmlNameEqual(partNode, "option")) { const std::string name = XML::getProperty( partNode, "name", ""); @@ -818,9 +818,9 @@ void Theme::loadColors(std::string file) file += "/colors.xml"; XML::Document doc(resolveThemePath(file)); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log("Error loading colors file: %s", file.c_str()); return; @@ -835,7 +835,7 @@ void Theme::loadColors(std::string file) for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "color")) + if (xmlNameEqual(node, "color")) { type = readColorType(XML::getProperty(node, "id", "")); if (type < 0) // invalid or no type given @@ -850,7 +850,7 @@ void Theme::loadColors(std::string file) mColors[type].set(type, color, grad, 10); } - else if (xmlStrEqual(node->name, BAD_CAST "progressbar")) + else if (xmlNameEqual(node, "progressbar")) { type = readProgressType(XML::getProperty(node, "id", "")); if (type < 0) // invalid or no type given diff --git a/src/gui/theme.h b/src/gui/theme.h index 92b2c8878..3be6882a3 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -4,7 +4,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index 506bf65c9..43393fc09 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h index 16b3d9d6f..b055c90ce 100644 --- a/src/gui/tradewindow.h +++ b/src/gui/tradewindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index c43f28400..ca21263f1 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h index e68741e22..a89b3231b 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/unregisterdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index ac51cc76f..28bd8467c 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -67,9 +67,9 @@ std::vector<updateFile> loadXMLFile(const std::string &fileName) { std::vector<updateFile> files; XML::Document doc(fileName, false); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "updates")) + if (!rootNode || !xmlNameEqual(rootNode, "updates")) { logger->log("Error loading update file: %s", fileName.c_str()); return files; @@ -78,7 +78,7 @@ std::vector<updateFile> loadXMLFile(const std::string &fileName) for_each_xml_child_node(fileNode, rootNode) { // Ignore all tags except for the "update" tags - if (!xmlStrEqual(fileNode->name, BAD_CAST "update")) + if (!xmlNameEqual(fileNode, "update")) continue; updateFile file; @@ -91,7 +91,8 @@ std::vector<updateFile> loadXMLFile(const std::string &fileName) else file.required = false; - files.push_back(file); + if (checkPath(file.name)) + files.push_back(file); } return files; @@ -118,7 +119,7 @@ std::vector<updateFile> loadTxtFile(const std::string &fileName) thisFile.required = true; thisFile.desc = ""; - if (!thisFile.name.empty()) + if (!thisFile.name.empty() && checkPath(thisFile.name)) files.push_back(thisFile); } } @@ -154,6 +155,12 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost, mLoadUpdates(applyUpdates), mUpdateType(updateType) { + setWindowName("UpdaterWindow"); + setResizable(true); + setDefaultSize(450, 400, ImageRect::CENTER); + setMinWidth(320); + setMinHeight(240); + mBrowserBox = new BrowserBox; mScrollArea = new ScrollArea(mBrowserBox); mLabel = new Label(_("Connecting...")); @@ -174,14 +181,12 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost, placer(3, 5, mCancelButton); placer(4, 5, mPlayButton); - reflowLayout(450, 400); - Layout &layout = getLayout(); layout.setRowHeight(0, Layout::AUTO_SET); addKeyListener(this); - center(); + loadWindowState(); setVisible(true); mCancelButton->requestFocus(); diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h index e9a45241f..f8ee4e29c 100644 --- a/src/gui/updaterwindow.h +++ b/src/gui/updaterwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 62fd03c70..a3299fb7b 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 3bf9c782a..cb0593fa7 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net> * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index b6c55f2c4..f4c6c315f 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -481,6 +481,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) if (mHoverBeing->canTalk()) { mHoverBeing->talkTo(); + return; } else { @@ -490,6 +491,9 @@ void Viewport::mousePressed(gcn::MouseEvent &event) { if (player_node != mHoverBeing || mSelfMouseHeal) actorSpriteManager->heal(mHoverBeing); + if (player_node == mHoverBeing && mHoverItem) + player_node->pickUp(mHoverItem); + return; } } else if (player_node->withinAttackRange(mHoverBeing) || @@ -499,17 +503,21 @@ void Viewport::mousePressed(gcn::MouseEvent &event) { player_node->attack(mHoverBeing, !keyboard.isKeyActive(keyboard.KEY_TARGET)); + return; } } else if (!keyboard.isKeyActive(keyboard.KEY_ATTACK)) { if (player_node != mHoverBeing) + { player_node->setGotoTarget(mHoverBeing); + return; + } } } - // Picks up a item if we clicked on one } - else if (mHoverItem) + // Picks up a item if we clicked on one + if (mHoverItem) { player_node->pickUp(mHoverItem); } @@ -739,7 +747,7 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED) } mHoverItem = nullptr; - if (!mHoverBeing && actorSpriteManager) + if (actorSpriteManager) { mHoverItem = actorSpriteManager->findItem(x / mMap->getTileWidth(), y / mMap->getTileHeight()); @@ -867,3 +875,44 @@ bool Viewport::isPopupMenuVisible() { return mPopupMenu ? mPopupMenu->isVisible() : false; } + +void Viewport::moveCameraToActor(int actorId, int x, int y) +{ + if (!player_node) + return; + + Actor *actor = actorSpriteManager->findBeing(actorId); + if (!actor) + return; + Vector actorPos = actor->getPosition(); + Vector playerPos = player_node->getPosition(); + mCameraMode = 1; + mCameraRelativeX = actorPos.x - playerPos.x + x; + mCameraRelativeY = actorPos.y - playerPos.y + y; +} + +void Viewport::moveCameraToPosition(int x, int y) +{ + if (!player_node) + return; + + Vector playerPos = player_node->getPosition(); + mCameraMode = 1; + + mCameraRelativeX = x - playerPos.x; + mCameraRelativeY = y - playerPos.y; +} + +void Viewport::moveCameraRelative(int x, int y) +{ + mCameraMode = 1; + mCameraRelativeX += x; + mCameraRelativeY += y; +} + +void Viewport::returnCamera() +{ + mCameraMode = 0; + mCameraRelativeX = 0; + mCameraRelativeY = 0; +} diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 938988198..4ed80ed32 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -248,8 +248,22 @@ class Viewport : public WindowContainer, public gcn::MouseListener, int getCameraRelativeY() { return mCameraRelativeY; } + void setCameraRelativeX(int n) + { mCameraRelativeX = n; } + + void setCameraRelativeY(int n) + { mCameraRelativeY = n; } + bool isPopupMenuVisible(); + void moveCameraToActor(int actorId, int x = 0, int y = 0); + + void moveCameraToPosition(int x, int y); + + void moveCameraRelative(int x, int y); + + void returnCamera(); + protected: friend class ActorSpriteManager; diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 6004f706e..a80fb4c89 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -21,14 +21,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "whoisonline.h" +#include "gui/whoisonline.h" #include <SDL.h> #include <SDL_thread.h> #include <vector> #include <algorithm> +#include "gui/socialwindow.h" #include "gui/viewport.h" + #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/scrollarea.h" @@ -288,6 +290,13 @@ void WhoIsOnline::loadList(std::vector<std::string> &list) } updateWindow(friends, neutral, disregard, enemy, numOnline); + if (!mOnlinePlayers.empty()) + { + if (chatWindow) + chatWindow->updateOnline(mOnlinePlayers); + if (socialWindow) + socialWindow->updateActiveList(); + } } void WhoIsOnline::loadWebList() @@ -587,8 +596,13 @@ void WhoIsOnline::logic() mUpdateButton->setEnabled(true); mUpdateTimer = 0; updateSize(); - if (!mOnlinePlayers.empty() && chatWindow) - chatWindow->updateOnline(mOnlinePlayers); + if (!mOnlinePlayers.empty()) + { + if (chatWindow) + chatWindow->updateOnline(mOnlinePlayers); + if (socialWindow) + socialWindow->updateActiveList(); + } } break; case UPDATE_COMPLETE: diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h index 112ad35ba..ade391d5a 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/whoisonline.h @@ -26,6 +26,7 @@ #include <string> #include <set> +#include <vector> #include "configlistener.h" diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 8264f0fb9..1bf897301 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index afb4abdf5..526db6ef5 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index c5500e801..5ac13c78e 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h index 03c63da2c..8d85e739e 100644 --- a/src/gui/widgets/battletab.h +++ b/src/gui/widgets/battletab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 7d30c10bf..5856a91b1 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. @@ -451,6 +451,7 @@ int BrowserBox::calcHeight() } gcn::Color prevColor = selColor; + bold = false; // TODO: Check if we must take texture size limits into account here // TODO: Check if some of the O(n) calls can be removed @@ -466,8 +467,6 @@ int BrowserBox::calcHeight() wrapped = false; } - bold = false; - // "Tokenize" the string at control sequences if (mUseLinksAndUserColors) end = row.find("##", start + 1); diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index e26ae32e0..ab3049c0b 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 85e4eca17..2867e3d39 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 1b62179b3..aed46bb55 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp index 87d87f7d1..f362cc28c 100644 --- a/src/gui/widgets/channeltab.cpp +++ b/src/gui/widgets/channeltab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h index 5d3b78094..4b56d2e05 100644 --- a/src/gui/widgets/channeltab.h +++ b/src/gui/widgets/channeltab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index c2db20574..aea367482 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 962c0b363..ddf10bf5e 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index dcedc8951..0689c5395 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index af38065f5..0c8e48553 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp index 558257507..80028a62f 100644 --- a/src/gui/widgets/container.cpp +++ b/src/gui/widgets/container.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index c011b8925..d927f5379 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index beb232fb2..b40558c78 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -48,10 +48,14 @@ Desktop::Desktop() : std::string appName = branding.getValue("appName", std::string("")); if (appName.empty()) + { mVersionLabel = new Label(FULL_VERSION); + } else - mVersionLabel = new Label(strprintf("%s (Mana %s)", appName.c_str(), - FULL_VERSION)); + { + mVersionLabel = new Label(strprintf("%s (%s)", FULL_VERSION, + appName.c_str())); + } mVersionLabel->setBackgroundColor( Theme::getThemeColor(Theme::BACKGROUND, 128)); diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 2a17320de..91c983f26 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 3559b634a..a769678ca 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -48,7 +48,7 @@ class DropDown : public gcn::DropDown * @param listBox the listBox to use. * @see ListModel, ScrollArea, ListBox. */ - DropDown(gcn::ListModel *listModel = 0, + DropDown(gcn::ListModel *listModel = nullptr, gcn::ActionListener* listener = nullptr, std::string eventId = ""); diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp index 7d3ddc0b4..acda5ad88 100644 --- a/src/gui/widgets/flowcontainer.cpp +++ b/src/gui/widgets/flowcontainer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index d1f276b3c..677dd3661 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp index 0353ac23f..a95fca3cf 100644 --- a/src/gui/widgets/guildchattab.cpp +++ b/src/gui/widgets/guildchattab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h index 4f5ee3a8e..bebdaa1f3 100644 --- a/src/gui/widgets/guildchattab.h +++ b/src/gui/widgets/guildchattab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 78ce14e56..d620cbb8d 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 17f517644..d5810fcbf 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp index dbb02498a..c128ea550 100644 --- a/src/gui/widgets/horizontcontainer.cpp +++ b/src/gui/widgets/horizontcontainer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index 2a3f77d2b..7439672dc 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index b8cc2ac3a..b35eb1d95 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index 4b0d12342..6f05da3f7 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index 89544e108..8a075000b 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h index b36b088a6..7284c9d03 100644 --- a/src/gui/widgets/inttextfield.h +++ b/src/gui/widgets/inttextfield.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp index 795f0d31e..216c2bea0 100644 --- a/src/gui/widgets/inventoryfilter.cpp +++ b/src/gui/widgets/inventoryfilter.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h index c3762189e..c4f2b6242 100644 --- a/src/gui/widgets/inventoryfilter.h +++ b/src/gui/widgets/inventoryfilter.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 57c64093b..669d05a66 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 2c465fdee..ae6e4a35d 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 549aa1616..61d929f0b 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h index bc3bdc51c..9f66da991 100644 --- a/src/gui/widgets/itemlinkhandler.h +++ b/src/gui/widgets/itemlinkhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 3682ec448..130d641fe 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 587723279..59e52b5ae 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index f0359062e..453e62a50 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 754d13a0b..02fed43b5 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp index 54c41635f..2b79609b9 100644 --- a/src/gui/widgets/layouthelper.cpp +++ b/src/gui/widgets/layouthelper.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index a01051595..b0f4d435d 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h index f8f195f2d..366899ffc 100644 --- a/src/gui/widgets/linkhandler.h +++ b/src/gui/widgets/linkhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 53299ca46..28fe9daa1 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 8ac0bbc3b..e4b6dd54e 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h index 9484be0a5..e41ed46b8 100644 --- a/src/gui/widgets/mouseevent.h +++ b/src/gui/widgets/mouseevent.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp index 34639b063..6f339ddd7 100644 --- a/src/gui/widgets/passwordfield.cpp +++ b/src/gui/widgets/passwordfield.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h index 5ba08094d..eca95e6ad 100644 --- a/src/gui/widgets/passwordfield.h +++ b/src/gui/widgets/passwordfield.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index fb72176bd..5e2412d3b 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 2bf010618..d2393ca08 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -25,6 +25,8 @@ #include <guichan/widgets/scrollarea.hpp> +#include "localconsts.h" + class Being; class ImageRect; @@ -40,7 +42,7 @@ class PlayerBox : public gcn::ScrollArea * Constructor. Takes the initial player character that this box should * display, which defaults to <code>NULL</code>. */ - PlayerBox(const Being *being = 0); + PlayerBox(const Being *being = nullptr); /** * Destructor. diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 78557d481..e206a3246 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 64e4b52ac..8ff21149a 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index f9b6da153..8b2beb8d5 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index 36ed96bd2..163310245 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index e885aa0ec..6adb5a2fa 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -51,7 +51,7 @@ ProgressIndicator::ProgressIndicator() } else { - mIndicator = 0; + mIndicator = nullptr; } setSize(32, 32); @@ -60,7 +60,7 @@ ProgressIndicator::ProgressIndicator() ProgressIndicator::~ProgressIndicator() { delete mIndicator; - mIndicator = 0; + mIndicator = nullptr; } void ProgressIndicator::logic() diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h index e5fcaefda..6d55fd3ce 100644 --- a/src/gui/widgets/progressindicator.h +++ b/src/gui/widgets/progressindicator.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index 7d344b09d..94152a716 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index d1c347acb..7692d478a 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index c8822eea9..4a6adadb6 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index 873d74058..ce4eb0770 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 0ec4a2027..021bd3d15 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 105791080..86902b5c9 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 8081f5d7b..92ff625c2 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 5b8a9df87..eb2680ede 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp index e98e9c3ac..b3863c134 100644 --- a/src/gui/widgets/setuptab.cpp +++ b/src/gui/widgets/setuptab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h index ddc0c8958..e47af8995 100644 --- a/src/gui/widgets/setuptab.h +++ b/src/gui/widgets/setuptab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp index 4fb092070..ab8f61a40 100644 --- a/src/gui/widgets/setuptabscroll.cpp +++ b/src/gui/widgets/setuptabscroll.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h index 2b0c6f65e..4ad1f464b 100644 --- a/src/gui/widgets/setuptabscroll.h +++ b/src/gui/widgets/setuptabscroll.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp index d3aac5c56..5f13e5f71 100644 --- a/src/gui/widgets/shopitems.cpp +++ b/src/gui/widgets/shopitems.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h index 29d24cb64..c013f1810 100644 --- a/src/gui/widgets/shopitems.h +++ b/src/gui/widgets/shopitems.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index b649a81ef..71e373d70 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index c5acbbefc..9b416d3a3 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 36f88da08..6c8397bbb 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 8587950c6..72f8b9cac 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 3822d40c9..ed667e194 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index 9ac45d0a0..8eed984b1 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 8e4b1fe6f..c09fb423d 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index ba51e6c74..40b46ede5 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index fb9279343..fc6526a13 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -197,7 +197,7 @@ void TabbedArea::removeTab(gcn::Tab *tab) } else { - setSelectedTab(tabIndexToBeSelected); + setSelectedTabByPos(tabIndexToBeSelected); } adjustSize(); @@ -241,7 +241,7 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab) widgetResized(nullptr); } -void TabbedArea::setSelectedTab(const std::string &name) +void TabbedArea::setSelectedTabByName(const std::string &name) { for (TabContainer::const_iterator itr = mTabs.begin(), itr_end = mTabs.end(); itr != itr_end; ++itr) @@ -254,6 +254,11 @@ void TabbedArea::setSelectedTab(const std::string &name) } } +void TabbedArea::setSelectedTabByPos(int tab) +{ + gcn::TabbedArea::setSelectedTab(tab); +} + void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED) { int width = getWidth() - 2 * getFrameSize() @@ -459,8 +464,7 @@ void TabbedArea::removeAll() { if (getSelectedTabIndex() != -1) { - setSelectedTab(static_cast<unsigned int>(0)); - + setSelectedTabByPos(static_cast<unsigned int>(0)); } while (getNumberOfTabs() > 0) { diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index d71109dd3..b202dfc9d 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -78,8 +78,6 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener */ gcn::Widget *getCurrentWidget(); - using gcn::TabbedArea::addTab; - /** * Add a tab. Overridden since it needs to size the widget. * @@ -112,11 +110,11 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener int getContainerHeight() const { return mWidgetContainer->getHeight(); } - using gcn::TabbedArea::setSelectedTab; - void setSelectedTab(gcn::Tab *tab); - void setSelectedTab(const std::string &name); + void setSelectedTabByPos(int tab); + + void setSelectedTabByName(const std::string &name); void widgetResized(const gcn::Event &event); diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp index f54b4281a..5216fb89c 100644 --- a/src/gui/widgets/tablemodel.cpp +++ b/src/gui/widgets/tablemodel.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h index 810b2f4ac..40a350163 100644 --- a/src/gui/widgets/tablemodel.h +++ b/src/gui/widgets/tablemodel.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index f31c8d129..a4bc3bc09 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 27525fc85..6d2467b38 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index b4584947a..03fdb5378 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index e530cfef2..bc1123f19 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 9be2d5b3f..f3ea962bc 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h index a3f623177..81e27fd06 100644 --- a/src/gui/widgets/textpreview.h +++ b/src/gui/widgets/textpreview.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index deec2aea6..5c893de1f 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h index f061778f3..06add3ee0 100644 --- a/src/gui/widgets/tradetab.h +++ b/src/gui/widgets/tradetab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index 5e79b7c19..42ae97802 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -69,6 +69,8 @@ void VertContainer::clear() Container::clear(); mCount = 0; + mNextY = 0; + mResizableWidgets.clear(); } void VertContainer::widgetResized(const gcn::Event &event A_UNUSED) diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 08546aa47..6e1305a06 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 33859d8be..625c8a392 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h index 8678c932c..72d407ac2 100644 --- a/src/gui/widgets/whispertab.h +++ b/src/gui/widgets/whispertab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 273695a1a..3858b0d81 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 6249626d3..65dbf196b 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp index 34a6b68c7..43aaea8a4 100644 --- a/src/gui/widgets/windowcontainer.cpp +++ b/src/gui/widgets/windowcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h index b27ba927f..00ef04c19 100644 --- a/src/gui/widgets/windowcontainer.h +++ b/src/gui/widgets/windowcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 3f41be466..138090075 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -299,7 +299,7 @@ void WindowMenu::mouseMoved(gcn::MouseEvent &event) if (key != KeyboardConfig::KEY_NO_VALUE) { mTextPopup->show(x + getX(), y + getY(), btn->getDescription(), - "Key: " + keyboard.getKeyValueString(key)); + strprintf(_("Key: %s"), keyboard.getKeyValueString(key).c_str())); } else { diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 3f02ea851..8abc5e87a 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp index ae5345031..917605281 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/worldselectdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h index 61bcc4b51..1a469757f 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/worldselectdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guichanfwd.h b/src/guichanfwd.h index be5708863..b3808d8ba 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guild.cpp b/src/guild.cpp index 0e629e2be..e569bed65 100644 --- a/src/guild.cpp +++ b/src/guild.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guild.h b/src/guild.h index 915dda5e7..e95677ec6 100644 --- a/src/guild.h +++ b/src/guild.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index 16edb369a..9dc9d7b73 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guildmanager.h b/src/guildmanager.h index 5cd5e19cc..368b2456c 100644 --- a/src/guildmanager.h +++ b/src/guildmanager.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp index 8634702ce..5e0b93d7a 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imageparticle.h b/src/imageparticle.h index 73005a526..16b4b8cb7 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp index 6ccaeb5fc..f969717f2 100644 --- a/src/imagesprite.cpp +++ b/src/imagesprite.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imagesprite.h b/src/imagesprite.h index 9dad0f743..7537faef3 100644 --- a/src/imagesprite.h +++ b/src/imagesprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/inventory.cpp b/src/inventory.cpp index 4521613ba..47a32bce1 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/inventory.h b/src/inventory.h index f94568739..d210c65e2 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/item.cpp b/src/item.cpp index d4b41b6cb..cc7d666b5 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/item.h b/src/item.h index 29700f27a..ad051846d 100644 --- a/src/item.h +++ b/src/item.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 625e8d90a..f267dd755 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/itemshortcut.h b/src/itemshortcut.h index b735e899c..55c6d1165 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/joystick.cpp b/src/joystick.cpp index 29e16dff4..035232e41 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/joystick.h b/src/joystick.h index be23599c9..87d1e81a9 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/listener.cpp b/src/listener.cpp index cf7c209d6..ea125013f 100644 --- a/src/listener.cpp +++ b/src/listener.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/listener.h b/src/listener.h index cccc026c6..dc968672a 100644 --- a/src/listener.h +++ b/src/listener.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/localconsts.h b/src/localconsts.h index e135a4108..2d0eb5dea 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -21,6 +21,9 @@ #ifndef __GXX_EXPERIMENTAL_CXX0X__ #undef nullptr #define nullptr 0 +#else +#undef Z_NULL +#define Z_NULL nullptr #endif #ifdef __GNUC__ diff --git a/src/localplayer.cpp b/src/localplayer.cpp index c83082a44..3df4a3214 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -98,7 +98,7 @@ extern MiniStatusWindow *miniStatusWindow; extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(int id, int subtype): - Being(id, PLAYER, subtype, 0), + Being(id, PLAYER, subtype, nullptr), mTargetTime(-1), mLastTarget(-1), mTarget(nullptr), @@ -112,7 +112,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): mPathSetByMouse(false), mLocalWalkTime(-1), mMessageTime(0), - mAwayDialog(0), + mAwayDialog(nullptr), mAfkTime(0), mAwayMode(false), mPseudoAwayMode(false), @@ -151,12 +151,12 @@ LocalPlayer::LocalPlayer(int id, int subtype): if (userPalette) mNameColor = &userPalette->getColor(UserPalette::SELF); else - mNameColor = 0; + mNameColor = nullptr; mLastTargetX = 0; mLastTargetY = 0; - mInvertDirection = config.getIntValue("invertMoveDirection"); + mInvertDirection = 0; mCrazyMoveType = config.getIntValue("crazyMoveType"); mCrazyMoveState = 0; mAttackWeaponType = config.getIntValue("attackWeaponType"); @@ -381,7 +381,8 @@ void LocalPlayer::setAction(Action action, int attackType) mLastTarget = -1; if (!mLastHitFrom.empty()) { - debugMsg(_("You were killed by ") + mLastHitFrom); + debugMsg(strprintf(_("You were killed by %s"), + mLastHitFrom.c_str())); mLastHitFrom = ""; } setTarget(nullptr); @@ -1437,13 +1438,17 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount, case PICKUP_BAD_ITEM: msg = N_("Tried to pick up nonexistent item."); break; - case PICKUP_TOO_HEAVY: msg = N_("Item is too heavy."); + case PICKUP_TOO_HEAVY: + msg = N_("Item is too heavy."); break; - case PICKUP_TOO_FAR: msg = N_("Item is too far away."); + case PICKUP_TOO_FAR: + msg = N_("Item is too far away."); break; - case PICKUP_INV_FULL: msg = N_("Inventory is full."); + case PICKUP_INV_FULL: + msg = N_("Inventory is full."); break; - case PICKUP_STACK_FULL: msg = N_("Stack is too big."); + case PICKUP_STACK_FULL: + msg = N_("Stack is too big."); break; case PICKUP_DROP_STEAL: msg = N_("Item belongs to someone else."); @@ -1777,7 +1782,7 @@ void LocalPlayer::moveToTarget(unsigned int dist) case 6: case 7: dist = mAttackRange; - if (dist == 1) + if (dist == 1 && serverVersion < 1) dist = 2; default: break; @@ -1866,12 +1871,14 @@ void LocalPlayer::moveToHome() static const unsigned invertDirectionSize = 5; void LocalPlayer::changeMode(unsigned *var, unsigned limit, const char *conf, - std::string (LocalPlayer::*func)(), unsigned def) + std::string (LocalPlayer::*func)(), unsigned def, + bool save) { (*var) ++; if (*var >= limit) *var = def; - config.setValue(conf, *var); + if (save) + config.setValue(conf, *var); if (miniStatusWindow) miniStatusWindow->updateStatus(); const std::string str = (this->*func)(); @@ -1883,7 +1890,7 @@ void LocalPlayer::invertDirection() { mMoveState = 0; changeMode(&mInvertDirection, invertDirectionSize, "invertMoveDirection", - &LocalPlayer::getInvertDirectionString); + &LocalPlayer::getInvertDirectionString, 0, false); } static const char *invertDirectionStrings[] = @@ -3709,7 +3716,8 @@ void LocalPlayer::attack2(Being *target, bool keep, bool dontChangeEquipment) changeEquipmentBeforeAttack(target); if ((!target || getAttackType() == 0 || getAttackType() == 3) - || (withinAttackRange(target, true, 1) + || (withinAttackRange(target, serverVersion < 1, + serverVersion < 1 ? 1 : 0) && getPathLength(target) <= getAttackRange2())) { attack(target, keep); @@ -4122,7 +4130,7 @@ void LocalPlayer::checkNewName(Being *being) void LocalPlayer::resetYellowBar() { - mInvertDirection = config.resetIntValue("invertMoveDirection"); + mInvertDirection = 0; mCrazyMoveType = config.resetIntValue("crazyMoveType"); mMoveToTargetType = config.resetIntValue("moveToTargetType"); mFollowMode = config.resetIntValue("followMode"); diff --git a/src/localplayer.h b/src/localplayer.h index 5b755e4f6..ed181e3d0 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -523,7 +523,8 @@ class LocalPlayer : public Being, public ActorSpriteListener, const char *getVarItem(const char **arr, unsigned index, unsigned sz); void changeMode(unsigned *var, unsigned limit, const char *conf, - std::string (LocalPlayer::*func)(), unsigned def = 0); + std::string (LocalPlayer::*func)(), unsigned def = 0, + bool save = true); void crazyMove1(); void crazyMove2(); diff --git a/src/logger.cpp b/src/logger.cpp index c2eb1cc46..a2df9a911 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/logger.h b/src/logger.h index 4ce89f759..db618b275 100644 --- a/src/logger.h +++ b/src/logger.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/main.cpp b/src/main.cpp index b49b38300..5025d6d29 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -27,18 +27,21 @@ #include "client.h" #include "logger.h" -#include <libxml/parser.h> - #include <getopt.h> #include <iostream> #include <physfs.h> +#include "utils/stringutils.h" +#include "utils/xml.h" + #ifdef __MINGW32__ #include <windows.h> #endif #include "debug.h" +char *selfName = nullptr; + static void printHelp() { using std::endl; @@ -71,6 +74,8 @@ static void printHelp() " directory") << endl << _(" --screenshot-dir : Directory to store screenshots") << endl << _(" --safemode : Start game in safe mode") << endl + << _(" -T --tests : Start testing drivers and " + "auto configuring") << endl #ifdef USE_OPENGL << _(" --no-opengl : Disable OpenGL for this session") << endl #endif @@ -84,30 +89,32 @@ static void printVersion() static void parseOptions(int argc, char *argv[], Client::Options &options) { - const char *optstring = "hvud:U:P:Dc:p:l:L:C:"; + const char *optstring = "hvud:U:P:Dc:p:l:L:C:s:t:T"; const struct option long_options[] = { - { "config-dir", required_argument, 0, 'C' }, - { "data", required_argument, 0, 'd' }, - { "default", no_argument, 0, 'D' }, - { "password", required_argument, 0, 'P' }, - { "character", required_argument, 0, 'c' }, - { "help", no_argument, 0, 'h' }, - { "localdata-dir", required_argument, 0, 'L' }, - { "update-host", required_argument, 0, 'H' }, - { "port", required_argument, 0, 'p' }, - { "server", required_argument, 0, 's' }, - { "skip-update", no_argument, 0, 'u' }, - { "username", required_argument, 0, 'U' }, - { "no-opengl", no_argument, 0, 'O' }, - { "chat-log-dir", required_argument, 0, 'l' }, - { "version", no_argument, 0, 'v' }, - { "log-file", required_argument, 0, 'l' }, - { "chat-log-dir", required_argument, 0, 'L' }, - { "screenshot-dir", required_argument, 0, 'i' }, - { "safemode", no_argument, 0, 'm' }, - { nullptr, 0, 0, 0 } + { "config-dir", required_argument, nullptr, 'C' }, + { "data", required_argument, nullptr, 'd' }, + { "default", no_argument, nullptr, 'D' }, + { "password", required_argument, nullptr, 'P' }, + { "character", required_argument, nullptr, 'c' }, + { "help", no_argument, nullptr, 'h' }, + { "localdata-dir", required_argument, nullptr, 'L' }, + { "update-host", required_argument, nullptr, 'H' }, + { "port", required_argument, nullptr, 'p' }, + { "server", required_argument, nullptr, 's' }, + { "skip-update", no_argument, nullptr, 'u' }, + { "username", required_argument, nullptr, 'U' }, + { "no-opengl", no_argument, nullptr, 'O' }, + { "chat-log-dir", required_argument, nullptr, 'l' }, + { "version", no_argument, nullptr, 'v' }, + { "log-file", required_argument, nullptr, 'l' }, + { "chat-log-dir", required_argument, nullptr, 'L' }, + { "screenshot-dir", required_argument, nullptr, 'i' }, + { "safemode", no_argument, nullptr, 'm' }, + { "tests", no_argument, nullptr, 'T' }, + { "test", required_argument, nullptr, 't' }, + { nullptr, 0, nullptr, 0 } }; while (optind < argc) @@ -134,7 +141,10 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) options.printHelp = true; break; case 'H': - options.updateHost = optarg; + if (checkPath(optarg)) + options.updateHost = optarg; + else + options.updateHost = ""; break; case 'c': options.character = optarg; @@ -174,6 +184,14 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) case 'm': options.safeMode = true; break; + case 'T': + options.testMode = true; + options.test = ""; + break; + case 't': + options.testMode = true; + options.test = std::string(optarg); + break; default: break; } @@ -191,23 +209,6 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) extern "C" char const *_nl_locale_name_default(void); #endif -static void xmlNullLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) -{ - // Does nothing, that's the whole point of it -} - -// Initialize libxml2 and check for potential ABI mismatches between -// compiled version and the shared library actually used. -static void initXML() -{ - xmlInitParser(); - LIBXML_TEST_VERSION; - - // Suppress libxml2 error messages - xmlSetGenericErrorFunc(nullptr, xmlNullLogger); -} - - int main(int argc, char *argv[]) { #if defined(__MINGW32__) @@ -216,6 +217,8 @@ int main(int argc, char *argv[]) LoadLibrary("exchndl.dll"); #endif + selfName = argv[0]; + // Parse command line options Client::Options options; parseOptions(argc, argv, options); @@ -241,11 +244,20 @@ int main(int argc, char *argv[]) atexit((void(*)()) PHYSFS_deinit); - initXML(); + XML::initXML(); #ifdef WIN32 SetCurrentDirectory(PHYSFS_getBaseDir()); #endif Client client(options); - return client.exec(); + if (!options.testMode) + { + client.gameInit(); + return client.gameExec(); + } + else + { + client.testsInit(); + return client.testsExec(); + } } diff --git a/src/main.h b/src/main.h index 8d6b531fd..541296d22 100644 --- a/src/main.h +++ b/src/main.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.1.12.11" -#define CHECK_VERSION "01.01.12.11" +#define SMALL_VERSION "1.2.1.22" +#define CHECK_VERSION "01.02.01.22" #ifdef HAVE_CONFIG_H #include "../config.h" diff --git a/src/map.cpp b/src/map.cpp index e706f120b..2209cf997 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -1383,17 +1383,20 @@ Path Map::findPath(int startX, int startY, int destX, int destY, if (startX >= mWidth || startY >= mHeight) return path; - // Declare open list, a list with open tiles sorted on F cost - std::priority_queue<Location> openList; - // Return when destination not walkable if (!getWalk(destX, destY, walkmask)) return path; // Reset starting tile's G cost to 0 MetaTile *startTile = &mMetaTiles[startX + startY * mWidth]; + if (!startTile) + return path; + startTile->Gcost = 0; + // Declare open list, a list with open tiles sorted on F cost + std::priority_queue<Location> openList; + // Add the start point to the open list openList.push(Location(startX, startY, startTile)); @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -498,6 +498,9 @@ class Map : public Properties, public ConfigListener void redrawMap(); + bool empty() + { return mLayers.empty(); } + protected: friend class Actor; friend class Minimap; diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h index 6899f85f4..f6d8606ce 100644 --- a/src/net/adminhandler.h +++ b/src/net/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index c41e918e1..8a49a68cd 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/charhandler.cpp b/src/net/charhandler.cpp index f3a02fc3b..016b72cbf 100644 --- a/src/net/charhandler.cpp +++ b/src/net/charhandler.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/charhandler.h b/src/net/charhandler.h index 848354e96..492e27e55 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -44,14 +44,14 @@ struct Character { Character() : slot(0), - dummy(0) + dummy(nullptr) { } ~Character() { delete dummy; - dummy = 0; + dummy = nullptr; } int slot; /**< The index in the list of characters */ @@ -94,9 +94,9 @@ class CharHandler protected: CharHandler() : - mSelectedCharacter(0), - mCharSelectDialog(0), - mCharCreateDialog(0) + mSelectedCharacter(nullptr), + mCharSelectDialog(nullptr), + mCharCreateDialog(nullptr) {} void updateCharSelectDialog(); diff --git a/src/net/chathandler.h b/src/net/chathandler.h index fc6c10376..f8a9e4ccf 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/download.cpp b/src/net/download.cpp index 5141c022e..22af389f3 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -180,7 +180,6 @@ int Download::downloadProgress(void *clientp, double dltotal, double dlnow, return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_CANCELLED, static_cast<size_t>(dltotal), static_cast<size_t>(dlnow)); - return -5; } return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_IDLE, diff --git a/src/net/download.h b/src/net/download.h index 8339dee30..b31350eff 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index bdd43b3f8..556629458 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index 5d1b7aa14..70c458514 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 1c2983137..84bd03bb1 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index f47385a61..b4fd5f93f 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 28584d97f..73d4090b7 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 196626b0d..14d39ea02 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 63e267584..2dc51acf3 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -163,6 +163,9 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg) case 5: errorMessage = _("Incorrect slot."); break; + case 6: + errorMessage = _("Incorrect race."); + break; } new OkDialog(_("Error"), errorMessage); if (mCharCreateDialog) diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index bacde67b6..bec8d2011 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 35e8597f0..e31f68596 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index d39e6788a..baa9a01b5 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h index d34cba0ca..62b61a956 100644 --- a/src/net/ea/eaprotocol.h +++ b/src/net/ea/eaprotocol.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index b74f2384d..b7566e271 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -52,9 +52,14 @@ void GameHandler::processEvent(Mana::Channels channel, if (channel == Mana::CHANNEL_GAME) { if (event.getName() == Mana::EVENT_ENGINESINITALIZED) - Game::instance()->changeMap(mMap); + { + if (mMap != "") + Game::instance()->changeMap(mMap); + } else if (event.getName() == Mana::EVENT_MAPLOADED) + { mapLoadedEvent(); + } } } @@ -73,7 +78,7 @@ void GameHandler::processMapLogin(Net::MessageIn &msg) Uint16 x, y; msg.readInt32(); // server tick msg.readCoordinates(x, y, direction); - msg.skip(2); // unknown + msg.skip(2); // 0x0505 logger->log("Protocol: Player start position: (%d, %d)," " Direction: %d", x, y, direction); // Switch now or we'll have problems diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 511efe357..248175617 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 9836f5fa9..87fc34d94 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index 2aad4a564..81d971161 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index 23eab361c..cf62af459 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 3a544d8db..029d71ac7 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 907fa13db..96a361838 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -168,7 +168,7 @@ void GuildHandler::processGuildBasicInfo(Net::MessageIn &msg) int avgLevel = msg.readInt32(); // Average level int exp = msg.readInt32(); // Exp int nextExp = msg.readInt32(); // Next exp - msg.skip(16); // unused + msg.skip(16); // 0 unused std::string name = msg.readString(24); // Name std::string master = msg.readString(24); // Master's name std::string castle = msg.readString(20); // Castles @@ -242,7 +242,7 @@ void GuildHandler::processGuildMemberList(Net::MessageIn &msg) int exp = msg.readInt32(); // Exp int online = msg.readInt32(); // Online int pos = msg.readInt32(); // Position - msg.skip(50); // unused + msg.skip(50); // 0 unused std::string name = msg.readString(24); // Name GuildMember *m = taGuild->addMember(id, charId, name); @@ -371,11 +371,11 @@ void GuildHandler::processGuildSkillInfo(Net::MessageIn &msg) { msg.readInt16(); // ID msg.readInt16(); // 'Info' (unknown atm) - msg.readInt16(); // unused + msg.readInt16(); // 0 unused msg.readInt16(); // Level msg.readInt16(); // SP msg.readInt16(); // 'Range' - msg.skip(24); // unused + msg.skip(24); // 0 unused msg.readInt8(); // Can be increased } } @@ -479,9 +479,10 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) { + msg.skip(2); // size (can be many explusions in list) std::string nick = msg.readString(24); // Name (of expulsed?) - msg.readString(40); // Message - msg.skip(24); // unused ("dummy") + msg.skip(24); // acc + msg.readString(44); // Message if (taGuild) taGuild->removeMember(nick); @@ -495,7 +496,7 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) taGuild->removeFromMembers(); taGuild->clearMembers(); } - SERVER_NOTICE(_("You was kicked from guild.")); + SERVER_NOTICE(_("You were kicked from guild.")); delete guildTab; guildTab = nullptr; diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index 5b090ec41..5b7442a40 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index d2a1fb4f0..4c4fb760c 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 6db6b18ed..c2e076751 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index 38d6f7be9..e08fe2cd1 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index dabf61b5d..1d0747c61 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 420236cfd..291a92906 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -150,6 +150,11 @@ void LoginHandler::processUpdateHost(Net::MessageIn &msg) len = msg.readInt16() - 4; mUpdateHost = msg.readString(len); + if (!checkPath(mUpdateHost)) + { + mUpdateHost = ""; + logger->log1("Warning: incorrect update server name"); + } loginData.updateHost = mUpdateHost; logger->log("Received update host \"%s\" from login server.", @@ -159,7 +164,7 @@ void LoginHandler::processUpdateHost(Net::MessageIn &msg) void LoginHandler::processLoginData(Net::MessageIn &msg) { // Skip the length word - msg.skip(2); + msg.skip(2); // size clearWorlds(); @@ -170,7 +175,7 @@ void LoginHandler::processLoginData(Net::MessageIn &msg) mToken.session_ID2 = msg.readInt32(); msg.skip(4); // old ip loginData.lastLogin = msg.readString(24); - msg.skip(2); // unused bytes + msg.skip(2); // 0 unused bytes // msg.skip(30); // unknown // reserve bits for future usage @@ -183,10 +188,11 @@ void LoginHandler::processLoginData(Net::MessageIn &msg) world->address = msg.readInt32(); world->port = msg.readInt16(); world->name = msg.readString(20); - world->online_users = msg.readInt32(); + world->online_users = msg.readInt16(); config.setValue("updatehost", mUpdateHost); world->updateHost = mUpdateHost; - msg.skip(2); // unknown + msg.skip(2); // maintenance + msg.skip(2); // new logger->log("Network: Server: %s (%s:%d)", world->name.c_str(), ipToString(world->address), world->port); diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 62ace31c8..555de6385 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index e8e1014d4..18b0ca39a 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 3e68c2321..be0465375 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 8373cb1c4..556e72c8d 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -320,7 +320,7 @@ void PartyHandler::processPartyMove(Net::MessageIn &msg) m = Ea::taParty->getMember(id); if (m) { - msg.skip(4); + msg.skip(4); // 0 m->setX(msg.readInt16()); // x m->setY(msg.readInt16()); // y m->setOnline(msg.readInt8()); // online (if 0) @@ -330,7 +330,7 @@ void PartyHandler::processPartyMove(Net::MessageIn &msg) } else { - msg.skip(4); + msg.skip(4); // 0 msg.readInt16(); // x msg.readInt16(); // y msg.readInt8(); // online (if 0) diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 02af3dbb4..6a841415f 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index ceb4aba0b..d0402ecfc 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp index fe56db52a..7b2ef601a 100644 --- a/src/net/ea/specialhandler.cpp +++ b/src/net/ea/specialhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -87,11 +87,11 @@ void SpecialHandler::processPlayerSkills(Net::MessageIn &msg) { int skillId = msg.readInt16(); msg.readInt16(); // target type - msg.skip(2); // unused + msg.skip(2); // skill pool flags int level = msg.readInt16(); msg.readInt16(); // sp msg.readInt16(); // range - msg.skip(24); // unused + msg.skip(24); // 0 unused int up = msg.readInt8(); PlayerInfo::setStatBase(skillId, level); diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h index 47b412f3e..c2b05399e 100644 --- a/src/net/ea/specialhandler.h +++ b/src/net/ea/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/token.h b/src/net/ea/token.h index 40a7058ff..86871647f 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 5aaa09f91..0ba3925a8 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index 6d623f60d..07e9cc23b 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h index 14203fb20..fd051234f 100644 --- a/src/net/gamehandler.h +++ b/src/net/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h index 1a15e6929..9864ba654 100644 --- a/src/net/generalhandler.h +++ b/src/net/generalhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h index 4070abad5..b8af633de 100644 --- a/src/net/guildhandler.h +++ b/src/net/guildhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 360f141fa..ec2f3db47 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/logindata.h b/src/net/logindata.h index 6433d2759..e5d3fc97a 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 5607ca1e2..1366e30dd 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp index a7bcf6355..609c9e4f1 100644 --- a/src/net/manaserv/adminhandler.cpp +++ b/src/net/manaserv/adminhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h index 5a71db35e..a4157b3b0 100644 --- a/src/net/manaserv/adminhandler.h +++ b/src/net/manaserv/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp index 25c75f9d8..662032e29 100644 --- a/src/net/manaserv/attributes.cpp +++ b/src/net/manaserv/attributes.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -238,9 +238,9 @@ namespace Attributes logger->log("Initializing attributes database..."); XML::Document doc(DEFAULT_ATTRIBUTESDB_FILE); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "attributes")) + if (!rootNode || !xmlNameEqual(rootNode, "attributes")) { logger->log("Attributes: Error while loading " DEFAULT_ATTRIBUTESDB_FILE ". Using Built-ins."); @@ -251,7 +251,7 @@ namespace Attributes for_each_xml_child_node(node, rootNode) { - if (xmlStrEqual(node->name, BAD_CAST "attribute")) + if (xmlNameEqual(node, "attribute")) { int id = XML::getProperty(node, "id", 0); @@ -290,7 +290,7 @@ namespace Attributes unsigned int count = 0; for_each_xml_child_node(effectNode, node) { - if (!xmlStrEqual(effectNode->name, BAD_CAST "modifier")) + if (!xmlNameEqual(effectNode, "modifier")) continue; ++count; std::string tag = XML::getProperty(effectNode, "tag", ""); @@ -334,7 +334,7 @@ namespace Attributes logger->log("Found %d tags for attribute %d.", count, id); }// End attribute - else if (xmlStrEqual(node->name, BAD_CAST "points")) + else if (xmlNameEqual(node, "points")) { creationPoints = XML::getProperty( node, "start", DEFAULT_POINTS); diff --git a/src/net/manaserv/attributes.h b/src/net/manaserv/attributes.h index 35eeaef88..ba5931b8c 100644 --- a/src/net/manaserv/attributes.h +++ b/src/net/manaserv/attributes.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp index d14cdcadf..cef4f497a 100644 --- a/src/net/manaserv/beinghandler.cpp +++ b/src/net/manaserv/beinghandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h index 59797f8f5..70d61545c 100644 --- a/src/net/manaserv/beinghandler.h +++ b/src/net/manaserv/beinghandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp index 7cc0e70f2..25db86cf0 100644 --- a/src/net/manaserv/buysellhandler.cpp +++ b/src/net/manaserv/buysellhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h index e1a9c91e5..3c983ac08 100644 --- a/src/net/manaserv/buysellhandler.h +++ b/src/net/manaserv/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp index 42db6e621..300af5a2b 100644 --- a/src/net/manaserv/charhandler.cpp +++ b/src/net/manaserv/charhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/charhandler.h b/src/net/manaserv/charhandler.h index ea44ae23e..134b8447b 100644 --- a/src/net/manaserv/charhandler.h +++ b/src/net/manaserv/charhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index 1757b565d..f0a23127c 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h index e93c2dd87..029d5fe83 100644 --- a/src/net/manaserv/chathandler.h +++ b/src/net/manaserv/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/connection.cpp b/src/net/manaserv/connection.cpp index 33d6f28cf..2467eb198 100644 --- a/src/net/manaserv/connection.cpp +++ b/src/net/manaserv/connection.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/connection.h b/src/net/manaserv/connection.h index 933822a85..4263ae21f 100644 --- a/src/net/manaserv/connection.h +++ b/src/net/manaserv/connection.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/defines.h b/src/net/manaserv/defines.h index e2fe27839..aaf29bff2 100644 --- a/src/net/manaserv/defines.h +++ b/src/net/manaserv/defines.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp index 92cf66302..59fb1e4f5 100644 --- a/src/net/manaserv/effecthandler.cpp +++ b/src/net/manaserv/effecthandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/effecthandler.h b/src/net/manaserv/effecthandler.h index 774411041..ceb48fd22 100644 --- a/src/net/manaserv/effecthandler.h +++ b/src/net/manaserv/effecthandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp index 21bd526d8..4a03dff0f 100644 --- a/src/net/manaserv/gamehandler.cpp +++ b/src/net/manaserv/gamehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h index 323b2566a..443533bba 100644 --- a/src/net/manaserv/gamehandler.h +++ b/src/net/manaserv/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index 2eea6cdf6..584faa368 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h index c6614707f..fcb28c846 100644 --- a/src/net/manaserv/generalhandler.h +++ b/src/net/manaserv/generalhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp index 306a15be4..dfd2ed3cf 100644 --- a/src/net/manaserv/guildhandler.cpp +++ b/src/net/manaserv/guildhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h index 6a8db27c8..893a7157b 100644 --- a/src/net/manaserv/guildhandler.h +++ b/src/net/manaserv/guildhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/internal.cpp b/src/net/manaserv/internal.cpp index 6d2c99712..37148b101 100644 --- a/src/net/manaserv/internal.cpp +++ b/src/net/manaserv/internal.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/internal.h b/src/net/manaserv/internal.h index 14a728727..9c0529a79 100644 --- a/src/net/manaserv/internal.h +++ b/src/net/manaserv/internal.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp index ce837b5e1..47f149eca 100644 --- a/src/net/manaserv/inventoryhandler.cpp +++ b/src/net/manaserv/inventoryhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h index ba4535d79..8471b1caf 100644 --- a/src/net/manaserv/inventoryhandler.h +++ b/src/net/manaserv/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp index 89826a33f..021d57cf3 100644 --- a/src/net/manaserv/itemhandler.cpp +++ b/src/net/manaserv/itemhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/itemhandler.h b/src/net/manaserv/itemhandler.h index 0fdd8c333..cfdc30083 100644 --- a/src/net/manaserv/itemhandler.h +++ b/src/net/manaserv/itemhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp index bf823562f..f1c597c00 100644 --- a/src/net/manaserv/loginhandler.cpp +++ b/src/net/manaserv/loginhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -339,11 +339,20 @@ void LoginHandler::readServerInfo(Net::MessageIn &msg) return; // Set the update host when included in the message - const std::string updateHost = msg.readString(); + std::string updateHost = msg.readString(); if (!updateHost.empty()) + { + if (!checkPath(updateHost)) + { + logger->log1("Warning: incorrect update server name"); + updateHost = ""; + } mLoginData->updateHost = updateHost; + } else + { logger->log1("Warning: server does not have an update host set!"); + } // Read the client data folder for dynamic data loading. // This is only used by the QT client. diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h index 0e8f2a4e6..72c43aec0 100644 --- a/src/net/manaserv/loginhandler.h +++ b/src/net/manaserv/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagehandler.cpp b/src/net/manaserv/messagehandler.cpp index 2e9603f19..769f2a3b6 100644 --- a/src/net/manaserv/messagehandler.cpp +++ b/src/net/manaserv/messagehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagehandler.h b/src/net/manaserv/messagehandler.h index c1011cef7..c09d59439 100644 --- a/src/net/manaserv/messagehandler.h +++ b/src/net/manaserv/messagehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagein.cpp b/src/net/manaserv/messagein.cpp index 92bfa7d2c..bc97155a9 100644 --- a/src/net/manaserv/messagein.cpp +++ b/src/net/manaserv/messagein.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagein.h b/src/net/manaserv/messagein.h index 6b0464a44..f22cdabca 100644 --- a/src/net/manaserv/messagein.h +++ b/src/net/manaserv/messagein.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messageout.cpp b/src/net/manaserv/messageout.cpp index c80ba6593..0bb1c0f77 100644 --- a/src/net/manaserv/messageout.cpp +++ b/src/net/manaserv/messageout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messageout.h b/src/net/manaserv/messageout.h index 772b108f3..dc583ab3d 100644 --- a/src/net/manaserv/messageout.h +++ b/src/net/manaserv/messageout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp index 44478fb4c..84e71eaf3 100644 --- a/src/net/manaserv/network.cpp +++ b/src/net/manaserv/network.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/network.h b/src/net/manaserv/network.h index 63ba7b11a..506d44b4f 100644 --- a/src/net/manaserv/network.h +++ b/src/net/manaserv/network.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp index 8ff2c5d21..24a58ebd8 100644 --- a/src/net/manaserv/npchandler.cpp +++ b/src/net/manaserv/npchandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h index f91858614..d71cd4d18 100644 --- a/src/net/manaserv/npchandler.h +++ b/src/net/manaserv/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp index 660657f44..60dcaaaff 100644 --- a/src/net/manaserv/partyhandler.cpp +++ b/src/net/manaserv/partyhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h index 087936d72..5497d5e34 100644 --- a/src/net/manaserv/partyhandler.h +++ b/src/net/manaserv/partyhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index 925938161..5ebf840bc 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h index c33eddc84..0255406a8 100644 --- a/src/net/manaserv/playerhandler.h +++ b/src/net/manaserv/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/protocol.h b/src/net/manaserv/protocol.h index 7f5e03871..58103ffb1 100644 --- a/src/net/manaserv/protocol.h +++ b/src/net/manaserv/protocol.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp index 85fe7271f..13c6f7613 100644 --- a/src/net/manaserv/specialhandler.cpp +++ b/src/net/manaserv/specialhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h index ccbe59fd9..f6a20e4ac 100644 --- a/src/net/manaserv/specialhandler.h +++ b/src/net/manaserv/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp index 383da9fe6..e827c2cec 100644 --- a/src/net/manaserv/tradehandler.cpp +++ b/src/net/manaserv/tradehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h index 2ca542f78..39d691982 100644 --- a/src/net/manaserv/tradehandler.h +++ b/src/net/manaserv/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index 64483c8cd..9867ffd65 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 19453b745..4fb61dc6a 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messagein.h b/src/net/messagein.h index ed143a213..8dd43a1a0 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index b1e0c2295..9ec45c7cc 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messageout.h b/src/net/messageout.h index a169bfe2d..6ac6f81e2 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/net.cpp b/src/net/net.cpp index 933f7686b..713b6aa7e 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/net.h b/src/net/net.h index a6adef44e..ce320591f 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/npchandler.h b/src/net/npchandler.h index 40b97deef..2e32e5986 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/packetcounters.cpp b/src/net/packetcounters.cpp index 8cd2e4627..dc504768e 100644 --- a/src/net/packetcounters.cpp +++ b/src/net/packetcounters.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h index 35d5d64bc..936217c95 100644 --- a/src/net/packetcounters.h +++ b/src/net/packetcounters.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index 14f06060d..dd92f78d1 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 4f1ed8f00..f62acc0c9 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index eb07f766e..fb6a99a33 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/specialhandler.h b/src/net/specialhandler.h index 64b11fdda..7ed3673cf 100644 --- a/src/net/specialhandler.h +++ b/src/net/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 5d5034938..65f4d6f2c 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index d81e2421a..4063a7fba 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 02267e20e..627db1402 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 5e741aaa8..a45e33d36 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 552aa1d51..629aa54f6 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -69,7 +69,7 @@ BuySellHandler::BuySellHandler() }; handledMessages = _messages; buySellHandler = this; - mBuyDialog = 0; + mBuyDialog = nullptr; } void BuySellHandler::handleMessage(Net::MessageIn &msg) diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index 65067f7e0..e4d07511f 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 69f7165ec..717df1284 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -190,7 +190,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, msg.readInt32(); // option msg.readInt32(); // karma msg.readInt32(); // manner - msg.skip(2); // unknown + msg.readInt16(); // character points left character->data.mAttributes[HP] = msg.readInt16(); character->data.mAttributes[MAX_HP] = msg.readInt16(); @@ -347,7 +347,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) loginData.characterSlots = static_cast<short unsigned int>(slots); bool version = msg.readInt8() == 1 && serverVersion > 0; - msg.skip(17); // Unused + msg.skip(17); // 0 Unused delete_all(mCharacters); mCharacters.clear(); diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index f1256e409..915c6dba5 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 5af248e5c..368421285 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 9a88b7478..8652d297d 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index adaaa067b..5acf9ae6c 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index ddb381058..d48fabdcc 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 293986bde..a666fa5f4 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -201,9 +201,9 @@ void GeneralHandler::reload() static_cast<LoginHandler*>(mLoginHandler.get())->clearWorlds(); static_cast<CharServerHandler*>( - mCharHandler.get())->setCharCreateDialog(0); + mCharHandler.get())->setCharCreateDialog(nullptr); static_cast<CharServerHandler*>( - mCharHandler.get())->setCharSelectDialog(0); + mCharHandler.get())->setCharSelectDialog(nullptr); static_cast<PartyHandler*>(mPartyHandler.get())->reload(); } @@ -259,6 +259,9 @@ void GeneralHandler::processEvent(Mana::Channels channel, if (!statusWindow) return; + // protection against double addition attributes. + statusWindow->clearAttributes(); + statusWindow->addAttribute(STR, _("Strength"), true, ""); statusWindow->addAttribute(AGI, _("Agility"), true, ""); statusWindow->addAttribute(VIT, _("Vitality"), true, ""); diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index e0f29fd1d..b250ddfd4 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 05a93bff8..af90f5c6b 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h index 21c56c4ed..351dadfd6 100644 --- a/src/net/tmwa/gui/guildtab.h +++ b/src/net/tmwa/gui/guildtab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 373fcca31..d0738e79c 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h index d865995f7..0bdc11372 100644 --- a/src/net/tmwa/gui/partytab.h +++ b/src/net/tmwa/gui/partytab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 7ea97eb49..5e2ac528f 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index d8d291bdd..e1d2d7c29 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 14a15e59f..7fa26f5ed 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index d924e8713..d2ecc4b6d 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp index ee33cd230..ce03044c7 100644 --- a/src/net/tmwa/itemhandler.cpp +++ b/src/net/tmwa/itemhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h index 3e948547e..0f2459fbf 100644 --- a/src/net/tmwa/itemhandler.h +++ b/src/net/tmwa/itemhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index bdc944d63..3b53bbf7c 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -154,7 +154,7 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg) { unsigned int options = msg.readInt8(); mRegistrationEnabled = options; - msg.skip(2); + msg.skip(2); // 0 unused serverVersion = msg.readInt8(); } else diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index c13c882a7..e2b8beec7 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagehandler.cpp b/src/net/tmwa/messagehandler.cpp index 830b3bc4f..d4b3c03a4 100644 --- a/src/net/tmwa/messagehandler.cpp +++ b/src/net/tmwa/messagehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index fef9e2004..7607e5c80 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp index 5a9d39211..b8bba342f 100644 --- a/src/net/tmwa/messagein.cpp +++ b/src/net/tmwa/messagein.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index bf8debf54..29b17d8ba 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index d5d9d82f9..790611381 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index d97851d4a..5d1e911b6 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index db006c5c0..31329eafb 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -83,7 +83,7 @@ short packet_lengths[] = -1, -1, 20, 10, 32, 9, 34, 14, 2, 6, 48, 56, -1, 4, 5, 10, // #0x0200 26, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, - 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, -1, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 757358c25..c0ec6ef3c 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -39,7 +39,7 @@ * Protocol version, reported to the eAthena char and mapserver who can adjust * the protocol accordingly. */ -#define CLIENT_PROTOCOL_VERSION 4 +#define CLIENT_PROTOCOL_VERSION 5 #define CLIENT_TMW_PROTOCOL_VERSION 1 namespace TmwAthena diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 6b6ffcbb6..d86c64a96 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -25,6 +25,7 @@ #include "localplayer.h" #include "gui/npcdialog.h" +#include "gui/viewport.h" #include "net/messagein.h" #include "net/net.h" @@ -41,7 +42,8 @@ extern Net::NpcHandler *npcHandler; namespace TmwAthena { -NpcHandler::NpcHandler() +NpcHandler::NpcHandler() : + mRequestLang(false) { static const Uint16 _messages[] = { @@ -51,6 +53,7 @@ NpcHandler::NpcHandler() SMSG_NPC_CLOSE, SMSG_NPC_INT_INPUT, SMSG_NPC_STR_INPUT, + SMSG_NPC_COMMAND, 0 }; handledMessages = _messages; @@ -59,9 +62,12 @@ NpcHandler::NpcHandler() void NpcHandler::handleMessage(Net::MessageIn &msg) { - getNpc(msg, msg.getId() == SMSG_NPC_CHOICE + int npcId = getNpc(msg, msg.getId() == SMSG_NPC_CHOICE || msg.getId() == SMSG_NPC_MESSAGE); + if (msg.getId() != SMSG_NPC_STR_INPUT) + mRequestLang = false; + switch (msg.getId()) { case SMSG_NPC_CHOICE: @@ -85,7 +91,14 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) break; case SMSG_NPC_STR_INPUT: - processNpcStrInput(msg); + if (mRequestLang) + processLangReuqest(msg, npcId); + else + processNpcStrInput(msg); + break; + + case SMSG_NPC_COMMAND: + processNpcCommand(msg, npcId); break; default: @@ -118,6 +131,8 @@ void NpcHandler::closeDialog(int npcId) { if ((*it).second.dialog) (*it).second.dialog->close(); + if ((*it).second.dialog == mDialog) + mDialog = nullptr; mNpcDialogs.erase(it); } } @@ -213,6 +228,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg, bool haveLength) else { mDialog = new NpcDialog(npcId); + mDialog->saveCamera(); if (player_node) player_node->stopWalking(false); Wrapper wrap; @@ -222,9 +238,70 @@ int NpcHandler::getNpc(Net::MessageIn &msg, bool haveLength) } else { + if (mDialog && mDialog != diag->second.dialog) + mDialog->restoreCamera(); mDialog = diag->second.dialog; + if (mDialog) + mDialog->saveCamera(); } return npcId; } +void NpcHandler::processNpcCommand(Net::MessageIn &msg, int npcId) +{ + const int cmd = msg.readInt16(); + switch (cmd) + { + case 0: + mRequestLang = true; + break; + + case 1: + if (viewport) + viewport->moveCameraToActor(npcId); + break; + + case 2: + if (viewport) + { + const int id = msg.readInt32(); + const int x = msg.readInt16(); + const int y = msg.readInt16(); + if (!id) + viewport->moveCameraToPosition(x, y); + else + viewport->moveCameraToActor(id, x, y); + } + break; + + case 3: + if (viewport) + viewport->returnCamera(); + break; + + case 4: + if (viewport) + { + msg.readInt32(); // id + const int x = msg.readInt16(); + const int y = msg.readInt16(); + viewport->moveCameraRelative(x, y); + } + break; + case 5: + closeDialog(npcId); + break; + + default: + logger->log("unknown npc command: %d", cmd); + break; + } +} + +void NpcHandler::processLangReuqest(Net::MessageIn &msg A_UNUSED, int npcId) +{ + mRequestLang = false; + stringInput(npcId, getLangSimple()); +} + } // namespace TmwAthena diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 548346205..1cfcacb20 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -65,6 +65,13 @@ class NpcHandler : public MessageHandler, public Ea::NpcHandler void sellItem(int beingId, int itemId, int amount); int getNpc(Net::MessageIn &msg, bool haveLength); + + void processNpcCommand(Net::MessageIn &msg, int npcId); + + void processLangReuqest(Net::MessageIn &msg, int npcId); + + private: + bool mRequestLang; }; } // namespace TmwAthena diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 4534cca8b..d5f0641eb 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index 898bdae3d..0fa524d51 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 37f036ca8..ddc642101 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -335,5 +335,6 @@ enum #define SMSG_IGNORE_ALL_RESPONSE 0x00d2 #define CMSG_ONLINE_LIST 0x0210 #define SMSG_ONLINE_LIST 0x0211 +#define SMSG_NPC_COMMAND 0x0212 #endif diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index c75d954dc..9fa7b6dfa 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h index 50bf31c0b..f17ef4c44 100644 --- a/src/net/tmwa/specialhandler.h +++ b/src/net/tmwa/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 2280079ea..1a44e4956 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index 3a4c8c1fc..b5a06ef6a 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index 57219e675..06a431ec6 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index b02e9fa21..26733a0da 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index 1f1a0231d..6f712f698 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -377,6 +377,9 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y, // Draw a set of textured rectangles glBegin(GL_QUADS); + const float scaleFactorW = (float) scaledWidth / image->getWidth(); + const float scaleFactorH = (float) scaledHeight / image->getHeight(); + for (int py = 0; py < h; py += ih) { const int height = (py + ih >= h) ? h - py : ih; @@ -387,7 +390,8 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y, int dstX = x + px; drawRescaledQuad(image, srcX, srcY, dstX, dstY, - width, height, scaledWidth, scaledHeight); + width / scaleFactorW, height / scaleFactorH, + scaledWidth, scaledHeight); } } @@ -474,6 +478,7 @@ SDL_Surface* OpenGL1Graphics::getScreenshot() { int h = mTarget->h; int w = mTarget->w; + GLint pack = 1; SDL_Surface *screenshot = SDL_CreateRGBSurface( SDL_SWSURFACE, @@ -484,6 +489,7 @@ SDL_Surface* OpenGL1Graphics::getScreenshot() SDL_LockSurface(screenshot); // Grap the pixel buffer and write it to the SDL surface + glGetIntegerv(GL_PACK_ALIGNMENT, &pack); glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, screenshot->pixels); @@ -505,6 +511,8 @@ SDL_Surface* OpenGL1Graphics::getScreenshot() free(buf); + glPixelStorei(GL_PACK_ALIGNMENT, pack); + if (SDL_MUSTLOCK(screenshot)) SDL_UnlockSurface(screenshot); diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h index 11df607f8..87458d8b9 100644 --- a/src/opengl1graphics.h +++ b/src/opengl1graphics.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index f5e9f8107..b744a3caf 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -588,22 +588,25 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image, const int height = (py + scaledHeight >= h) ? h - py : scaledHeight; const int dstY = y + py; + const int scaledY = srcY + height / scaleFactorH; for (int px = 0; px < w; px += scaledWidth) { - int width = (px + scaledWidth >= w) ? w - px : scaledWidth; - int dstX = x + px; + const int width = (px + scaledWidth >= w) + ? w - px : scaledWidth; + const int dstX = x + px; + const int scaledX = srcX + width / scaleFactorW; mIntTexArray[vp + 0] = srcX; mIntTexArray[vp + 1] = srcY; - mIntTexArray[vp + 2] = srcX + width / scaleFactorW; + mIntTexArray[vp + 2] = scaledX; mIntTexArray[vp + 3] = srcY; - mIntTexArray[vp + 4] = srcX + width / scaleFactorW; - mIntTexArray[vp + 5] = srcY + height / scaleFactorH; + mIntTexArray[vp + 4] = scaledX; + mIntTexArray[vp + 5] = scaledY; mIntTexArray[vp + 6] = srcX; - mIntTexArray[vp + 7] = srcY + height / scaleFactorH; + mIntTexArray[vp + 7] = scaledY; mIntVertArray[vp + 0] = dstX; mIntVertArray[vp + 1] = dstY; @@ -1020,6 +1023,7 @@ SDL_Surface* OpenGLGraphics::getScreenshot() { int h = mTarget->h; int w = mTarget->w; + GLint pack = 1; SDL_Surface *screenshot = SDL_CreateRGBSurface( SDL_SWSURFACE, @@ -1033,6 +1037,7 @@ SDL_Surface* OpenGLGraphics::getScreenshot() SDL_LockSurface(screenshot); // Grap the pixel buffer and write it to the SDL surface + glGetIntegerv(GL_PACK_ALIGNMENT, &pack); glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, screenshot->pixels); @@ -1054,6 +1059,8 @@ SDL_Surface* OpenGLGraphics::getScreenshot() free(buf); + glPixelStorei(GL_PACK_ALIGNMENT, pack); + if (SDL_MUSTLOCK(screenshot)) SDL_UnlockSurface(screenshot); diff --git a/src/openglgraphics.h b/src/openglgraphics.h index d12810203..1047223ad 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particle.cpp b/src/particle.cpp index e71791ce8..a0acb4f73 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -291,9 +291,9 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, dyePalettes = particleEffectFile.substr(pos + 1); XML::Document doc(particleEffectFile.substr(0, pos)); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "effect")) + if (!rootNode || !xmlNameEqual(rootNode, "effect")) { logger->log("Error loading particle: %s", particleEffectFile.c_str()); return nullptr; @@ -305,11 +305,11 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, for_each_xml_child_node(effectChildNode, rootNode) { // We're only interested in particles - if (!xmlStrEqual(effectChildNode->name, BAD_CAST "particle")) + if (!xmlNameEqual(effectChildNode, "particle")) continue; // Determine the exact particle type - xmlNodePtr node; + XmlNodePtr node; // Animation if ((node = XML::findFirstChildByName(effectChildNode, "animation"))) @@ -361,14 +361,14 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, // Look for additional emitters for this particle for_each_xml_child_node(emitterNode, effectChildNode) { - if (xmlStrEqual(emitterNode->name, BAD_CAST "emitter")) + if (xmlNameEqual(emitterNode, "emitter")) { ParticleEmitter *newEmitter; newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap, rotation, dyePalettes); newParticle->addEmitter(newEmitter); } - else if (xmlStrEqual(emitterNode->name, BAD_CAST "deatheffect")) + else if (xmlNameEqual(emitterNode, "deatheffect")) { std::string deathEffect = reinterpret_cast<const char*>( emitterNode->xmlChildrenNode->content); diff --git a/src/particle.h b/src/particle.h index ad448a054..a79181498 100644 --- a/src/particle.h +++ b/src/particle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index 40ab68865..e39f4dd86 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particlecontainer.h b/src/particlecontainer.h index 2219bd67c..a8af163fd 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 1add452a0..c6c819e92 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -39,11 +39,11 @@ #define SIN45 0.707106781f #define DEG_RAD_FACTOR 0.017453293f -ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, +ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, Map *map, int rotation, const std::string& dyePalettes): mOutputPauseLeft(0), - mParticleImage(0) + mParticleImage(nullptr) { mMap = map; mParticleTarget = target; @@ -71,7 +71,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, for_each_xml_child_node(propertyNode, emitterNode) { - if (xmlStrEqual(propertyNode->name, BAD_CAST "property")) + if (xmlNameEqual(propertyNode, "property")) { std::string name = XML::getProperty(propertyNode, "name", ""); @@ -197,13 +197,13 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, name.c_str()); } } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "emitter")) + else if (xmlNameEqual(propertyNode, "emitter")) { ParticleEmitter newEmitter(propertyNode, mParticleTarget, map, rotation, dyePalettes); mParticleChildEmitters.push_back(newEmitter); } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "rotation")) + else if (xmlNameEqual(propertyNode, "rotation")) { ImageSet *imageset = ResourceManager::getInstance()->getImageSet( XML::getProperty(propertyNode, "imageset", ""), @@ -229,7 +229,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, offsetY -= imageset->getHeight() - 32; offsetX -= imageset->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { int index = XML::getProperty(frameNode, "index", -1); @@ -250,7 +250,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, mParticleRotation.addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { int start = XML::getProperty(frameNode, "start", -1); int end = XML::getProperty(frameNode, "end", -1); @@ -276,13 +276,13 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, start++; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { mParticleRotation.addTerminator(rand); } } // for frameNode } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "animation")) + else if (xmlNameEqual(propertyNode, "animation")) { ImageSet *imageset = ResourceManager::getInstance()->getImageSet( XML::getProperty(propertyNode, "imageset", ""), @@ -307,7 +307,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, offsetY -= imageset->getHeight() - 32; offsetX -= imageset->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { int index = XML::getProperty(frameNode, "index", -1); @@ -328,7 +328,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, mParticleAnimation.addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { int start = XML::getProperty(frameNode, "start", -1); int end = XML::getProperty(frameNode, "end", -1); @@ -354,13 +354,13 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, start++; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { mParticleAnimation.addTerminator(rand); } } // for frameNode } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "deatheffect")) + else if (xmlNameEqual(propertyNode, "deatheffect")) { mDeathEffect = reinterpret_cast<const char*>( propertyNode->xmlChildrenNode->content); @@ -460,13 +460,13 @@ ParticleEmitter::~ParticleEmitter() if (mParticleImage) { mParticleImage->decRef(); - mParticleImage = 0; + mParticleImage = nullptr; } } template <typename T> ParticleEmitterProp<T> -ParticleEmitter::readParticleEmitterProp(xmlNodePtr propertyNode, T def) +ParticleEmitter::readParticleEmitterProp(XmlNodePtr propertyNode, T def) { ParticleEmitterProp<T> retval; diff --git a/src/particleemitter.h b/src/particleemitter.h index 49826d0f6..faa54dd12 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -43,7 +43,7 @@ class Particle; class ParticleEmitter { public: - ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map, + ParticleEmitter(XmlNodePtr emitterNode, Particle *target, Map *map, int rotation = 0, const std::string& dyePalettes = std::string()); @@ -82,7 +82,7 @@ class ParticleEmitter private: template <typename T> ParticleEmitterProp<T> - readParticleEmitterProp(xmlNodePtr propertyNode, T def); + readParticleEmitterProp(XmlNodePtr propertyNode, T def); /** * initial position of particles: diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h index 76c855e4f..cadfa0f3a 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/party.cpp b/src/party.cpp index b462c94a7..1a693ddd6 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/party.h b/src/party.h index 73c45214a..1f616319d 100644 --- a/src/party.h +++ b/src/party.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp index 93e704302..0b9d16de2 100644 --- a/src/playerinfo.cpp +++ b/src/playerinfo.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/playerinfo.h b/src/playerinfo.h index b90e47ce9..cff145d2d 100644 --- a/src/playerinfo.h +++ b/src/playerinfo.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 1bf63aa81..6b5cb0199 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -361,6 +361,24 @@ std::vector<std::string> * PlayerRelationsManager::getPlayers() return retval; } +std::vector<std::string> *PlayerRelationsManager::getPlayersByRelation( + PlayerRelation::Relation rel) +{ + std::vector<std::string> *retval = new std::vector<std::string>(); + + for (std::map<std::string, + PlayerRelation *>::const_iterator it = mRelations.begin(); + it != mRelations.end(); ++it) + { + if (it->second && it->second->mRelation == rel) + retval->push_back(it->first); + } + + sort(retval->begin(), retval->end(), playersSorter); + + return retval; +} + void PlayerRelationsManager::removePlayer(const std::string &name) { if (mRelations[name]) @@ -574,14 +592,24 @@ bool PlayerRelationsManager::checkName(const std::string &name) const const int size = name.size(); std::string check = config.getStringValue("unsecureChars"); - if (name.substr(0, 1) == " " || name.substr(size - 1, 1) == " ") + std::string lastChar = name.substr(size - 1, 1); + if (name.substr(0, 1) == " " || lastChar == " " || lastChar == "." + || name.find(" ") != std::string::npos) + { return false; + } else if (check.empty()) + { return true; + } else if (name.find_first_of(check) != std::string::npos) + { return false; + } else + { return true; + } } PlayerRelationsManager player_relations; diff --git a/src/playerrelations.h b/src/playerrelations.h index 5eb1b3c64..143a82477 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -202,6 +202,9 @@ class PlayerRelationsManager */ std::vector<std::string> *getPlayers(); + std::vector<std::string> *getPlayersByRelation(PlayerRelation::Relation + rel); + /** * Removes all recorded player info. */ diff --git a/src/position.cpp b/src/position.cpp index 8e9baf272..7bd6cfe50 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/position.h b/src/position.h index 973a774f0..2e10aebe2 100644 --- a/src/position.h +++ b/src/position.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/properties.h b/src/properties.h index 19354b9ab..406477c73 100644 --- a/src/properties.h +++ b/src/properties.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/action.cpp b/src/resources/action.cpp index f940bffcb..e1f88ecb7 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/action.h b/src/resources/action.h index 9ab6f98d5..1e3965363 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -23,7 +23,7 @@ #ifndef ACTION_H #define ACTION_H -#include <libxml/tree.h> +#include "utils/xml.h" #include <map> diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp index 2ad25dcd0..b5640904c 100644 --- a/src/resources/ambientlayer.cpp +++ b/src/resources/ambientlayer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h index c90ef7c79..54a764841 100644 --- a/src/resources/ambientlayer.h +++ b/src/resources/ambientlayer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 1f3336a8b..1c1da6ca5 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/animation.h b/src/resources/animation.h index 19b17eb54..33bfd76e9 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -23,7 +23,7 @@ #ifndef ANIMATION_H #define ANIMATION_H -#include <libxml/tree.h> +#include "utils/xml.h" #include <vector> #include <string> diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 0b2aaa8fa..0fa815181 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index b93c11ba6..0f62ba5ea 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp index d944f280e..f38f13224 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/chardb.cpp @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -24,10 +24,6 @@ #include "client.h" #include "logger.h" -#include "utils/xml.h" - -#include <libxml/tree.h> - #include "debug.h" namespace @@ -48,9 +44,9 @@ void CharDB::load() unload(); XML::Document *doc = new XML::Document("charcreation.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "chars")) + if (!root || !xmlNameEqual(root, "chars")) { logger->log1("CharDB: Failed to parse charcreation.xml."); @@ -60,15 +56,15 @@ void CharDB::load() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "haircolor")) + if (xmlNameEqual(node, "haircolor")) { loadMinMax(node, &mMinHairColor, &mMaxHairColor); } - else if (xmlStrEqual(node->name, BAD_CAST "hairstyle")) + else if (xmlNameEqual(node, "hairstyle")) { loadMinMax(node, &mMinHairStyle, &mMaxHairStyle); } - else if (xmlStrEqual(node->name, BAD_CAST "stat")) + else if (xmlNameEqual(node, "stat")) { loadMinMax(node, &mMinStat, &mMaxStat); mSumStat = XML::getProperty(node, "sum", 0); @@ -80,7 +76,7 @@ void CharDB::load() mLoaded = true; } -void CharDB::loadMinMax(xmlNodePtr node, unsigned *min, unsigned *max) +void CharDB::loadMinMax(XmlNodePtr node, unsigned *min, unsigned *max) { *min = XML::getProperty(node, "min", 1); *max = XML::getProperty(node, "max", 10); diff --git a/src/resources/chardb.h b/src/resources/chardb.h index 769dedb56..60ff31084 100644 --- a/src/resources/chardb.h +++ b/src/resources/chardb.h @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -25,7 +25,7 @@ #include <map> #include <string> -#include <libxml/tree.h> +#include "utils/xml.h" /** * Char information database. @@ -42,7 +42,7 @@ namespace CharDB */ void unload(); - void loadMinMax(xmlNodePtr node, unsigned *min, unsigned *max); + void loadMinMax(XmlNodePtr node, unsigned *min, unsigned *max); unsigned getMinHairColor(); diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 3b8c9d573..1ffe507b2 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -26,8 +26,6 @@ #include "utils/xml.h" -#include <libxml/tree.h> - #include "debug.h" namespace @@ -51,10 +49,10 @@ void ColorDB::load() void ColorDB::loadHair() { XML::Document *doc = new XML::Document("hair.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); bool hairXml = true; - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log1("Trying to fall back on colors.xml"); @@ -64,7 +62,7 @@ void ColorDB::loadHair() doc = new XML::Document("colors.xml"); root = doc->rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log1("ColorDB: Failed to find any color files."); mHairColors[0] = mFail; @@ -78,7 +76,7 @@ void ColorDB::loadHair() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "color")) + if (xmlNameEqual(node, "color")) { int id = XML::getProperty(node, "id", 0); @@ -99,7 +97,7 @@ void ColorDB::loadHair() void ColorDB::loadColorLists() { XML::Document *doc = new XML::Document("itemcolors.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); if (!root) { delete doc; @@ -108,7 +106,7 @@ void ColorDB::loadColorLists() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "list")) + if (xmlNameEqual(node, "list")) { std::string name = XML::getProperty(node, "name", ""); if (name.empty()) @@ -122,7 +120,7 @@ void ColorDB::loadColorLists() for_each_xml_child_node(colorNode, node) { - if (xmlStrEqual(colorNode->name, BAD_CAST "color")) + if (xmlNameEqual(colorNode, "color")) { ItemColor c(XML::getProperty(colorNode, "id", -1), XML::getProperty(colorNode, "name", ""), diff --git a/src/resources/colordb.h b/src/resources/colordb.h index f4cc88a59..36907095e 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 29b1c864e..6800c5170 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/dye.h b/src/resources/dye.h index 85192041a..94bee3b58 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index c456c49e4..c6126a57b 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -52,9 +52,9 @@ void EmoteDB::load() logger->log1("Initializing emote database..."); XML::Document doc("emotes.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes")) + if (!rootNode || !xmlNameEqual(rootNode, "emotes")) { logger->log1("Emote Database: Error while loading emotes.xml!"); return; @@ -63,7 +63,7 @@ void EmoteDB::load() //iterate <emote>s for_each_xml_child_node(emoteNode, rootNode) { - if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote")) + if (!xmlNameEqual(emoteNode, "emote")) continue; int id = XML::getProperty(emoteNode, "id", -1); @@ -81,7 +81,7 @@ void EmoteDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { EmoteSprite *currentSprite = new EmoteSprite; std::string file = paths.getStringValue("sprites") @@ -92,7 +92,7 @@ void EmoteDB::load() currentSprite->name = XML::getProperty(spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast<const char*>( spriteNode->xmlChildrenNode->content); @@ -108,7 +108,7 @@ void EmoteDB::load() XML::Document doc2("graphics/sprites/manaplus_emotes.xml"); rootNode = doc2.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes")) + if (!rootNode || !xmlNameEqual(rootNode, "emotes")) { logger->log1("Emote Database: Error while loading" " manaplus_emotes.xml!"); @@ -118,7 +118,7 @@ void EmoteDB::load() //iterate <emote>s for_each_xml_child_node(emoteNode, rootNode) { - if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote")) + if (!xmlNameEqual(emoteNode, "emote")) continue; int id = XML::getProperty(emoteNode, "id", -1); @@ -136,7 +136,7 @@ void EmoteDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { EmoteSprite *currentSprite = new EmoteSprite; std::string file = paths.getStringValue("sprites") @@ -147,7 +147,7 @@ void EmoteDB::load() currentSprite->name = XML::getProperty(spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast<const char*>( spriteNode->xmlChildrenNode->content); diff --git a/src/resources/image.cpp b/src/resources/image.cpp index df07c16a2..9e9124ab6 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -119,10 +119,8 @@ Image::~Image() unload(); } -Resource *Image::load(void *buffer, unsigned bufferSize) +Resource *Image::load(SDL_RWops *rw) { - // Load the raw file data from the buffer in an RWops structure - SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize); SDL_Surface *tmpImage = IMG_Load_RW(rw, 1); if (!tmpImage) @@ -137,9 +135,8 @@ Resource *Image::load(void *buffer, unsigned bufferSize) return image; } -Resource *Image::load(void *buffer, unsigned bufferSize, Dye const &dye) +Resource *Image::load(SDL_RWops *rw, Dye const &dye) { - SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize); SDL_Surface *tmpImage = IMG_Load_RW(rw, 1); if (!tmpImage) @@ -473,10 +470,10 @@ Image* Image::SDLmerge(Image *image, int x, int y) static_cast<Uint16>(mBounds.h - y)); // for each pixel lines of a source image - for (offset_x = (x > 0 ? 0 : -x); offset_x < maxX; offset_x++) + for (offset_x = ((x > 0) ? 0 : -x); offset_x < maxX; offset_x++) { const int x1 = x0 + offset_x; - for (offset_y = (y > 0 ? 0 : -y); offset_y < maxY; offset_y++) + for (offset_y = ((y > 0) ? 0 : -y); offset_y < maxY; offset_y++) { // Computing offset on both images current_offset = (offset_y * getWidth()) + x1; diff --git a/src/resources/image.h b/src/resources/image.h index 333dc63f9..d22ed4be2 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -66,28 +66,25 @@ class Image : public Resource virtual ~Image(); /** - * Loads an image from a buffer in memory. + * Loads an image from an SDL_RWops structure. * - * @param buffer The memory buffer containing the image data. - * @param bufferSize The size of the memory buffer in bytes. + * @param rw The SDL_RWops to load the image from. * * @return <code>NULL</code> if an error occurred, a valid pointer * otherwise. */ - static Resource *load(void *buffer, unsigned bufferSize); + static Resource *load(SDL_RWops *rw); /** - * Loads an image from a buffer in memory and recolors it. + * Loads an image from an SDL_RWops structure and recolors it. * - * @param buffer The memory buffer containing the image data. - * @param bufferSize The size of the memory buffer in bytes. + * @param rw The SDL_RWops to load the image from. * @param dye The dye used to recolor the image. * * @return <code>NULL</code> if an error occurred, a valid pointer * otherwise. */ - static Resource *load(void *buffer, unsigned bufferSize, - Dye const &dye); + static Resource *load(SDL_RWops *rw, Dye const &dye); /** * Loads an image from an SDL surface. diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index a8563c679..decf17189 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h index 5c3d29c74..1dcd046ca 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp index 09b57be28..9e3513e91 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imageset.h b/src/resources/imageset.h index fd320295a..69ebebdc0 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index a3a35cfd1..9501c98a5 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index ae94730f2..ca8150694 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 2911fa06f..5fa68a88f 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -23,6 +23,7 @@ #include "resources/itemdb.h" #include "client.h" +#include "configuration.h" #include "logger.h" #include "resources/iteminfo.h" @@ -32,9 +33,6 @@ #include "utils/gettext.h" #include "utils/stringutils.h" #include "utils/xml.h" -#include "configuration.h" - -#include <libxml/tree.h> #include "debug.h" @@ -49,11 +47,11 @@ namespace } // Forward declarations -static void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node); -static void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node); -static void loadFloorSprite(SpriteDisplay *display, xmlNodePtr node); -static void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode); -static void loadOrderSprite(ItemInfo *itemInfo, xmlNodePtr node, +static void loadSpriteRef(ItemInfo *itemInfo, XmlNodePtr node); +static void loadSoundRef(ItemInfo *itemInfo, XmlNodePtr node); +static void loadFloorSprite(SpriteDisplay *display, XmlNodePtr node); +static void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode); +static void loadOrderSprite(ItemInfo *itemInfo, XmlNodePtr node, bool drawAfter); static int parseSpriteName(std::string name); static int parseDirectionName(std::string name); @@ -174,9 +172,9 @@ void ItemDB::load() mUnknown->addTag(mTags["All"]); XML::Document doc("items.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items")) + if (!rootNode || !xmlNameEqual(rootNode, "items")) { logger->log("ItemDB: Error while loading items.xml!"); mLoaded = true; @@ -185,7 +183,7 @@ void ItemDB::load() for_each_xml_child_node(node, rootNode) { - if (!xmlStrEqual(node->name, BAD_CAST "item")) + if (!xmlNameEqual(node, "item")) continue; int id = XML::getProperty(node, "id", 0); @@ -326,7 +324,7 @@ void ItemDB::load() for_each_xml_child_node(itemChild, node) { - if (xmlStrEqual(itemChild->name, BAD_CAST "sprite")) + if (xmlNameEqual(itemChild, "sprite")) { std::string attackParticle = XML::getProperty( itemChild, "particle-effect", ""); @@ -334,23 +332,23 @@ void ItemDB::load() loadSpriteRef(itemInfo, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "sound")) + else if (xmlNameEqual(itemChild, "sound")) { loadSoundRef(itemInfo, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "floor")) + else if (xmlNameEqual(itemChild, "floor")) { loadFloorSprite(&display, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "replace")) + else if (xmlNameEqual(itemChild, "replace")) { loadReplaceSprite(itemInfo, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "drawAfter")) + else if (xmlNameEqual(itemChild, "drawAfter")) { loadOrderSprite(itemInfo, itemChild, true); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "drawBefore")) + else if (xmlNameEqual(itemChild, "drawBefore")) { loadOrderSprite(itemInfo, itemChild, false); } @@ -595,7 +593,7 @@ int parseDirectionName(std::string name) return id; } -void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node) +void loadSpriteRef(ItemInfo *itemInfo, XmlNodePtr node) { std::string gender = XML::getProperty(node, "gender", "unisex"); std::string filename = reinterpret_cast<const char*>( @@ -607,7 +605,7 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node) itemInfo->setSprite(filename, GENDER_FEMALE); } -void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node) +void loadSoundRef(ItemInfo *itemInfo, XmlNodePtr node) { std::string event = XML::getProperty(node, "event", ""); std::string filename = reinterpret_cast<const char*>( @@ -628,11 +626,11 @@ void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node) } } -void loadFloorSprite(SpriteDisplay *display, xmlNodePtr floorNode) +void loadFloorSprite(SpriteDisplay *display, XmlNodePtr floorNode) { for_each_xml_child_node(spriteNode, floorNode) { - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { SpriteReference *currentSprite = new SpriteReference; currentSprite->sprite = reinterpret_cast<const char*>( @@ -641,7 +639,7 @@ void loadFloorSprite(SpriteDisplay *display, xmlNodePtr floorNode) = XML::getProperty(spriteNode, "variant", 0); display->sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast<const char*>( spriteNode->xmlChildrenNode->content); @@ -650,7 +648,7 @@ void loadFloorSprite(SpriteDisplay *display, xmlNodePtr floorNode) } } -void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) +void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode) { std::string removeSprite = XML::getProperty(replaceNode, "sprite", ""); int direction = parseDirectionName(XML::getProperty( @@ -671,7 +669,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) continue; for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); @@ -693,7 +691,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); @@ -726,7 +724,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); @@ -756,7 +754,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) return; for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); @@ -768,7 +766,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) } } -void loadOrderSprite(ItemInfo *itemInfo, xmlNodePtr node, bool drawAfter) +void loadOrderSprite(ItemInfo *itemInfo, XmlNodePtr node, bool drawAfter) { int sprite = parseSpriteName(XML::getProperty(node, "name", "")); int priority = XML::getProperty(node, "priority", 0); diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 71f0a490e..e56840c16 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index dfcff3f76..f163fc590 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 1fe8f3bad..8c5e2dd8f 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp index e7288e039..b186ad658 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/mapdb.cpp @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -27,8 +27,6 @@ #include "utils/xml.h" -#include <libxml/tree.h> - #include "debug.h" namespace @@ -45,7 +43,7 @@ void MapDB::load() XML::Document *doc = new XML::Document( paths.getStringValue("maps") + "remap.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); if (!root) { delete doc; @@ -54,7 +52,7 @@ void MapDB::load() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "map")) + if (xmlNameEqual(node, "map")) { std::string name = XML::getProperty(node, "name", ""); if (name.empty()) diff --git a/src/resources/mapdb.h b/src/resources/mapdb.h index 2ba084297..d249a5cc6 100644 --- a/src/resources/mapdb.h +++ b/src/resources/mapdb.h @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 68d39f0ae..8d71779f2 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -35,7 +35,6 @@ #include "utils/base64.h" #include "utils/gettext.h" #include "utils/stringutils.h" -#include "utils/xml.h" #include <iostream> #include <zlib.h> @@ -223,12 +222,12 @@ Map *MapReader::readMap(const std::string &filename, XML::Document doc(reinterpret_cast<char*>(inflated), inflatedSize); free(inflated); - xmlNodePtr node = doc.rootNode(); + XmlNodePtr node = doc.rootNode(); // Parse the inflated map data if (node) { - if (!xmlStrEqual(node->name, BAD_CAST "map")) + if (!xmlNameEqual(node, "map")) logger->log("Error: Not a map file (%s)!", realFilename.c_str()); else map = readMap(node, realFilename); @@ -248,7 +247,7 @@ Map *MapReader::readMap(const std::string &filename, return map; } -Map *MapReader::readMap(xmlNodePtr node, const std::string &path) +Map *MapReader::readMap(XmlNodePtr node, const std::string &path) { if (!node) return nullptr; @@ -277,23 +276,23 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path) for_each_xml_child_node(childNode, node) { - if (xmlStrEqual(childNode->name, BAD_CAST "tileset")) + if (xmlNameEqual(childNode, "tileset")) { Tileset *tileset = readTileset(childNode, pathDir, map); if (tileset) map->addTileset(tileset); } - else if (xmlStrEqual(childNode->name, BAD_CAST "layer")) + else if (xmlNameEqual(childNode, "layer")) { readLayer(childNode, map); } - else if (xmlStrEqual(childNode->name, BAD_CAST "properties")) + else if (xmlNameEqual(childNode, "properties")) { readProperties(childNode, map); map->setVersion(atoi(map->getProperty( "manaplus version").c_str())); } - else if (xmlStrEqual(childNode->name, BAD_CAST "objectgroup")) + else if (xmlNameEqual(childNode, "objectgroup")) { // The object group offset is applied to each object individually const int tileOffsetX = XML::getProperty(childNode, "x", 0); @@ -303,7 +302,7 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path) for_each_xml_child_node(objectNode, childNode) { - if (xmlStrEqual(objectNode->name, BAD_CAST "object")) + if (xmlNameEqual(objectNode, "object")) { std::string objType = XML::getProperty( objectNode, "type", ""); @@ -380,14 +379,14 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path) return map; } -void MapReader::readProperties(xmlNodePtr node, Properties *props) +void MapReader::readProperties(XmlNodePtr node, Properties *props) { if (!node || !props) return; for_each_xml_child_node(childNode, node) { - if (!xmlStrEqual(childNode->name, BAD_CAST "property")) + if (!xmlNameEqual(childNode, "property")) continue; // Example: <property name="name" value="value"/> @@ -443,7 +442,7 @@ inline static void setTile(Map *map, MapLayer *layer, int x, int y, int gid) } } -void MapReader::readLayer(xmlNodePtr node, Map *map) +void MapReader::readLayer(XmlNodePtr node, Map *map) { // Layers are not necessarily the same size as the map const int w = XML::getProperty(node, "width", map->getWidth()); @@ -473,7 +472,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) // Load the tile data for_each_xml_child_node(childNode, node) { - if (!xmlStrEqual(childNode->name, BAD_CAST "data")) + if (!xmlNameEqual(childNode, "data")) continue; const std::string encoding = @@ -492,7 +491,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } // Read base64 encoded map file - xmlNodePtr dataChild = childNode->xmlChildrenNode; + XmlNodePtr dataChild = childNode->xmlChildrenNode; if (!dataChild) continue; @@ -577,7 +576,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } else if (encoding == "csv") { - xmlNodePtr dataChild = childNode->xmlChildrenNode; + XmlNodePtr dataChild = childNode->xmlChildrenNode; if (!dataChild) continue; @@ -620,7 +619,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) // Read plain XML map file for_each_xml_child_node(childNode2, childNode) { - if (!xmlStrEqual(childNode2->name, BAD_CAST "tile")) + if (!xmlNameEqual(childNode2, "tile")) continue; const int gid = XML::getProperty(childNode2, "gid", -1); @@ -647,7 +646,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } -Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path, +Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path, Map *map) { if (!map) @@ -679,7 +678,7 @@ Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path, for_each_xml_child_node(childNode, node) { - if (xmlStrEqual(childNode->name, BAD_CAST "image")) + if (xmlNameEqual(childNode, "image")) { const std::string source = XML::getProperty( childNode, "source", ""); @@ -704,11 +703,11 @@ Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path, } } } - else if (xmlStrEqual(childNode->name, BAD_CAST "tile")) + else if (xmlNameEqual(childNode, "tile")) { for_each_xml_child_node(tileNode, childNode) { - if (!xmlStrEqual(tileNode->name, BAD_CAST "properties")) + if (!xmlNameEqual(tileNode, "properties")) continue; int tileGID = firstGid + XML::getProperty(childNode, "id", 0); @@ -717,7 +716,7 @@ Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path, std::map<std::string, int> tileProperties; for_each_xml_child_node(propertyNode, tileNode) { - if (!xmlStrEqual(propertyNode->name, BAD_CAST "property")) + if (!xmlNameEqual(propertyNode, "property")) continue; std::string name = XML::getProperty( propertyNode, "name", ""); diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index c15a83b6f..c9c742ecd 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -23,7 +23,7 @@ #ifndef MAPREADER_H #define MAPREADER_H -#include <libxml/tree.h> +#include "utils/xml.h" #include <string> @@ -47,7 +47,7 @@ class MapReader * Read an XML map from a parsed XML tree. The path is used to find the * location of referenced tileset images. */ - static Map *readMap(xmlNodePtr node, const std::string &path); + static Map *readMap(XmlNodePtr node, const std::string &path); private: /** @@ -57,17 +57,17 @@ class MapReader * @param props The Properties instance to which the properties will * be assigned. */ - static void readProperties(xmlNodePtr node, Properties* props); + static void readProperties(XmlNodePtr node, Properties* props); /** * Reads a map layer and adds it to the given map. */ - static void readLayer(xmlNodePtr node, Map *map); + static void readLayer(XmlNodePtr node, Map *map); /** * Reads a tile set. */ - static Tileset *readTileset(xmlNodePtr node, const std::string &path, + static Tileset *readTileset(XmlNodePtr node, const std::string &path, Map *map); }; diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index dbf9d3e9a..9d295db35 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -52,9 +52,9 @@ void MonsterDB::load() logger->log1("Initializing monster database..."); XML::Document doc("monsters.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters")) + if (!rootNode || !xmlNameEqual(rootNode, "monsters")) { logger->log("Monster Database: Error while loading monster.xml!"); mLoaded = true; @@ -71,7 +71,7 @@ void MonsterDB::load() //iterate <monster>s for_each_xml_child_node(monsterNode, rootNode) { - if (!xmlStrEqual(monsterNode->name, BAD_CAST "monster")) + if (!xmlNameEqual(monsterNode, "monster")) continue; BeingInfo *currentInfo = new BeingInfo; @@ -119,7 +119,7 @@ void MonsterDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { SpriteReference *currentSprite = new SpriteReference; currentSprite->sprite = reinterpret_cast<const char*>( @@ -129,7 +129,7 @@ void MonsterDB::load() spriteNode, "variant", 0); display.sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "sound")) + else if (xmlNameEqual(spriteNode, "sound")) { std::string event = XML::getProperty(spriteNode, "event", ""); const char *filename; @@ -172,7 +172,7 @@ void MonsterDB::load() currentInfo->getName().c_str()); } } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "attack")) + else if (xmlNameEqual(spriteNode, "attack")) { const int id = XML::getProperty(spriteNode, "id", 0); const std::string particleEffect = XML::getProperty( @@ -185,7 +185,7 @@ void MonsterDB::load() currentInfo->addAttack(id, spriteAction, particleEffect, missileParticle); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { display.particles.push_back(reinterpret_cast<const char*>( spriteNode->xmlChildrenNode->content)); diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index 1a9d0e64f..3ddc68c08 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/music.cpp b/src/resources/music.cpp index 099d030b0..b13812f18 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -26,30 +26,21 @@ #include "debug.h" -Music::Music(Mix_Chunk *music): - mChunk(music), - mChannel(-1) +Music::Music(Mix_Music *music) : + mMusic(music) { } Music::~Music() { - //Mix_FreeMusic(music); - Mix_FreeChunk(mChunk); + Mix_FreeMusic(mMusic); } -Resource *Music::load(void *buffer, unsigned bufferSize) +Resource *Music::load(SDL_RWops *rw) { - // Load the raw file data from the buffer in an RWops structure - SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize); - - // Use Mix_LoadMUS to load the raw music data - //Mix_Music* music = Mix_LoadMUS_RW(rw); Need to be implemeted - Mix_Chunk *tmpMusic = Mix_LoadWAV_RW(rw, 1); - - if (tmpMusic) + if (Mix_Music *music = Mix_LoadMUS_RW(rw)) { - return new Music(tmpMusic); + return new Music(music); } else { @@ -58,30 +49,10 @@ Resource *Music::load(void *buffer, unsigned bufferSize) } } -bool Music::play(int loops) -{ - /* - * Warning: loops should be always set to -1 (infinite) with current - * implementation to avoid halting the playback of other samples - */ - - /*if (Mix_PlayMusic(music, loops)) - return true;*/ - Mix_VolumeChunk(mChunk, 120); - mChannel = Mix_PlayChannel(-1, mChunk, loops); - - return mChannel != -1; -} - -void Music::stop() +bool Music::play(int loops, int fadeIn) { - /* - * Warning: very dungerous trick, it could try to stop channels occupied - * by samples rather than the current music file - */ - - //Mix_HaltMusic(); - - if (mChannel != -1) - Mix_HaltChannel(mChannel); + if (fadeIn > 0) + return Mix_FadeInMusic(mMusic, loops, fadeIn); + else + return Mix_PlayMusic(mMusic, loops); } diff --git a/src/resources/music.h b/src/resources/music.h index a4b5b4973..88cc752bc 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -41,38 +41,32 @@ class Music : public Resource /** * Loads a music from a buffer in memory. * - * @param buffer The memory buffer containing the music data. - * @param bufferSize The size of the memory buffer in bytes. + * @param rw The SDL_RWops to load the music data from. * * @return <code>NULL</code> if the an error occurred, a valid pointer * otherwise. */ - static Resource *load(void *buffer, unsigned bufferSize); + static Resource *load(SDL_RWops *rw); /** * Plays the music. * - * @param loops Number of times to repeat the playback. + * @param loops Number of times to repeat the playback (-1 means + * forever). + * @param fadeIn Duration in milliseconds to fade in the music. * * @return <code>true</code> if the playback started properly * <code>false</code> otherwise. */ - virtual bool play(int loops); - - /** - * Stops the music. - */ - virtual void stop(); + bool play(int loops = -1, int fadeIn = 0); protected: /** * Constructor. */ - Music(Mix_Chunk *music); + Music(Mix_Music *music); - //Mix_Music *music; - Mix_Chunk *mChunk; - int mChannel; + Mix_Music *mMusic; }; #endif diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index d04a2518f..832fa26d6 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -46,9 +46,9 @@ void NPCDB::load() logger->log1("Initializing NPC database..."); XML::Document doc("npcs.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs")) + if (!rootNode || !xmlNameEqual(rootNode, "npcs")) { logger->log("NPC Database: Error while loading npcs.xml!"); mLoaded = true; @@ -58,7 +58,7 @@ void NPCDB::load() //iterate <npc>s for_each_xml_child_node(npcNode, rootNode) { - if (!xmlStrEqual(npcNode->name, BAD_CAST "npc")) + if (!xmlNameEqual(npcNode, "npc")) continue; int id = XML::getProperty(npcNode, "id", 0); @@ -84,7 +84,7 @@ void NPCDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { SpriteReference *currentSprite = new SpriteReference; currentSprite->sprite = reinterpret_cast<const char*>( @@ -93,7 +93,7 @@ void NPCDB::load() XML::getProperty(spriteNode, "variant", 0); display.sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast<const char*>( spriteNode->xmlChildrenNode->content); diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index 1d8a72aa6..9b686691a 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index 552af06ec..e9449f0c9 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/resource.h b/src/resources/resource.h index 7196fa916..b8e06aaa7 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index c7552b9b7..c26526b97 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -35,6 +35,7 @@ #include "resources/spritedef.h" #include "utils/mkdir.h" +#include "utils/physfsrwops.h" #include <physfs.h> #include <SDL_image.h> @@ -42,6 +43,7 @@ #include <fstream> #include <iostream> #include <sstream> +#include <zlib.h> #include <sys/stat.h> #include <sys/time.h> @@ -397,19 +399,16 @@ struct ResourceLoader ResourceManager *manager; std::string path; ResourceManager::loader fun; + static Resource *load(void *v) { if (!v) return nullptr; ResourceLoader *l = static_cast< ResourceLoader * >(v); - int fileSize; - if (!l->manager) + SDL_RWops *rw = PHYSFSRWOPS_openRead(l->path.c_str()); + if (!rw) return nullptr; - void *buffer = l->manager->loadFile(l->path, fileSize); - if (!buffer) - return nullptr; - Resource *res = l->fun(buffer, fileSize); - free(buffer); + Resource *res = l->fun(rw); return res; } }; @@ -451,16 +450,14 @@ struct DyedImageLoader d = new Dye(path.substr(p + 1)); path = path.substr(0, p); } - int fileSize; - void *buffer = l->manager->loadFile(path, fileSize); - if (!buffer) + SDL_RWops *rw = PHYSFSRWOPS_openRead(path.c_str()); + if (!rw) { delete d; - return 0; + return nullptr; } - Resource *res = d ? Image::load(buffer, fileSize, *d) - : Image::load(buffer, fileSize); - free(buffer); + Resource *res = d ? Image::load(rw, *d) + : Image::load(rw); delete d; return res; } @@ -695,18 +692,10 @@ void ResourceManager::saveTextFile(std::string path, std::string name, SDL_Surface *ResourceManager::loadSDLSurface(const std::string &filename) { - int fileSize; - void *buffer = loadFile(filename, fileSize); - SDL_Surface *tmp = nullptr; - - if (buffer) - { - SDL_RWops *rw = SDL_RWFromMem(buffer, fileSize); - tmp = IMG_Load_RW(rw, 1); - ::free(buffer); - } - - return tmp; + SDL_Surface *surface = nullptr; + if (SDL_RWops *rw = PHYSFSRWOPS_openRead(filename.c_str())) + surface = IMG_Load_RW(rw, 1); + return surface; } void ResourceManager::scheduleDelete(SDL_Surface* surface) diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 8cc851cca..7b61e2eaa 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -37,7 +37,9 @@ class Music; class Resource; class SoundEffect; class SpriteDef; + struct SDL_Surface; +struct SDL_RWops; /** * A class for loading and managing resources. @@ -48,7 +50,7 @@ class ResourceManager public: - typedef Resource *(*loader)(void *, unsigned); + typedef Resource *(*loader)(SDL_RWops *); typedef Resource *(*generator)(void *); ResourceManager(); diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index a8da8dd80..6a3a980a7 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -31,14 +31,10 @@ SoundEffect::~SoundEffect() Mix_FreeChunk(mChunk); } -Resource *SoundEffect::load(void *buffer, unsigned bufferSize) +Resource *SoundEffect::load(SDL_RWops *rw) { - if (!buffer) + if (!rw) return nullptr; - - // Load the raw file data from the buffer in an RWops structure - SDL_RWops *rw = SDL_RWFromMem(buffer, bufferSize); - // Load the music data and free the RWops structure Mix_Chunk *tmpSoundEffect = Mix_LoadWAV_RW(rw, 1); diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index fdd4bd275..0df7f50d5 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -41,13 +41,12 @@ class SoundEffect : public Resource /** * Loads a sample from a buffer in memory. * - * @param buffer The memory buffer containing the sample data. - * @param bufferSize The size of the memory buffer in bytes. + * @param rw The SDL_RWops to load the sample data from. * * @return <code>NULL</code> if the an error occurred, a valid pointer * otherwise. */ - static Resource *load(void *buffer, unsigned bufferSize); + static Resource *load(SDL_RWops *rw); /** * Plays the sample. diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp index 51ba4bc74..b1a3a9c4d 100644 --- a/src/resources/specialdb.cpp +++ b/src/resources/specialdb.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -55,9 +55,9 @@ void SpecialDB::load() logger->log("Initializing special database..."); XML::Document doc("specials.xml"); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "specials")) + if (!root || !xmlNameEqual(root, "specials")) { logger->log("Error loading specials file specials.xml"); return; @@ -67,13 +67,13 @@ void SpecialDB::load() for_each_xml_child_node(set, root) { - if (xmlStrEqual(set->name, BAD_CAST "set")) + if (xmlNameEqual(set, "set")) { setName = XML::getProperty(set, "name", "Actions"); for_each_xml_child_node(special, set) { - if (xmlStrEqual(special->name, BAD_CAST "special")) + if (xmlNameEqual(special, "special")) { SpecialInfo *info = new SpecialInfo(); int id = XML::getProperty(special, "id", 0); diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h index 8a9e6bb23..f6ef73862 100644 --- a/src/resources/specialdb.h +++ b/src/resources/specialdb.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 32d18b6b8..0d9b95f6f 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -33,8 +33,6 @@ #include "configuration.h" -#include "utils/xml.h" - #include "debug.h" SpriteReference *SpriteReference::Empty = nullptr; @@ -83,9 +81,9 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant) palettes = animationFile.substr(pos + 1); XML::Document doc(animationFile.substr(0, pos)); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) + if (!rootNode || !xmlNameEqual(rootNode, "sprite")) { logger->log("Error, failed to parse %s", animationFile.c_str()); @@ -136,7 +134,7 @@ void SpriteDef::substituteActions() substituteAction(SpriteAction::SPAWN, SpriteAction::STAND); } -void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant, +void SpriteDef::loadSprite(XmlNodePtr spriteNode, int variant, const std::string &palettes) { // Get the variant @@ -151,16 +149,16 @@ void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant, for_each_xml_child_node(node, spriteNode) { - if (xmlStrEqual(node->name, BAD_CAST "imageset")) + if (xmlNameEqual(node, "imageset")) loadImageSet(node, palettes); - else if (xmlStrEqual(node->name, BAD_CAST "action")) + else if (xmlNameEqual(node, "action")) loadAction(node, variant_offset); - else if (xmlStrEqual(node->name, BAD_CAST "include")) + else if (xmlNameEqual(node, "include")) includeSprite(node); } } -void SpriteDef::loadImageSet(xmlNodePtr node, const std::string &palettes) +void SpriteDef::loadImageSet(XmlNodePtr node, const std::string &palettes) { const std::string name = XML::getProperty(node, "name", ""); @@ -188,7 +186,7 @@ void SpriteDef::loadImageSet(xmlNodePtr node, const std::string &palettes) mImageSets[name] = imageSet; } -void SpriteDef::loadAction(xmlNodePtr node, int variant_offset) +void SpriteDef::loadAction(XmlNodePtr node, int variant_offset) { const std::string actionName = XML::getProperty(node, "name", ""); const std::string imageSetName = XML::getProperty(node, "imageset", ""); @@ -225,12 +223,12 @@ void SpriteDef::loadAction(xmlNodePtr node, int variant_offset) // Load animations for_each_xml_child_node(animationNode, node) { - if (xmlStrEqual(animationNode->name, BAD_CAST "animation")) + if (xmlNameEqual(animationNode, "animation")) loadAnimation(animationNode, action, imageSet, variant_offset); } } -void SpriteDef::loadAnimation(xmlNodePtr animationNode, +void SpriteDef::loadAnimation(XmlNodePtr animationNode, Action *action, ImageSet *imageSet, int variant_offset) { @@ -264,7 +262,7 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode, offsetY -= imageSet->getHeight() - 32; offsetX -= imageSet->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { const int index = XML::getProperty(frameNode, "index", -1); @@ -284,7 +282,7 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode, animation->addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { const int start = XML::getProperty(frameNode, "start", -1); const int end = XML::getProperty(frameNode, "end", -1); @@ -324,22 +322,22 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode, repeat --; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { animation->addTerminator(rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "jump")) + else if (xmlNameEqual(frameNode, "jump")) { animation->addJump(XML::getProperty( frameNode, "action", ""), rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "label")) + else if (xmlNameEqual(frameNode, "label")) { std::string name = XML::getProperty(frameNode, "name", ""); if (!name.empty()) animation->addLabel(name); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "goto")) + else if (xmlNameEqual(frameNode, "goto")) { std::string name = XML::getProperty(frameNode, "label", ""); if (!name.empty()) @@ -348,7 +346,7 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode, } // for frameNode } -void SpriteDef::includeSprite(xmlNodePtr includeNode) +void SpriteDef::includeSprite(XmlNodePtr includeNode) { std::string filename = XML::getProperty(includeNode, "file", ""); @@ -365,9 +363,9 @@ void SpriteDef::includeSprite(xmlNodePtr includeNode) mProcessedFiles.insert(filename); XML::Document doc(filename); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) + if (!rootNode || !xmlNameEqual(rootNode, "sprite")) { logger->log("Error, no sprite root node in %s", filename.c_str()); return; diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 3aa6369dd..0490bdcb3 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -25,7 +25,7 @@ #include "resources/resource.h" -#include <libxml/tree.h> +#include "utils/xml.h" #include <list> #include <map> @@ -145,30 +145,30 @@ class SpriteDef : public Resource /** * Loads a sprite element. */ - void loadSprite(xmlNodePtr spriteNode, int variant, + void loadSprite(XmlNodePtr spriteNode, int variant, const std::string &palettes = ""); /** * Loads an imageset element. */ - void loadImageSet(xmlNodePtr node, const std::string &palettes); + void loadImageSet(XmlNodePtr node, const std::string &palettes); /** * Loads an action element. */ - void loadAction(xmlNodePtr node, int variant_offset); + void loadAction(XmlNodePtr node, int variant_offset); /** * Loads an animation element. */ - void loadAnimation(xmlNodePtr animationNode, + void loadAnimation(XmlNodePtr animationNode, Action *action, ImageSet *imageSet, int variant_offset); /** * Include another sprite into this one. */ - void includeSprite(xmlNodePtr includeNode); + void includeSprite(XmlNodePtr includeNode); /** * Complete missing actions by copying existing ones. diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index c8cd5ad60..7ebc5a11a 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h index 55f5eec93..7123cfd96 100644 --- a/src/resources/wallpaper.h +++ b/src/resources/wallpaper.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp index c7c0d10bf..f92b0f3eb 100644 --- a/src/rotationalparticle.cpp +++ b/src/rotationalparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -34,9 +34,9 @@ RotationalParticle::RotationalParticle(Map *map, Animation *animation): { } -RotationalParticle::RotationalParticle(Map *map, xmlNodePtr animationNode, +RotationalParticle::RotationalParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes): - ImageParticle(map, 0), + ImageParticle(map, nullptr), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) { } @@ -61,12 +61,12 @@ bool RotationalParticle::update() float rad = static_cast<float>(atan2(mVelocity.x, mVelocity.y)); if (rad < 0) - rad = static_cast<float>(PI + (PI + rad)); + rad = static_cast<float>(PI) + static_cast<float>(PI) + rad; float range = static_cast<float>(PI / size); // Determines which frame the particle should play - if (rad < range || rad > ((PI*2) - range)) + if (rad < range || rad > ((static_cast<float>(PI)*2) - range)) { mAnimation->setFrame(0); } diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h index d5b91bc63..251e3769c 100644 --- a/src/rotationalparticle.h +++ b/src/rotationalparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -25,7 +25,7 @@ #include "imageparticle.h" -#include <libxml/tree.h> +#include "utils/xml.h" class Animation; class Map; @@ -36,7 +36,7 @@ class RotationalParticle : public ImageParticle public: RotationalParticle(Map *map, Animation *animation); - RotationalParticle(Map *map, xmlNodePtr animationNode, + RotationalParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); ~RotationalParticle(); diff --git a/src/shopitem.cpp b/src/shopitem.cpp index db84d30df..083c2836f 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/shopitem.h b/src/shopitem.h index 188698438..61d23a4ab 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index 31f0c7af0..2b7cc328d 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -44,7 +44,7 @@ SimpleAnimation::SimpleAnimation(Animation *animation): { } -SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode, +SimpleAnimation::SimpleAnimation(XmlNodePtr animationNode, const std::string& dyePalettes): mAnimation(new Animation), mAnimationTime(0), @@ -136,7 +136,7 @@ Image *SimpleAnimation::getCurrentImage() const return nullptr; } -void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode, +void SimpleAnimation::initializeAnimation(XmlNodePtr animationNode, const std::string& dyePalettes) { mInitialized = false; @@ -161,7 +161,7 @@ void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode, return; // Get animation frames - for (xmlNodePtr frameNode = animationNode->xmlChildrenNode; + for (XmlNodePtr frameNode = animationNode->xmlChildrenNode; frameNode; frameNode = frameNode->next) { int delay = XML::getProperty(frameNode, "delay", 0); @@ -171,7 +171,7 @@ void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode, offsetY -= imageset->getHeight() - 32; offsetX -= imageset->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { int index = XML::getProperty(frameNode, "index", -1); @@ -192,7 +192,7 @@ void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode, if (mAnimation) mAnimation->addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { int start = XML::getProperty(frameNode, "start", -1); int end = XML::getProperty(frameNode, "end", -1); @@ -218,7 +218,7 @@ void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode, start++; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { if (mAnimation) mAnimation->addTerminator(rand); diff --git a/src/simpleanimation.h b/src/simpleanimation.h index 44aab9a25..de1203662 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -47,7 +47,7 @@ class SimpleAnimation /** * Creates a simple animation that creates its animation from XML Data. */ - SimpleAnimation(xmlNodePtr animationNode, + SimpleAnimation(XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); ~SimpleAnimation(); @@ -68,7 +68,7 @@ class SimpleAnimation Image *getCurrentImage() const; private: - void initializeAnimation(xmlNodePtr animationNode, const std::string& + void initializeAnimation(XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); /** The hosted animation. */ diff --git a/src/sound.cpp b/src/sound.cpp index a573458ef..fb6958e25 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -27,6 +27,7 @@ #include "logger.h" #include "sound.h" +#include "resources/music.h" #include "resources/resourcemanager.h" #include "resources/soundeffect.h" @@ -184,84 +185,49 @@ void Sound::setSfxVolume(int volume) Mix_Volume(-1, mSfxVolume); } -static Mix_Music *loadMusic(const std::string &filename) +static Music *loadMusic(const std::string &fileName) { ResourceManager *resman = ResourceManager::getInstance(); - std::string path = resman->getPath( - paths.getStringValue("music") + filename); - - if (path.find(".zip/") != std::string::npos || - path.find(".zip\\") != std::string::npos) - { - // Music file is a virtual file inside a zip archive - we have to copy - // it to a temporary physical file so that SDL_mixer can stream it. - logger->log("Loading music \"%s\" from temporary file tempMusic.ogg", - path.c_str()); - bool success = resman->copyFile(paths.getStringValue("music") - + filename, "tempMusic.ogg"); - if (success) - path = resman->getPath("tempMusic.ogg"); - else - return nullptr; - } - else - { - logger->log("Loading music \"%s\"", path.c_str()); - } - - if (path.empty()) - return nullptr; - - Mix_Music *music = Mix_LoadMUS(path.c_str()); - - if (!music) - { - logger->log("Mix_LoadMUS() Error loading '%s': %s", path.c_str(), - Mix_GetError()); - } - - return music; + return resman->getMusic(paths.getStringValue("music") + fileName); } -void Sound::playMusic(const std::string &filename) +void Sound::playMusic(const std::string &fileName) { - mCurrentMusicFile = filename; + mCurrentMusicFile = fileName; if (!mInstalled || !mPlayMusic) return; haltMusic(); - if (!filename.empty() && (mMusic = loadMusic(filename))) - Mix_PlayMusic(mMusic, -1); // Loop forever + if (!fileName.empty()) + { + mMusic = loadMusic(fileName); + if (mMusic) + mMusic->play(); + } } void Sound::stopMusic() { - if (!mInstalled) - return; - - logger->log1("Sound::stopMusic()"); - - if (mMusic) - { - Mix_HaltMusic(); - Mix_FreeMusic(mMusic); - mMusic = nullptr; - } + haltMusic(); } -void Sound::fadeInMusic(const std::string &path, int ms) +void Sound::fadeInMusic(const std::string &fileName, int ms) { - mCurrentMusicFile = path; + mCurrentMusicFile = fileName; if (!mInstalled || !mPlayMusic) return; haltMusic(); - if ((mMusic = loadMusic(path.c_str()))) - Mix_FadeInMusic(mMusic, -1, ms); // Loop forever + if (!fileName.empty()) + { + mMusic = loadMusic(fileName); + if (mMusic) + mMusic->play(-1, ms); + } } void Sound::fadeOutMusic(int ms) @@ -285,9 +251,9 @@ void Sound::fadeOutMusic(int ms) } } -void Sound::fadeOutAndPlayMusic(const std::string &path, int ms) +void Sound::fadeOutAndPlayMusic(const std::string &fileName, int ms) { - mNextMusicPath = path; + mNextMusicFile = fileName; fadeOutMusic(ms); } @@ -297,15 +263,15 @@ void Sound::logic() { if (mMusic) { - Mix_FreeMusic(mMusic); + mMusic->decRef(); mMusic = nullptr; } sFadingOutEnded = false; - if (!mNextMusicPath.empty()) + if (!mNextMusicFile.empty()) { - playMusic(mNextMusicPath); - mNextMusicPath.clear(); + playMusic(mNextMusicFile); + mNextMusicFile.clear(); } } } @@ -349,9 +315,13 @@ void Sound::playGuiSfx(const std::string &path) if (!mInstalled || path.empty() || !mPlayGui) return; + std::string tmpPath; + if (!path.compare(0, 4, "sfx/")) + tmpPath = path; + else + tmpPath = paths.getValue("sfx", "sfx/") + path; ResourceManager *resman = ResourceManager::getInstance(); - SoundEffect *sample = resman->getSoundEffect( - paths.getStringValue("sfx") + path); + SoundEffect *sample = resman->getSoundEffect(tmpPath); if (sample) { logger->log("Sound::playGuiSfx() Playing: %s", path.c_str()); @@ -379,8 +349,11 @@ void Sound::haltMusic() return; Mix_HaltMusic(); - Mix_FreeMusic(mMusic); - mMusic = nullptr; + if (mMusic) + { + mMusic->decRef(); + mMusic = nullptr; + } } void Sound::changeAudio() diff --git a/src/sound.h b/src/sound.h index 16fff161b..869f136da 100644 --- a/src/sound.h +++ b/src/sound.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -29,6 +29,8 @@ #include <string> +class Music; + /** Sound engine * * \ingroup CORE @@ -54,9 +56,9 @@ class Sound : public ConfigListener /** * Starts background music. * - * @param path The full path to the music file. + * @param fileName The name of the music file. */ - void playMusic(const std::string &path); + void playMusic(const std::string &fileName); /** * Stops currently running background music track. @@ -66,10 +68,10 @@ class Sound : public ConfigListener /** * Fades in background music. * - * @param path The full path to the music file. - * @param ms Duration of fade-in effect (ms) + * @param fileName The name of the music file. + * @param ms Duration of fade-in effect (ms) */ - void fadeInMusic(const std::string &path, int ms = 1000); + void fadeInMusic(const std::string &fileName, int ms = 1000); /** * Fades out currently running background music track. @@ -81,15 +83,16 @@ class Sound : public ConfigListener /** * Fades out a background music and play a new one. * - * @param path The full path to the fade in music file. - * @param ms Duration of fade-out effect (ms) + * @param fileName The name of the music file. + * @param ms Duration of fade-out effect (ms) */ - void fadeOutAndPlayMusic(const std::string &path, int ms = 1000); + void fadeOutAndPlayMusic(const std::string &fileName, int ms = 1000); int getMaxVolume() const { return MIX_MAX_VOLUME; } void setMusicVolume(int volume); + void setSfxVolume(int volume); /** @@ -133,7 +136,7 @@ class Sound : public ConfigListener * When calling fadeOutAndPlayMusic(), * the music file below will then be played */ - std::string mNextMusicPath; + std::string mNextMusicFile; bool mInstalled; @@ -141,7 +144,7 @@ class Sound : public ConfigListener int mMusicVolume; std::string mCurrentMusicFile; - Mix_Music *mMusic; + Music *mMusic; bool mPlayBattle; bool mPlayGui; bool mPlayMusic; diff --git a/src/sprite.h b/src/sprite.h index 64721b740..ffee97d49 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index f7bffc31f..a7e06a2f4 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -37,7 +37,7 @@ #define STATUS_EFFECTS_FILE "status-effects.xml" -void unloadMap(std::map<int, StatusEffect *> map); +void unloadMap(std::map<int, StatusEffect *> &map); bool StatusEffect::mLoaded = false; @@ -130,9 +130,9 @@ void StatusEffect::load() unload(); XML::Document doc(STATUS_EFFECTS_FILE); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "status-effects")) + if (!rootNode || !xmlNameEqual(rootNode, "status-effects")) { logger->log1("Error loading status effects file: " STATUS_EFFECTS_FILE); @@ -145,7 +145,7 @@ void StatusEffect::load() int index = atoi(XML::getProperty(node, "id", "-1").c_str()); - if (xmlStrEqual(node->name, BAD_CAST "status-effect")) + if (xmlNameEqual(node, "status-effect")) { the_map = &statusEffects; int block_index = atoi(XML::getProperty( @@ -155,8 +155,10 @@ void StatusEffect::load() blockEffectIndexMap[block_index] = index; } - else if (xmlStrEqual(node->name, BAD_CAST "stun-effect")) + else if (xmlNameEqual(node, "stun-effect")) + { the_map = &stunEffects; + } if (the_map) { @@ -187,7 +189,7 @@ void StatusEffect::load() mLoaded = true; } -void unloadMap(std::map<int, StatusEffect *> map) +void unloadMap(std::map<int, StatusEffect *> &map) { std::map<int, StatusEffect *>::iterator it; diff --git a/src/statuseffect.h b/src/statuseffect.h index 8af1607a5..326a0d3c1 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp new file mode 100644 index 000000000..d3caa8938 --- /dev/null +++ b/src/test/testlauncher.cpp @@ -0,0 +1,172 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#include "test/testlauncher.h" + +#include "client.h" +#include "configuration.h" +#include "graphics.h" +#include "localconsts.h" +#include "logger.h" +#include "sound.h" + +#include "gui/theme.h" + +#include "utils/gettext.h" +#include "utils/mkdir.h" +#include "utils/stringutils.h" + +#include "resources/image.h" +#include "resources/wallpaper.h" + +#include <unistd.h> + +#ifdef WIN32 +#include <windows.h> +#define sleep(seconds) Sleep((seconds) * 1000) +#endif + +//#include <unistd.h> + +#include "debug.h" + +TestLauncher::TestLauncher(std::string test) : + mTest(test) +{ + file.open((Client::getLocalDataDirectory() + + std::string("/test.log")).c_str(), std::ios::out); +} + +TestLauncher::~TestLauncher() +{ + file.close(); +} + +int TestLauncher::exec() +{ + if (mTest == "1" || mTest == "2" || mTest == "3") + return testBackend(); + else if (mTest == "4") + return testSound(); + else if (mTest == "5" || mTest == "6" || mTest == "7") + return testRescale(); + else if (mTest == "8" || mTest == "9" || mTest == "10") + return testFps(); + + return -1; +} + +int TestLauncher::testBackend() +{ + Image *img = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif"); + if (!img) + return 1; + int cnt = 100; + + for (int f = 0; f < cnt; f ++) + { + mainGraphics->drawImage(img, cnt * 7, cnt * 5); + mainGraphics->updateScreen(); + } + + sleep(1); + return 0; +} + +int TestLauncher::testSound() +{ + sound.playGuiSfx("system/newmessage.ogg"); + sleep(1); + sound.playSfx("system/newmessage.ogg", 0, 0); + sound.playMusic("sfx/system/newmessage.ogg"); + sleep(3); + sound.stopMusic(); + return 0; +} + +int TestLauncher::testRescale() +{ + Wallpaper::loadWallpapers(); + const std::string wallpaperName = Wallpaper::getWallpaper(800, 600); + volatile Image *img = Theme::getImageFromTheme(wallpaperName); + if (!img) + return 1; + + sleep(1); + return 0; +} + +int TestLauncher::testFps() +{ + timeval start; + timeval end; + + Wallpaper::loadWallpapers(); + Wallpaper::getWallpaper(800, 600); + Image *img[4]; + + img[0] = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif"); + img[1] = Theme::getImageFromTheme("graphics/sprites/arrow_down.gif"); + img[2] = Theme::getImageFromTheme("graphics/sprites/arrow_left.gif"); + img[3] = Theme::getImageFromTheme("graphics/sprites/arrow_right.gif"); + int idx = 0; + + int cnt = 500; + + gettimeofday(&start, nullptr); + for (int k = 0; k < cnt; k ++) + { + for (int x = 0; x < 800; x += 20) + { + for (int y = 0; y < 600; y += 25) + { + mainGraphics->drawImage(img[idx], x, y); + idx ++; + if (idx > 3) + idx = 0; + } + } + mainGraphics->updateScreen(); + } + + gettimeofday(&end, nullptr); + int tFps = calcFps(&start, &end, cnt); + file << mTest << std::endl; + file << tFps << std::endl; + + sleep(1); + return 0; +} + +int TestLauncher::calcFps(timeval *start, timeval *end, int calls) +{ + long mtime; + long seconds; + long useconds; + + seconds = end->tv_sec - start->tv_sec; + useconds = end->tv_usec - start->tv_usec; + + mtime = (seconds * 1000 + useconds / 1000.0) + 0.5; + if (mtime == 0) + return 100000; + + return static_cast<long>(calls) * 1000 / mtime; +} diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h new file mode 100644 index 000000000..b1031a9c1 --- /dev/null +++ b/src/test/testlauncher.h @@ -0,0 +1,54 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef TEST_TESTLAUNCHER_H +#define TEST_TESTLAUNCHER_H + +#include "logger.h" + +#include <string> +#include <sys/time.h> + +class TestLauncher +{ + public: + TestLauncher(std::string test); + + ~TestLauncher(); + + int exec(); + + int calcFps(timeval *start, timeval *end, int calls); + + int testBackend(); + + int testSound(); + + int testRescale(); + + int testFps(); + + private: + std::string mTest; + + std::ofstream file; +}; + +#endif // TEST_TESTLAUNCHER_H diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp new file mode 100644 index 000000000..70fcfc346 --- /dev/null +++ b/src/test/testmain.cpp @@ -0,0 +1,287 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#include "test/testmain.h" + +#include "utils/gettext.h" + +#include "client.h" +#include "configuration.h" +#include "localconsts.h" + +#include "utils/gettext.h" +#include "utils/mkdir.h" +#include "utils/stringutils.h" +#include "utils/process.h" + +#include <iostream> + +#include "debug.h" + +std::string fileName = ""; +extern char *selfName; + +TestMain::TestMain() +{ +#ifdef WIN32 + fileName = "manaplus.exe"; +#else + fileName = selfName; +#endif + + log = new Logger; +// log->setLogFile(Client::getLocalDataDirectory() +// + std::string("/test.log")); + log->setLogFile(Client::getLocalDataDirectory() + + std::string("/manaplustest.log")); +} + +void TestMain::initConfig() +{ + config.init(Client::getConfigDirectory() + "/test.xml"); +// config.setDefaultValues(getConfigDefaults()); + + config.setValue("hwaccel", false); + config.setValue("screen", false); + config.setValue("sound", false); + config.setValue("guialpha", 0.8f); + config.setValue("remember", true); + config.setValue("sfxVolume", 50); + config.setValue("musicVolume", 60); + config.setValue("fpslimit", 0); + config.setValue("customcursor", true); + config.setValue("useScreenshotDirectorySuffix", true); + config.setValue("ChatLogLength", 128); + config.setValue("screenwidth", 800); + config.setValue("screenheight", 600); +} + +int TestMain::exec() +{ + initConfig(); + int softwareTest = invokeSoftwareRenderTest("1"); + int fastOpenGLTest = invokeFastOpenGLRenderTest("2"); + int safeOpenGLTest = invokeSafeOpenGLRenderTest("3"); + int soundTest = invokeTest4(); + int rescaleTest[3]; + int softFps = 0; + int fastOpenGLFps = 0; + int safeOpenGLFps = 0; + + int openGLMode = 0; + int maxFps = 0; + rescaleTest[0] = -1; + rescaleTest[1] = -1; + rescaleTest[2] = -1; + std::string info; + + info += strprintf("%d.%d,%d,%d.", soundTest, softwareTest, + fastOpenGLTest, safeOpenGLTest); + + if (!softwareTest) + { + int softFpsTest = invokeSoftwareRenderTest("8"); + info += strprintf ("%d", softFpsTest); + if (!softFpsTest) + { + softFps = readValue(8); + info += strprintf (",%d", softFps); + if (!softFps) + { + softwareTest = -1; + softFpsTest = -1; + } + else + { + rescaleTest[0] = invokeSoftwareRenderTest("5"); + info += strprintf (",%d", rescaleTest[0]); + } + } + else + { + softwareTest = -1; + } + } + info += "."; + if (!fastOpenGLTest) + { + int fastOpenGLFpsTest = invokeFastOpenGLRenderTest("9"); + info += strprintf ("%d", fastOpenGLFpsTest); + if (!fastOpenGLFpsTest) + { + fastOpenGLFps = readValue(9); + info += strprintf (",%d", fastOpenGLFps); + if (!fastOpenGLFps) + { + fastOpenGLTest = -1; + fastOpenGLFpsTest = -1; + } + else + { + rescaleTest[1] = invokeFastOpenGLRenderTest("6"); + info += strprintf (",%d", rescaleTest[1]); + } + } + else + { + fastOpenGLTest = -1; + } + } + info += "."; + if (!safeOpenGLTest) + { + int safeOpenGLFpsTest = invokeSafeOpenGLRenderTest("10"); + info += strprintf ("%d", safeOpenGLFpsTest); + if (!safeOpenGLFpsTest) + { + safeOpenGLFps = readValue(10); + info += strprintf (",%d", safeOpenGLFps); + if (!safeOpenGLFps) + { + safeOpenGLTest = -1; + safeOpenGLFpsTest = -1; + } + else + { + rescaleTest[2] = invokeSafeOpenGLRenderTest("7"); + info += strprintf (",%d", rescaleTest[2]); + } + } + else + { + safeOpenGLTest = -1; + } + } + info += "."; + + maxFps = softFps; + if (maxFps < fastOpenGLFps) + { + openGLMode = 1; + maxFps = fastOpenGLFps; + } + if (maxFps < safeOpenGLFps) + { + openGLMode = 2; + maxFps = safeOpenGLFps; + } + + writeConfig(openGLMode, rescaleTest[openGLMode], soundTest, info); + return 0; +} + +void TestMain::writeConfig(int openGLMode, int rescale, + int sound, std::string info) +{ + config.init(Client::getConfigDirectory() + "/config.xml"); + + // searched values + config.setValue("opengl", openGLMode); + config.setValue("showBackground", !rescale); + config.setValue("sound", !sound); + + // better perfomance + config.setValue("hwaccel", true); + config.setValue("fpslimit", 60); + config.setValue("altfpslimit", 2); + config.setValue("safemode", false); + config.setValue("enableMapReduce", true); + + // stats + config.setValue("testInfo", info); + + config.write(); +} + +int TestMain::readValue(int ver, int def) +{ + std::string tmp; + int var; + file.open((Client::getLocalDataDirectory() + + std::string("/test.log")).c_str(), std::ios::in); + if (!getline(file, tmp)) + { + file.close(); + return def; + } + var = atoi(tmp.c_str()); + if (ver != var || !getline(file, tmp)) + { + file.close(); + return def; + } + def = atoi(tmp.c_str()); + file.close(); + log->log("value for %d = %d", ver, def); + return def; +} + +int TestMain::invokeTest(std::string test) +{ + config.setValue("opengl", 0); + + config.write(); + int ret = execFile(fileName, fileName, "-t", test); + return ret; +} + +int TestMain::invokeTest4() +{ + config.setValue("sound", true); + int ret = invokeTest("4"); + + log->log("4: %d", ret); + return ret; +} + +int TestMain::invokeSoftwareRenderTest(std::string test) +{ + config.setValue("opengl", 0); + config.write(); + int ret = execFile(fileName, fileName, "-t", test, 30); + log->log("%s: %d", test.c_str(), ret); + return ret; +} + +int TestMain::invokeFastOpenGLRenderTest(std::string test) +{ +#if defined USE_OPENGL + config.setValue("opengl", 1); + config.write(); + int ret = execFile(fileName, fileName, "-t", test, 30); + log->log("%s: %d", test.c_str(), ret); + return ret; +#else + return -1; +#endif +} + +int TestMain::invokeSafeOpenGLRenderTest(std::string test) +{ +#if defined USE_OPENGL + config.setValue("opengl", 2); + config.write(); + int ret = execFile(fileName, fileName, "-t", test, 30); + log->log("%s: %d", test.c_str(), ret); + return ret; +#else + return -1; +#endif +} diff --git a/src/test/testmain.h b/src/test/testmain.h new file mode 100644 index 000000000..8e5ce162f --- /dev/null +++ b/src/test/testmain.h @@ -0,0 +1,64 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef TEST_TESTMAIN_H +#define TEST_TESTMAIN_H + +#include "logger.h" + +#include <string> + +class TestMain +{ + public: + TestMain(); + + int exec(); + + private: + void initConfig(); + + int readValue(int ver, int def = 0); + + int invokeTest(std::string test); + + int invokeTest3(); + + int invokeTest4(); + + int invokeTest7(); + + int invokeSoftwareRenderTest(std::string test); + + int invokeFastOpenGLRenderTest(std::string test); + + int invokeSafeOpenGLRenderTest(std::string test); + + void testsMain(); + + void writeConfig(int openGLMode, int rescale, + int sound, std::string info); + + Logger *log; + + std::ifstream file; +}; + +#endif // TEST_TESTMAIN_H diff --git a/src/text.cpp b/src/text.cpp index bb480811f..4d54dd431 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net> * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/text.h b/src/text.h index 2b0eaa97b..25fbe66f0 100644 --- a/src/text.h +++ b/src/text.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net> * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -26,6 +26,7 @@ #include "graphics.h" #include "guichanfwd.h" +#include "localconsts.h" #include <guichan/color.hpp> @@ -42,7 +43,7 @@ class Text Text(const std::string &text, int x, int y, gcn::Graphics::Alignment alignment, const gcn::Color *color, bool isSpeech = false, - gcn::Font *font = 0); + gcn::Font *font = nullptr); /** * Destructor. The text is removed from the screen. @@ -90,7 +91,7 @@ class FlashText : public Text FlashText(const std::string &text, int x, int y, gcn::Graphics::Alignment alignment, const gcn::Color* color, - gcn::Font *font = 0); + gcn::Font *font = nullptr); /** * Remove the text from the screen diff --git a/src/textparticle.cpp b/src/textparticle.cpp index 02cc97459..d8c0b7a8e 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/textparticle.h b/src/textparticle.h index b37f25732..c85aff476 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/textrenderer.h b/src/textrenderer.h index 8fe2c5954..9309c5415 100644 --- a/src/textrenderer.h +++ b/src/textrenderer.h @@ -2,7 +2,7 @@ * Text Renderer * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/tileset.h b/src/tileset.h index 0867e5716..c21d6948a 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/units.cpp b/src/units.cpp index edf9c749a..804512dbd 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -2,7 +2,7 @@ * Support for custom units * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -100,9 +100,9 @@ void Units::loadUnits() } XML::Document doc("units.xml"); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "units")) + if (!root || !xmlNameEqual(root, "units")) { logger->log1("Error loading unit definition file: units.xml"); return; @@ -110,7 +110,7 @@ void Units::loadUnits() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "unit")) + if (xmlNameEqual(node, "unit")) { struct UnitDescription ud; int level = 1; @@ -127,7 +127,7 @@ void Units::loadUnits() for_each_xml_child_node(uLevel, node) { - if (xmlStrEqual(uLevel->name, BAD_CAST "level")) + if (xmlNameEqual(uLevel, "level")) { struct UnitLevel ul; ul.symbol = XML::getProperty(uLevel, "symbol", diff --git a/src/units.h b/src/units.h index 7705a9bd4..ba1f720e3 100644 --- a/src/units.h +++ b/src/units.h @@ -2,7 +2,7 @@ * Support for custom units * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/checkutils.cpp b/src/utils/checkutils.cpp new file mode 100644 index 000000000..64bb42d0c --- /dev/null +++ b/src/utils/checkutils.cpp @@ -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 <http://www.gnu.org/licenses/>. + */ + +#include "utils/checkutils.h" + +#include <string.h> + +#include "logger.h" + +bool reportFalseReal(bool val, const char* file, unsigned line) +{ + if (!val) + logger->log("Debug: false value at %s:%u", file, line); + return val; +} + +bool reportTrueReal(bool val, const char* file, unsigned line) +{ + if (val) + logger->log("Debug: true value at %s:%u", file, line); + return val; +} diff --git a/src/utils/checkutils.h b/src/utils/checkutils.h new file mode 100644 index 000000000..6791ff7e0 --- /dev/null +++ b/src/utils/checkutils.h @@ -0,0 +1,30 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef UTILS_CHECKUTILS_H +#define UTILS_CHECKUTILS_H + +#include <string> + +bool reportFalseReal(bool val, const char* file, unsigned line); + +bool reportTrueReal(bool val, const char* file, unsigned line); + +#endif // UTILS_CHECKUTILS_H diff --git a/src/utils/dtor.h b/src/utils/dtor.h index fbe903ced..54fa11549 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/gettext.h b/src/utils/gettext.h index 696f0d4bf..8bb41a4cb 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h index 40a9e5d79..9f6818146 100644 --- a/src/utils/mathutils.h +++ b/src/utils/mathutils.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp index dc2ab63ef..582c9c7dc 100644 --- a/src/utils/mkdir.cpp +++ b/src/utils/mkdir.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h index deff75475..8c5ab4ca2 100644 --- a/src/utils/mkdir.h +++ b/src/utils/mkdir.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 03dac2e7a..a97a8d3f8 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index 3cc35cb55..8decb6e95 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -43,6 +43,8 @@ std::string getRealPath(const std::string &str) #else char *realPath = realpath(str.c_str(), nullptr); #endif + if (!realPath) + return ""; path = realPath; free(realPath); return path; diff --git a/src/utils/paths.h b/src/utils/paths.h index 1723bf6c4..804900587 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/physfsrwops.cpp b/src/utils/physfsrwops.cpp new file mode 100644 index 000000000..1960f0dee --- /dev/null +++ b/src/utils/physfsrwops.cpp @@ -0,0 +1,186 @@ +/* + * This code provides a glue layer between PhysicsFS and Simple Directmedia + * Layer's (SDL) RWops i/o abstraction. + * + * License: this code is public domain. I make no warranty that it is useful, + * correct, harmless, or environmentally safe. + * + * This particular file may be used however you like, including copying it + * verbatim into a closed-source project, exploiting it commercially, and + * removing any trace of my name from the source (although I hope you won't + * do that). I welcome enhancements and corrections to this file, but I do + * not require you to send me patches if you make changes. This code has + * NO WARRANTY. + * + * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. + * Please see LICENSE.txt in the root of the source tree. + * + * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/ + * + * This file was written by Ryan C. Gordon. (icculus@icculus.org). + * + * Copyright (C) 2012 The ManaPlus Developers + */ + +#include <stdio.h> /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */ +#include "utils/physfsrwops.h" + +#include "localconsts.h" + +static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) +{ + PHYSFS_file *handle = (PHYSFS_file *) rw->hidden.unknown.data1; + int pos = 0; + + if (whence == SEEK_SET) + { + pos = offset; + } /* if */ + else if (whence == SEEK_CUR) + { + PHYSFS_sint64 current = PHYSFS_tell(handle); + if (current == -1) + { + SDL_SetError("Can't find position in file: %s", + PHYSFS_getLastError()); + return -1; + } /* if */ + + pos = (int)current; + if (((PHYSFS_sint64)pos) != current) + { + SDL_SetError("Can't fit current file position in an int!"); + return -1; + } /* if */ + + if (offset == 0) /* this is a "tell" call. We're done. */ + return pos; + + pos += offset; + } /* else if */ + else if (whence == SEEK_END) + { + PHYSFS_sint64 len = PHYSFS_fileLength(handle); + if (len == -1) + { + SDL_SetError("Can't find end of file: %s", PHYSFS_getLastError()); + return -1; + } /* if */ + + pos = (int)len; + if (((PHYSFS_sint64)pos) != len) + { + SDL_SetError("Can't fit end-of-file position in an int!"); + return -1; + } /* if */ + + pos += offset; + } /* else if */ + else + { + SDL_SetError("Invalid 'whence' parameter."); + return -1; + } /* else */ + + if ( pos < 0 ) + { + SDL_SetError("Attempt to seek past start of file."); + return -1; + } /* if */ + + if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos)) + { + SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + return -1; + } /* if */ + + return pos; +} /* physfsrwops_seek */ + +static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum) +{ + PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1; + PHYSFS_sint64 rc = PHYSFS_read(handle, ptr, size, maxnum); + if (rc != maxnum) + { + if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */ + SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + } /* if */ + + return (int)rc; +} /* physfsrwops_read */ + +static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num) +{ + PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1; + PHYSFS_sint64 rc = PHYSFS_write(handle, ptr, size, num); + if (rc != num) + SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + + return (int) rc; +} /* physfsrwops_write */ + +static int physfsrwops_close(SDL_RWops *rw) +{ + PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1; + if (!PHYSFS_close(handle)) + { + SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + return -1; + } /* if */ + + SDL_FreeRW(rw); + return 0; +} /* physfsrwops_close */ + +static SDL_RWops *create_rwops(PHYSFS_file *handle) +{ + SDL_RWops *retval = nullptr; + + if (!handle) + { + SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); + } + else + { + retval = SDL_AllocRW(); + if (retval) + { + retval->seek = physfsrwops_seek; + retval->read = physfsrwops_read; + retval->write = physfsrwops_write; + retval->close = physfsrwops_close; + retval->hidden.unknown.data1 = handle; + } /* if */ + } /* else */ + + return retval; +} /* create_rwops */ + +SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle) +{ + SDL_RWops *retval = nullptr; + if (!handle) + SDL_SetError("NULL pointer passed to PHYSFSRWOPS_makeRWops()."); + else + retval = create_rwops(handle); + + return retval; +} /* PHYSFSRWOPS_makeRWops */ + +SDL_RWops *PHYSFSRWOPS_openRead(const char *fname) +{ + return create_rwops(PHYSFS_openRead(fname)); +} /* PHYSFSRWOPS_openRead */ + +SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname) +{ + return create_rwops(PHYSFS_openWrite(fname)); +} /* PHYSFSRWOPS_openWrite */ + +SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname) +{ + return create_rwops(PHYSFS_openAppend(fname)); +} /* PHYSFSRWOPS_openAppend */ + +/* end of physfsrwops.c ... */ diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h new file mode 100644 index 000000000..efa004ac6 --- /dev/null +++ b/src/utils/physfsrwops.h @@ -0,0 +1,82 @@ +/* + * This code provides a glue layer between PhysicsFS and Simple Directmedia + * Layer's (SDL) RWops i/o abstraction. + * + * License: this code is public domain. I make no warranty that it is useful, + * correct, harmless, or environmentally safe. + * + * This particular file may be used however you like, including copying it + * verbatim into a closed-source project, exploiting it commercially, and + * removing any trace of my name from the source (although I hope you won't + * do that). I welcome enhancements and corrections to this file, but I do + * not require you to send me patches if you make changes. This code has + * NO WARRANTY. + * + * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. + * Please see LICENSE.txt in the root of the source tree. + * + * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/ + * + * This file was written by Ryan C. Gordon. (icculus@icculus.org). + * + * Copyright (C) 2012 The ManaPlus Developers + */ + +#ifndef UTILS_PHYSFSRWOPS_H +#define UTILS_PHYSFSRWOPS_H + +#include <physfs.h> +#include <SDL.h> + +/** + * Open a platform-independent filename for reading, and make it accessible + * via an SDL_RWops structure. The file will be closed in PhysicsFS when the + * RWops is closed. PhysicsFS should be configured to your liking before + * opening files through this method. + * + * @param filename File to open in platform-independent notation. + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); + +/** + * Open a platform-independent filename for writing, and make it accessible + * via an SDL_RWops structure. The file will be closed in PhysicsFS when the + * RWops is closed. PhysicsFS should be configured to your liking before + * opening files through this method. + * + * @param filename File to open in platform-independent notation. + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); + +/** + * Open a platform-independent filename for appending, and make it accessible + * via an SDL_RWops structure. The file will be closed in PhysicsFS when the + * RWops is closed. PhysicsFS should be configured to your liking before + * opening files through this method. + * + * @param filename File to open in platform-independent notation. + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); + +/** + * Make a SDL_RWops from an existing PhysicsFS file handle. You should + * dispose of any references to the handle after successful creation of + * the RWops. The actual PhysicsFS handle will be destroyed when the + * RWops is closed. + * + * @param handle a valid PhysicsFS file handle. + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); + +#endif /* include-once blocker */ + +/* end of physfsrwops.h ... */ + diff --git a/src/utils/process.cpp b/src/utils/process.cpp new file mode 100644 index 000000000..4a2081514 --- /dev/null +++ b/src/utils/process.cpp @@ -0,0 +1,172 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#include "utils/process.h" + +#include <string.h> +#include <cstdarg> +#include <cstdio> + +#include <stdlib.h> +#include <unistd.h> + +#include "localconsts.h" + +#include "debug.h" + +const int timeOut = 10; + +#ifdef WIN32 + +#include <windows.h> + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + if (!waitTime) + waitTime = timeOut; + + STARTUPINFO siStartupInfo; + PROCESS_INFORMATION piProcessInfo; + memset(&siStartupInfo, 0, sizeof(siStartupInfo)); + memset(&piProcessInfo, 0, sizeof(piProcessInfo)); + siStartupInfo.cb = sizeof(siStartupInfo); + DWORD ret = -1; + std::string args(pathName + " " + arg1); + if (!arg2.empty()) + args += " " + arg2; + + if (CreateProcess(pathName.c_str(), (char*)args.c_str(), 0, 0, false, + CREATE_DEFAULT_ERROR_MODE, 0, 0, &siStartupInfo, + &piProcessInfo) != false) + { + if (!WaitForSingleObject(piProcessInfo.hProcess, timeOut * 1000)) + { + if (GetExitCodeProcess(piProcessInfo.hProcess, &ret)) + { + CloseHandle(piProcessInfo.hProcess); + CloseHandle(piProcessInfo.hThread); + return ret; + } + } + TerminateProcess(piProcessInfo.hProcess, -1); + } + + CloseHandle(piProcessInfo.hProcess); + CloseHandle(piProcessInfo.hThread); + return -1; +} + +#elif defined(__APPLE__) + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + return -1; +} + +#elif defined __linux__ || defined __linux + +#include <sys/types.h> +#include <sys/wait.h> + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + pid_t mon_pid; + int status; + + if (!waitTime) + waitTime = timeOut; + + if ((mon_pid = fork()) == -1) + { // fork error + return -1; + } + else if (!mon_pid) + { // monitoring child + pid_t pid; + if ((pid = fork()) == -1) + { // fork error + return -1; + } + else if (!pid) + { // work child + if (arg2.empty()) + { + execl(pathName.c_str(), name.c_str(), + arg1.c_str(), (char *)nullptr); + } + else + { + execl(pathName.c_str(), name.c_str(), + arg1.c_str(), arg2.c_str(), (char *)nullptr); + } + exit(-1); + } + + // monitoring process + pid_t sleep_pid; + if ((sleep_pid = fork()) == -1) + { // fork error + return -1; + } + else if (!sleep_pid) + { // sleep pid + sleep (timeOut); +// printf ("time out\n"); + exit(-1); + } + + // monitoring process + pid_t exited_pid = wait(&status); + int ret = -1; + if (exited_pid == pid) + { + kill(sleep_pid, SIGKILL); + if (WIFEXITED(status)) + ret = WEXITSTATUS(status); + } + else + { + kill(pid, SIGKILL); + ret = -1; + } + wait(nullptr); + exit(ret); + } + + // monitoring parent + waitpid(mon_pid, &status, 0); + if (WIFEXITED(status)) + return WEXITSTATUS(status); + + return -1; +} + +#else + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + return -1; +} + +#endif diff --git a/src/utils/process.h b/src/utils/process.h new file mode 100644 index 000000000..12421729f --- /dev/null +++ b/src/utils/process.h @@ -0,0 +1,29 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef UTILS_PROCESS_H +#define UTILS_PROCESS_H + +#include <string> + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime = 0); + +#endif // UTILS_PROCESS_H diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp index 523c021a4..ac9c78b2a 100644 --- a/src/utils/sha256.cpp +++ b/src/utils/sha256.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file has been slighly modified as part of The ManaPlus Client. * diff --git a/src/utils/sha256.h b/src/utils/sha256.h index aa2468d56..54bb92f3c 100644 --- a/src/utils/sha256.h +++ b/src/utils/sha256.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp index fae0fbf47..9690a9fb7 100644 --- a/src/utils/specialfolder.cpp +++ b/src/utils/specialfolder.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h index 571817370..8eb00a637 100644 --- a/src/utils/specialfolder.h +++ b/src/utils/specialfolder.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 39f14a646..26accbc7d 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -509,6 +509,19 @@ std::vector<std::string> getLang() 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 packList(std::list<std::string> &list) { std::list<std::string>::const_iterator i = list.begin(); @@ -612,3 +625,13 @@ 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 273fa0c8c..5cb726eef 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -188,6 +188,8 @@ std::string combineDye2(std::string file, std::string dye); std::vector<std::string> getLang(); +std::string getLangSimple(); + std::string packList(std::list<std::string> &list); std::list<std::string> unpackList(const std::string &str); @@ -206,4 +208,6 @@ bool findCutFirst(std::string &str1, std::string str2); std::string &removeProtocol(std::string &url); +bool checkPath(std::string path); + #endif // UTILS_STRINGUTILS_H diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 10436067f..420915d8f 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -32,6 +32,11 @@ #include "debug.h" +static void xmlNullLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) +{ + // Does nothing, that's the whole point of it +} + namespace XML { Document::Document(const std::string &filename, bool useResman): @@ -96,12 +101,12 @@ namespace XML xmlFreeDoc(mDoc); } - xmlNodePtr Document::rootNode() + XmlNodePtr Document::rootNode() { return mDoc ? xmlDocGetRootElement(mDoc) : nullptr; } - int getProperty(xmlNodePtr node, const char* name, int def) + int getProperty(XmlNodePtr node, const char* name, int def) { int &ret = def; @@ -115,7 +120,7 @@ namespace XML return ret; } - double getFloatProperty(xmlNodePtr node, const char* name, double def) + double getFloatProperty(XmlNodePtr node, const char* name, double def) { double &ret = def; @@ -129,7 +134,7 @@ namespace XML return ret; } - std::string getProperty(xmlNodePtr node, const char *name, + std::string getProperty(XmlNodePtr node, const char *name, const std::string &def) { xmlChar *prop = xmlGetProp(node, BAD_CAST name); @@ -143,7 +148,7 @@ namespace XML return def; } - bool getBoolProperty(xmlNodePtr node, const char* name, bool def) + bool getBoolProperty(XmlNodePtr node, const char* name, bool def) { xmlChar *prop = xmlGetProp(node, BAD_CAST name); @@ -154,15 +159,32 @@ namespace XML return def; } - xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name) + XmlNodePtr findFirstChildByName(XmlNodePtr parent, const char *name) { for_each_xml_child_node(child, parent) { - if (xmlStrEqual(child->name, BAD_CAST name)) + if (xmlNameEqual(child, name)) return child; } return nullptr; } + // Initialize libxml2 and check for potential ABI mismatches between + // compiled version and the shared library actually used. + void initXML() + { + xmlInitParser(); + LIBXML_TEST_VERSION; + + // Suppress libxml2 error messages + xmlSetGenericErrorFunc(nullptr, xmlNullLogger); + } + + // Shutdown libxml + void cleanupXML() + { + xmlCleanupParser(); + } + } // namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index 7bcec2c83..f623fa618 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -23,10 +23,16 @@ #ifndef XML_H #define XML_H +#include <libxml/encoding.h> +#include <libxml/xmlwriter.h> #include <libxml/tree.h> #include <string> +#define XmlNodePtr xmlNodePtr +#define xmlNameEqual(node, str) xmlStrEqual((node)->name, BAD_CAST (str)) +#define XmlTextWriterPtr xmlTextWriterPtr + /** * XML helper functions. */ @@ -63,40 +69,44 @@ namespace XML * Returns the root node of the document (or NULL if there was a * load error). */ - xmlNodePtr rootNode(); + XmlNodePtr rootNode(); private: xmlDocPtr mDoc; }; /** - * Gets an floating point property from an xmlNodePtr. + * Gets an floating point property from an XmlNodePtr. */ - double getFloatProperty(xmlNodePtr node, const char *name, double def); + double getFloatProperty(XmlNodePtr node, const char *name, double def); /** - * Gets an integer property from an xmlNodePtr. + * Gets an integer property from an XmlNodePtr. */ - int getProperty(xmlNodePtr node, const char *name, int def); + int getProperty(XmlNodePtr node, const char *name, int def); /** - * Gets a string property from an xmlNodePtr. + * Gets a string property from an XmlNodePtr. */ - std::string getProperty(xmlNodePtr node, const char *name, + std::string getProperty(XmlNodePtr node, const char *name, const std::string &def); /** - * Gets a boolean property from an xmlNodePtr. + * Gets a boolean property from an XmlNodePtr. */ - bool getBoolProperty(xmlNodePtr node, const char *name, bool def); + bool getBoolProperty(XmlNodePtr node, const char *name, bool def); /** * Finds the first child node with the given name */ - xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name); + XmlNodePtr findFirstChildByName(XmlNodePtr parent, const char *name); + + void initXML(); + + void cleanupXML(); } #define for_each_xml_child_node(var, parent) \ - for (xmlNodePtr var = parent->xmlChildrenNode; var; var = var->next) + for (XmlNodePtr var = parent->xmlChildrenNode; var; var = var->next) #endif // XML_H diff --git a/src/variabledata.h b/src/variabledata.h index 73eca2198..e5516bd9f 100644 --- a/src/variabledata.h +++ b/src/variabledata.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/vector.cpp b/src/vector.cpp index c234dea4c..e134a777a 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/vector.h b/src/vector.h index 0f10bae96..744b235c0 100644 --- a/src/vector.h +++ b/src/vector.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/tools/update-copyright.sh b/tools/update-copyright.sh index 8f924f53c..6cebcd564 100755 --- a/tools/update-copyright.sh +++ b/tools/update-copyright.sh @@ -1,18 +1,19 @@ #!/bin/bash # Copyright (C) 2001-2010 Wormux Team. # Copyright (C) 2010 The ManaWorld Development Team. +# Copyright (C) 2012 The ManaPlus Developers. new_year="$1" [[ -z $new_year ]] && echo "Missing parameter: year" && exit 1 -[[ ! -e src ]] && echo "This script should be ran from the top mana/manaserv dir" && exit 2 +[[ ! -e src ]] && echo "This script should be ran from the top manaplus dir" && exit 2 tmp_file="w$RANDOM$RANDOM$RANDOM$RANDOM" [[ -e $tmp_file ]] && tmp_file="w$RANDOM$RANDOM$RANDOM$RANDOM" # update the dates, creating the interval if it doesn't exist yet find -iname "*.cpp" -or -iname "*.h" -or -iname "*.hpp" | - xargs sed -i "/Copyright.*The Mana World Development Team/ s,\(20[0-9]*\) \|\(20[0-9]*\)-20[0-9]* ,\1\2-$new_year ," + xargs sed -i "/Copyright.*The ManaPlus Developers/ s,\(20[0-9]*\) \|\(20[0-9]*\)-20[0-9]* ,\1\2-$new_year ," # do a semi-automated commit check git diff > $tmp_file |
