diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2 manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
118 files changed, 8737 insertions, 8067 deletions
diff --git a/.gitignore b/.gitignore index e775b63f9..bef2937de 100644 --- a/.gitignore +++ b/.gitignore @@ -79,25 +79,26 @@ mana.creator.user* run/* my/* win/* -make.log -make1.log -make2.log -make_nsiqcppstyle.txt -bcmake1 -bmake1 -gprof.png -gprof.txt -gmon.out -makecheck.txt -makecheck_err.txt -makeflawfinder.log -makegprof1 -pmake1 -packwin1 -toolchain.cmake1 -makerats.log -make_hc.txt -make_hc2.txt +build/make.log +build/make1.log +build/make2.log +build/make_nsiqcppstyle.txt +build/bcmake1 +build/bmake1 +build/gprof.png +build/gprof.txt +build/gprof.dot +build/gmon.out +build/makecheck.txt +build/makecheck_err.txt +build/makeflawfinder.log +build/makegprof1 +build/pmake1 +build/packwin1 +build/toolchain.cmake1 +build/makerats.log +build/make_hc.txt +build/make_hc2.txt # debian debian/* @@ -1,3 +1,17 @@ +2011-10-16 New release 1.1.10.16 +ManaPlus: +fix: particle effects Y position. +fix: resize in some dialogs. +fix: codeblocks project file. +fix: global messages sound highlight. +fix: last character selection with space in login dialog. +fix: fps if network error. +add: move to target mode for archers/mages. +add: blacklist relation. +add: reading real monsters attack range (in evol only). +add: option to show hide MVP messages. +add: update mplus fonts. + 2011-10-02 New release 1.1.10.2 ManaPlus: fix: inactive state. @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.10.2 Date: 2011-10-02 + Version: 1.1.10.16 Date: 2011-10-16 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 758408520..268a7b0c7 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT
===============
- Version: 1.1.10.2 Date: 2011-10-02
+ Version: 1.1.10.16 Date: 2011-10-16
Development team:
- See AUTHORS file for a list
diff --git a/bcmake b/bcmake deleted file mode 100755 index fd6196df7..000000000 --- a/bcmake +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -export PATH=/usr/i586-mingw32msvc/bin:$PATH -CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.cmake . 2>make1.log - -make -j5 2>make.log - diff --git a/build/bcmake b/build/bcmake new file mode 100755 index 000000000..21de1da77 --- /dev/null +++ b/build/bcmake @@ -0,0 +1,9 @@ +#!/bin/bash + +cd .. + +export PATH=/usr/i586-mingw32msvc/bin:$PATH +CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=build/toolchain.cmake . 2>build/make1.log + +make -j5 2>build/make.log + diff --git a/bdeb.sh b/build/bdeb.sh index a09a29f0c..a1b2e5b4b 100755 --- a/bdeb.sh +++ b/build/bdeb.sh @@ -1,3 +1,4 @@ #!/bin/sh +cd .. dpkg-buildpackage -rfakeroot -uc -b @@ -1,5 +1,7 @@ #!/bin/sh +cd .. + #may be #-Waggregate-return -Winline @@ -52,7 +54,7 @@ autoreconf -i cd po #make -j5 update-po 2>../make1.log -make -j5 update-gmo 2>../make1.log +make -j5 update-gmo 2>../build/make1.log cd .. -make -j5 2>make2.log +make -j5 2>build/make2.log @@ -1,5 +1,7 @@ #!/bin/sh +cd .. + #may be #-Wshadow -Waggregate-return -Winline @@ -47,8 +49,8 @@ autoreconf -i #--without-librt cd po -#make -j5 update-po 2>../make1.log -make -j5 update-gmo 2>../make1.log +#make -j5 update-po 2>../build/make1.log +make -j5 update-gmo 2>../build/make1.log cd .. -make -j5 2>make2.log +make -j5 2>build/make2.log diff --git a/bmake44 b/build/bmake44 index 08f78be79..ad61b7707 100755 --- a/bmake44 +++ b/build/bmake44 @@ -1,5 +1,7 @@ #!/bin/sh +cd .. + #may be #-Wshadow -Waggregate-return -Winline @@ -42,8 +44,8 @@ autoreconf -i --mandir=$dir/run/share/man cd po -#make -j5 update-po 2>../make1.log -make -j5 update-gmo 2>../make1.log +#make -j5 update-po 2>../build/make1.log +make -j5 update-gmo 2>../build/make1.log cd .. -make -j5 2>make2.log +make -j5 2>build/make2.log diff --git a/bmake46 b/build/bmake46 index 8874f802b..e4d3e7e8e 100755 --- a/bmake46 +++ b/build/bmake46 @@ -1,5 +1,7 @@ #!/bin/sh +cd .. + #may be #-Wshadow -Waggregate-return -Winline @@ -56,8 +58,8 @@ autoreconf -i --mandir=$dir/run/share/man cd po -#make -j5 update-po 2>../make1.log -make -j5 update-gmo 2>../make1.log +#make -j5 update-po 2>../build/make1.log +make -j5 update-gmo 2>../build/make1.log cd .. -make -j5 2>make2.log +make -j5 2>build/make2.log @@ -1,5 +1,6 @@ #!/bin/sh +cd .. dir=`pwd` @@ -12,5 +13,5 @@ export CXX=clang++ --bindir=$dir/run/bin \ --mandir=$dir/run/share/man -make -j5 2>make2.log +make -j5 2>build/make2.log diff --git a/fink.sh b/build/fink.sh index 8c78dd724..8c74de65a 100755 --- a/fink.sh +++ b/build/fink.sh @@ -1,5 +1,7 @@ #!/bin/bash +cd .. + FINKDIR=/sw GCCVER=4.0 @@ -13,7 +15,7 @@ export LDFLAGS="-framework OpenGL" dir=`pwd`/run #dir=${FINKDIR} -autoreconf -i 2>fink1.log +autoreconf -i 2>build/fink1.log # with prefix #./configure --enable-applebuild=yes \ @@ -27,8 +29,8 @@ autoreconf -i 2>fink1.log --datarootdir=${dir}/share/games \ --bindir=${dir}/bin \ --sbindir=${dir}/bin \ ---mandir=${dir}/share/man 2>fink2.log +--mandir=${dir}/share/man 2>build/fink2.log # simple #./configure --enable-applebuild=yes 2>fink2.log 1>fink2_ok.log -make 2>fink3.log +make 2>build/fink3.log diff --git a/makecheck1 b/build/makecheck1 index 790316bf2..96b49e5c7 100755 --- a/makecheck1 +++ b/build/makecheck1 @@ -1,3 +1,3 @@ #!/bin/bash -cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>makecheck.txt 2>makecheck_err.txt +cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>makecheck_err.txt diff --git a/build/makecheck2 b/build/makecheck2 new file mode 100755 index 000000000..b9108b6ef --- /dev/null +++ b/build/makecheck2 @@ -0,0 +1,3 @@ +#!/bin/bash + +../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >make_nsiqcppstyle.txt diff --git a/makecheck3 b/build/makecheck3 index e7ddc5f7f..95e04ad28 100755 --- a/makecheck3 +++ b/build/makecheck3 @@ -1,6 +1,6 @@ #!/bin/bash -cd src +cd ../src #../../cppcheck/cppcheck --enable=all --force -j 5 -v -I /usr/include -I /usr/include/c++/4.5 -I /usr/include/libxml2 -I /usr/include/SDL . 1>../makecheck.txt 2>../makecheck_err.txt #../../cppcheck/cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>../makecheck.txt 2>../makecheck_err.txt -../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../makecheck.txt 2>../makecheck_err.txt +../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/makecheck_err.txt diff --git a/build/makecheck4 b/build/makecheck4 new file mode 100755 index 000000000..852986459 --- /dev/null +++ b/build/makecheck4 @@ -0,0 +1,5 @@ +#!/bin/bash + +../../checkheaders/checkheaders ../src 2>tmp.txt +sed '/(style): Header not found/d' tmp.txt >makecheck4.txt +rm tmp.txt diff --git a/build/makeflawfinder b/build/makeflawfinder new file mode 100755 index 000000000..9b5ff2809 --- /dev/null +++ b/build/makeflawfinder @@ -0,0 +1,4 @@ +#!/bin/sh + +flawfinder ../src 1> makeflawfinder.log +rats ../src 1> makerats.log diff --git a/makegprof b/build/makegprof index b1ea32c7b..d408bf0d3 100755 --- a/makegprof +++ b/build/makegprof @@ -1,6 +1,6 @@ #!/bin/sh -mv run/gmon.out . -gprof run/bin/manaplus >gprof.txt +mv ../run/gmon.out . +gprof ../run/bin/manaplus >gprof.txt cat gprof.txt | gprof2dot.py >gprof.dot cat gprof.dot | dot -Tpng -o gprof.png diff --git a/build/mclean b/build/mclean new file mode 100755 index 000000000..fa5ff4ed5 --- /dev/null +++ b/build/mclean @@ -0,0 +1,2 @@ +cd .. +make clean diff --git a/build/minst b/build/minst new file mode 100755 index 000000000..2b3f847ce --- /dev/null +++ b/build/minst @@ -0,0 +1,2 @@ +cd .. +make install diff --git a/packwin b/build/packwin index 633f895b8..81920b9fa 100755 --- a/packwin +++ b/build/packwin @@ -1,11 +1,13 @@ #!/bin/bash +cd .. + dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.10.2" \ + -DPRODUCT_VERSION="1.1.10.16" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi @@ -1,5 +1,7 @@ #!/bin/sh +cd .. + dir=`pwd` export CC=gcc-4.5 @@ -26,5 +28,5 @@ autoreconf -i --bindir=$dir/run/bin \ --mandir=$dir/run/share/man -make -j5 2>make.log +make -j5 2>build/make.log diff --git a/pmake46 b/build/pmake46 index 361825e86..dc9a5f584 100755 --- a/pmake46 +++ b/build/pmake46 @@ -1,5 +1,7 @@ #!/bin/sh +cd .. + dir=`pwd` export CC=gcc-4.6 @@ -25,5 +27,5 @@ autoreconf -i --bindir=$dir/run/bin \ --mandir=$dir/run/share/man -make -j5 2>make.log +make -j5 2>build/make.log diff --git a/toolchain.cmake b/build/toolchain.cmake index c8493c0c5..c8493c0c5 100644 --- a/toolchain.cmake +++ b/build/toolchain.cmake diff --git a/toolchain.nightly b/build/toolchain.nightly index 6093a82f8..6093a82f8 100644 --- a/toolchain.nightly +++ b/build/toolchain.nightly diff --git a/update-creator.sh b/build/update-creator.sh index 781261f5d..f3fc9e28c 100755 --- a/update-creator.sh +++ b/build/update-creator.sh @@ -1,4 +1,7 @@ #!/bin/sh + +cd .. + find -name \*.cpp \ -o -name \*.h \ -o -name \*.am \ diff --git a/configure.ac b/configure.ac index 6583c3824..b6130de3d 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.10.2], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.10.16], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/docs/manaplus.6 b/docs/manaplus.6 index dbde16d49..3ae55c1c1 100644 --- a/docs/manaplus.6 +++ b/docs/manaplus.6 @@ -1,6 +1,6 @@ .TH "ManaPlus" "6" .SH "NAME" -mana \- ManaPlus: A 2D MMORPG client +manaplus \- ManaPlus: A 2D MMORPG client .SH "SYNOPSIS" \fBmanaplus\fR .SH "DESCRIPTION" @@ -57,7 +57,7 @@ Skip the update process. .B \-d, \-\-data Directory to load game data from. .TP -.B \-L, \-\-local\-data\-dir +.B \-L, \-\-localdata\-dir Directory to use as local data directory. .TP .B \-\-screenshot\-dir diff --git a/makecheck2 b/makecheck2 deleted file mode 100755 index 566b60005..000000000 --- a/makecheck2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ./src >make_nsiqcppstyle.txt diff --git a/makeflawfinder b/makeflawfinder deleted file mode 100755 index 13d7dde19..000000000 --- a/makeflawfinder +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -flawfinder ./src 1> makeflawfinder.log -rats ./src 1> makerats.log diff --git a/manaplus.cbp b/manaplus.cbp index 1f7308935..3d9ddb4be 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -53,7 +53,7 @@ </Target>
<Target title="Unix">
<Option platforms="Unix;" />
- <Option output="mana" prefix_auto="1" extension_auto="1" />
+ <Option output="manaplus" prefix_auto="1" extension_auto="1" />
<Option type="0" />
<Option compiler="gcc" />
<Option parameters='-u -d "../manadata"' />
@@ -63,7 +63,7 @@ <Add option="`sdl-config --cflags`" />
<Add option="-DMANASERV_SUPPORT" />
<Add option="-DUSE_OPENGL" />
- <Add directory="\usr\local\include\libxml2" />
+ <Add directory="\usr\include\libxml2" />
</Compiler>
<Linker>
<Add option="`sdl-config --libs`" />
@@ -272,8 +272,8 @@ <Unit filename="src\gui\textpopup.h" />
<Unit filename="src\gui\theme.cpp" />
<Unit filename="src\gui\theme.h" />
- <Unit filename="src\gui\trade.cpp" />
- <Unit filename="src\gui\trade.h" />
+ <Unit filename="src\gui\tradewindow.cpp" />
+ <Unit filename="src\gui\tradewindow.h" />
<Unit filename="src\gui\sdlfont.cpp" />
<Unit filename="src\gui\sdlfont.h" />
<Unit filename="src\gui\unregisterdialog.cpp" />
diff --git a/nightly/buildwindows.sh b/nightly/buildwindows.sh index ecd7a35f9..b55ea8134 100755 --- a/nightly/buildwindows.sh +++ b/nightly/buildwindows.sh @@ -4,13 +4,13 @@ dir=`pwd` cd .. export PATH=/usr/i586-mingw32msvc/bin:$PATH -CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.nightly . +CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./build/toolchain.nightly . result=$? if [ "$result" != 0 ]; then exit $result fi -make -j5 2>make.log +make -j5 2>build/make.log result=$? if [ "$result" != 0 ]; then exit $result @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:45+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/" "cs/)\n" @@ -21,25 +21,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Viditelný na mapÄ›" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "úskoÄil" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "minul" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "" @@ -141,15 +141,15 @@ msgstr "Chyba pÅ™i vytvářenà adresáře s updaty!" 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Neznámý pÅ™Ãkaz." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Nelze zaslat prázdné Å¡eptánÃ!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,97 +158,101 @@ 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:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Chybà jméno party." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Chybà jméno guildy." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "ProsÃm zadej jméno." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Enter pÅ™epÃná chat." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Zpráva zavÃrá chat." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Enter nynà pÅ™epÃná chat." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Zpráva nynà ukonÄuje chat." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "pÅ™Ãtel" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "pÅ™ehlÞený" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutrálnÃ" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "HrÃ¡Ä je již %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "HrÃ¡Ä byl úspěšnÄ› zaÅ™azen jako %s!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "HrÃ¡Ä nemůže být zaÅ™azen jako %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "HrÃ¡Ä nebyl ignorován!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "HrÃ¡Ä již nenà ignorován!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "HrÃ¡Ä nemůže být odignorován!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "HrÃ¡Ä již byl vymazán!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "HrÃ¡Ä byl úspěšnÄ› vymazán!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "HrÃ¡Ä nemůže být vymazán!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Doba bÄ›hu klienta: %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -256,7 +260,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" @@ -264,7 +268,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -272,7 +276,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -280,7 +284,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -288,27 +292,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "velikost chache fontů" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Velikost cache:" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "VytvoÅ™eno:" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "OdstranÄ›no:" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -317,11 +321,11 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "" @@ -337,23 +341,23 @@ msgstr "Ukládánà snÃmku obrazovky selhalo!" msgid "The connection to the server was lost." msgstr "Spojenà se serverem bylo ztraceno." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Chyba sÃtÄ›" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Ignorovat pÅ™Ãchozà žádosti o obchodovánÃ" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Akceptovat pÅ™Ãchozà žádosti o obchodovánÃ" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Nelze naÄÃst mapu" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Chyba pÅ™i naÄÃtánà %s" @@ -387,19 +391,19 @@ msgid "Name" msgstr "Jméno" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Útok" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Mluvit" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "" @@ -412,8 +416,8 @@ msgid "Reset" msgstr "Vynulovat" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Nákup" @@ -431,7 +435,7 @@ msgstr "" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "" @@ -439,7 +443,7 @@ msgstr "" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "" @@ -452,7 +456,7 @@ msgstr "UkonÄit" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "VÅ¡e" @@ -461,8 +465,8 @@ msgstr "VÅ¡e" msgid "Shop" msgstr "Obchod" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -471,15 +475,15 @@ msgstr "Prodej" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -650,7 +654,7 @@ msgid "Enter password:" msgstr "Zadej heslo:" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Smazat" @@ -726,7 +730,7 @@ msgstr "duhová 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -737,12 +741,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "PÅ™Ãtomno: %s; %d hráÄů je pÅ™Ãtomno." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Å eptánà pro %s: %s" @@ -756,9 +760,10 @@ msgid "No" msgstr "Ne" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Ignorovat" @@ -904,7 +909,7 @@ 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/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "ZavÅ™Ãt" @@ -931,8 +936,8 @@ msgstr "VybavenÃ" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Odstranit z vybavenÃ" @@ -974,31 +979,31 @@ msgid "Filter:" msgstr "Filtr:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Vybavit" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "PoužÃt" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Upustit..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "RozdÄ›lit" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Výstroje" @@ -1007,17 +1012,17 @@ msgid "Weight:" msgstr "Hmotnost:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Uložit" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "VzÃt" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Upustit" @@ -1157,7 +1162,7 @@ msgstr "" msgid "jacko spawning" msgstr "Jack O se rodÃ" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "Opustil jsi gildu." @@ -1259,7 +1264,7 @@ msgstr "Odeslat" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Vyprázdnit" @@ -1297,321 +1302,331 @@ msgstr "NejdÅ™Ãv odstrojit" msgid "Away outfit" msgstr "Výstroj pro \"Away\"" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Obchod" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Å eptat" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "VyléÄit" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Být přátelé" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "PÅ™ehlÞet" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Vymazat" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Odignorovat" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "KompletnÄ› ignorovat" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Následovat" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "imitovat" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "Pozvat do party" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Vykopnout z party" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Vykopnout z gildy" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "ZmÄ›nit pozici v gildÄ›" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "Pozvat do gildy" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Vykopnout hráÄe" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Zobrazit vÄ›ci" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Svléct" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "PÅ™idat komentář" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Koupit (?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "Prodat (?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Vykopnout" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Vložit do seznamu ignorovaných" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Vložit jméno do chatu" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Sebrat" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Vložit do chatu" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "OznaÄit na mapÄ›" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "PÅ™ejmenovat" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Odebrat" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "NaÄÃst staré výstroje" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Kouzla" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "NaÄÃst stará kouzla" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Upravit kouzlo" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "vypnout zvýrazÇ’vánÃ" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Zapnout zvýrazňovánÃ" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "NeodebÃrat jméno" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Odebrat jméno" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "Zapnout \"away\"" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "Vypnout \"away\"" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "OdejÃt" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 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:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Jméno: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "HráÄův komentář" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "Komentář: " -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "PÅ™idat do transakce" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "PÅ™idat 10 do transakce" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "PÅ™idat polovinu do transakce" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "PÅ™idat vÅ¡e do transakce" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Uschovat 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Uschovat polovinu" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Uschovat vÅ¡echny" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "Upustit vÅ¡e" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "VzÃt 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "VzÃt polovinu" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "VzÃt vÅ¡echny" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "NaÄÃst staré zkratky vÄ›cÃ" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "NaÄÃst staré zkratky upuÅ¡tÄ›nÃ" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Skrýt" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Zobrazit" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "Resetovat žlutý pruh" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "ZkopÃrovat do chatu" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Posunout nahoru" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Posunout dolů" @@ -1866,6 +1881,10 @@ msgstr "OstatnÃ" msgid "Highlight words (separated by comma)" msgstr "Zvýrazňovaná slova (oddÄ›lená Äárkou)" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Takhle to bude vypadat" @@ -2265,23 +2284,27 @@ msgstr "Ignorovaný" msgid "Erased" msgstr "Vymazán" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Povolit obchodovánÃ" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Povolit Å¡eptánÃ" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Starý" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "Vztahy" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Když ignoruji:" @@ -2541,7 +2564,7 @@ msgstr "Zobrazit odkazy v oznámenÃ" msgid "Auction" msgstr "Aukce" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Požadavek k obchodovánÃ" @@ -2840,182 +2863,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) pohyb k cÃli na útoÄný dosah" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) pohyb k cÃli" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) výchozà následovánÃ" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) relativnà následovánÃ" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) zrcadlené následovánÃ" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) neznámé následovánÃ" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) výchozà útok" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) pÅ™epÃnat útok bez Å¡tÃtu" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) pÅ™epÃnat útok se Å¡tÃtem" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) útok" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) jdi a útoÄ" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) jdi, útoÄ, sbÃrej" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) bez automatického útoku" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) malý sbÄ›r 1x1 pole" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) výchozà sbÄ›r 2x1 pole" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) sbÄ›r pÅ™ed 2x3 pole" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) sbÄ›r 3x3 pole" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) jdi a seber do vzdálenosti 4" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(G) jdi a seber do vzdálenosti 8" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) jdi a seber do max. vzdálenosti" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) sbÄ›r" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) Normálnà zobrazenà mapy" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) debug zobrazenà mapy" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) ultra zobrazenà mapy" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(U) ultra zobrazenà mapy 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) zobrazen prázdné mapy" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) zobrazenà ÄernobÃlé mapy" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) zobrazenà pamy" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) použij #flar pro magický útok" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) použij #chiza pro magický útok" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) použij #ingrav pro magický útok" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) použij #frillyar pro magický útok" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) použij #upmarmu pro magický útok" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) magický útok attack" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) výchozà imitace" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) imitace výstroje" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) imitace" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) u poÄÃtaÄe" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) pryÄ (away)" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) away" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) mód hernà kamery" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) mód volné kamery" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Modifikátory hry jsou vypnuty" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Modifikátory hry jsou zapnuty" @@ -3067,18 +3094,18 @@ msgstr "Úroveň: %d (GM %d)" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3086,20 +3113,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3115,7 +3142,7 @@ msgstr "(1)" msgid "(2)" msgstr " (2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3127,70 +3154,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3506,7 +3533,7 @@ msgstr "Hranice domácÃho mÃsta" msgid "Road Point" msgstr "Bod cesty" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Kdo je online - Obnovuji" @@ -3514,15 +3541,15 @@ msgstr "Kdo je online - Obnovuji" msgid "Update" msgstr "Obnovit" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Kdo je online - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Kdo je online - chyba" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -4224,41 +4251,41 @@ msgstr "" "Konflikt klávesy \"%s\" a klávesy \"%s\". VyÅ™eÅ¡te jej, neboÅ¥ se hra může " "chovat podivnÄ›." -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "Zabil vás " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Snažili jste se sebrat neexistujÃcà pÅ™edmÄ›t." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "PÅ™edmÄ›t je pÅ™ÃliÅ¡ těžký." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "PÅ™edmÄ›t je pÅ™ÃliÅ¡ daleko." -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "Inventář je plný." -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "Hromada je pÅ™ÃliÅ¡ velká." -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "PÅ™edmÄ›t patřà nÄ›komu jinému." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 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:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4266,119 +4293,119 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Následovánà zruÅ¡eno." -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Imitace zruÅ¡ena." -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "VidÃte " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "NastavenÃ:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4436,7 +4463,7 @@ msgstr "" "Nelze vytvoÅ™it postavu. NejpravdÄ›podobnÄ›ji jejà jméno již na serveru " "existuje. " -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Å patné jméno." @@ -4481,11 +4508,11 @@ msgstr "Nelze odeslat Å¡eptánÃ, %s nenà pÅ™ipojen." msgid "Whisper could not be sent, ignored by %s." msgstr "Nelze odeslat Å¡eptánÃ, %s vás ignoruje." -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4518,81 +4545,81 @@ msgstr "" msgid "Unknown server response." msgstr "Neznámá odpovÄ›Ä serveru." -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "Jméno gildy: %s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "Vedoucà gildy: %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "Úroveň gildy: %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "PÅ™ipojených Älenů: %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "PrůmÄ›rná úroveň: %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "ZkuÅ¡enosti gildy: %d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "Nelze pozvat uživatele do gildy." -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "Uživatel zamÃtl pozvánku do gildy." -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "Uživatel je nynà Älenem vaÅ¡Ã gildy." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "VaÅ¡e gilda je plná." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "Neznámá odpovÄ›Ä na pozváku do gildy." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%s opustil vaÅ¡i gildu." -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "Byl jste vykopnut z gildy." -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%s byl vykopnut z vaÅ¡Ã gildy." @@ -4701,11 +4728,11 @@ msgstr "SdÃlenà zkuÅ¡enostà nenà možné." msgid "Experience sharing unknown." msgstr "Stav sdÃlenà zkuÅ¡enostà neznámý." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Pokus o použità pÅ™edmÄ›tu selhal." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "Nelze vybavit." @@ -4721,54 +4748,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:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "Neregistované ID." -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Å patné heslo." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "Platnost úÄtu vyprÅ¡ela." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "OdmÃtnut ze serveru." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Klient je pÅ™ÃliÅ¡ starý." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, 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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Server je pÅ™elidnÄ›ný." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Toto uživatelské jméno je již použÃváno." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Uživatelské jméno bylo trvale odstranÄ›no." @@ -4810,45 +4837,45 @@ msgstr "%s nemůže být Älenem party, jelikož je parta plná." msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "OdeÅ¡el jste z party." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s opustil vaÅ¡i partu." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "Neznámý Älen se snažil Å™Ãct: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Jste mrtev." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "S lÃtostà vám oznamujeme, že vaÅ¡e postava byla zabita v bitvÄ›." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Nejste již vÃce naživu." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "Chladné ruce smrti se natahujà po vaÅ¡Ã duÅ¡i." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Konec hry!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "Vložte minci pro pokraÄovánÃ." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4856,80 +4883,80 @@ msgstr "" "Ne, dÄ›ti. VaÅ¡e postava ve skuteÄnosti neumÅ™ela. Ona.. errm.. odeÅ¡la na lepÅ¡Ã " "mÃsto." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "Váš plán zniÄit nepÅ™Ãteli zbraň pomocà úderů vlastnÃm krkem selhal." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "TuÅ¡Ãm že to neÅ¡lo tak hladce." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Chcete zaevidovat váš majetek?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Žel, nezbyla po vás ani stopa..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "ZniÄen." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Vypadá to, že vám nÄ›kdo podává vaÅ¡i hlavu." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" "Zase jste to podÄ›lal. SpláchnÄ›te vaÅ¡e tÄ›lo do záchodu a najdete si nÄ›jaké " "jiné." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "JeÅ¡tÄ› nejste mrtev. ZatÃm jen odpoÄÃváte." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Již nejste." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Bylo vám odepÅ™eno být." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Expiroval jste a Å¡el jste navÅ¡tÃvit svého tvůrce." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Jste tuhý." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Jste zbaven života, odpoÄÃvejte v pokoji." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Kdybyste nebyl tak animovaný, Äuchal by jste ke kvÄ›tinkám zespoda." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "vaÅ¡e metabolické procesy jsou nynà historiÃ." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "Padl jste." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "A je to v kýblu." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -4937,182 +4964,182 @@ msgstr "" "VaÅ¡e trápenà je u konce, opona je stažená a vy jste se pÅ™ipojil k vaÅ¡emu " "neviditelnému sboru." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "nynà jste bývalý hráÄ." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Zpráva" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "Nesete vÃce než polovinu vaÅ¡Ã váhy. Obnovovánà života nynà nenà možné." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "Nesete ménÄ› než polovinu vaÅ¡Ã váhy. Obnovovánà života je nynà možné." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "Sebral jste %s." -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "utratil jste %s." -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "Nelze zlepÅ¡it tuto dovednost!" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "nejdÅ™Ãv se vybavte Å¡Ãpy." -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "Obchod selhal!" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "SmajlÃk selhal!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "Sednutà selhalo!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "Selhalo vytváÄenà postavy!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "Nemůžete vstoupit do party!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "Nedosáhl jste jeÅ¡tÄ› dostateÄnÄ› vysoké úrovnÄ›!" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "Nedostatek životů (HP)!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "Nedostatek many (SP)!" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Nynà toto nelze!" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Vypadá to že potÅ™ebujete vÃce penÄ›z... ;-)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Nemůžete použÃt tuto dovednost s touto zbranÃ!" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 "" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "" -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "SÃla" @@ -5121,7 +5148,7 @@ msgstr "SÃla" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Hbitost" @@ -5130,7 +5157,7 @@ msgstr "Hbitost" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Obratnost" @@ -5139,7 +5166,7 @@ msgstr "Obratnost" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitalita" @@ -5148,7 +5175,7 @@ msgstr "Vitalita" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Inteligence" @@ -5456,74 +5483,74 @@ msgstr "" msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Å tÄ›stÃ" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5531,11 +5558,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "" @@ -5544,19 +5571,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "" @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:45+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/" "de/)\n" @@ -23,25 +23,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "ausweichen" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "verfehlt" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "" @@ -144,15 +144,15 @@ 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Unbekannter Befehl." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Kann keine leeren Nachrichten versenden!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -161,152 +161,156 @@ msgstr "" "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, " "oder du bist es selbst." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Anfrage den Kanal %s betreten zu dürfen." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Name der Party fehlt." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Name der Gilde fehlt." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Bitte gib einen Namen an." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Nachricht schließt den Chat." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Enter aktiviert jetzt den Chat." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Nachricht schließt jetzt den Chat." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "Freund" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "unbeachtet" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Spieler ist bereits %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Spieler erfolgreich %s!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Spieler konnte nicht %s werden!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "Spieler wurde nicht ignoriert!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "Spieler wird nicht länger ignoriert!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Spieler ist bereits gelöscht!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Spieler erfolgreich gelöscht!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Spieler konnte nicht gelöscht werden!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -316,11 +320,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Allgemein" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Debug" @@ -336,23 +340,23 @@ msgstr "Bildschirmfoto konnte nicht gespeichert werden!" msgid "The connection to the server was lost." msgstr "Die Verbindung zum Server wurde getrennt." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Netzwerkfehler" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Ignoriere eingehende Handelsanfragen" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Akzeptiere eingehende Handelsanfragen" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Karte konnte nicht geladen werden." -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Fehler beim Laden von %s" @@ -386,19 +390,19 @@ msgid "Name" msgstr "Name" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Angriff" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Sprechen" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Bewegen" @@ -411,8 +415,8 @@ msgid "Reset" msgstr "Zurücksetzten" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Kaufen" @@ -430,7 +434,7 @@ msgstr "" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -438,7 +442,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -451,7 +455,7 @@ msgstr "Beenden" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Max" @@ -460,8 +464,8 @@ msgstr "Max" msgid "Shop" msgstr "Laden" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -470,15 +474,15 @@ msgstr "Verkaufen" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -649,7 +653,7 @@ msgid "Enter password:" msgstr "" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Löschen" @@ -725,7 +729,7 @@ msgstr "Regenbogen 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -736,12 +740,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Anwesend: %s ;%d Spieler sind anwesend." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Flüsternd zu %s: %s" @@ -755,9 +759,10 @@ msgid "No" msgstr "Nein" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "ignorieren" @@ -903,7 +908,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Schließen" @@ -930,8 +935,8 @@ msgstr "Ausrüstung" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Ablegen" @@ -973,31 +978,31 @@ msgid "Filter:" msgstr "Filter:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Ausrüsten" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Benutzen" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Wegwerfen" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Aufteilen" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Ausrüstung" @@ -1006,17 +1011,17 @@ msgid "Weight:" msgstr "Gewicht:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Aufbewahren" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Abholen" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Wegwerfen" @@ -1154,7 +1159,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "Du hast die Guilde verlassen." @@ -1256,7 +1261,7 @@ msgstr "Absenden" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Frei" @@ -1294,321 +1299,331 @@ msgstr "Zuerst ausziehen" msgid "Away outfit" msgstr "Abwesend-Outfit" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handeln" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Flüstern" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Heilen" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Befreunden" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "@@ignore|Ignoriere %s komplett@@" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Folgen" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "Kommentar hinzufügen" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Aufheben" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Zu Chat hinzufügen" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Umbenennen" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Entfernen" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Zaubersprüche" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Hervorhebung abschalten" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Hervorhebung einschalten" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Verlassen" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "Position der Gilde ändern" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Kartenzeichen umbenennen" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Name:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "10 aufbewahren" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Die Hälfte aufbewahren" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Alles aufbewahren" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "10 abholen" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Die Hälfte abholen" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Alles abholen" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "" @@ -1864,6 +1879,10 @@ msgstr "" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "So sieht die Farbe aus" @@ -2263,23 +2282,27 @@ msgstr "Ignoriert" msgid "Erased" msgstr "Gelöscht" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Handeln erlauben" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Flüstern erlauben" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Alt" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Wenn ignorierend:" @@ -2544,7 +2567,7 @@ msgstr "" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Erbitte einen Handel" @@ -2843,182 +2866,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3070,18 +3097,18 @@ msgstr "Level: %d (GM %d)" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "" @@ -3089,20 +3116,20 @@ msgstr "" msgid "(C)" msgstr "" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "" @@ -3118,7 +3145,7 @@ msgstr "" msgid "(2)" msgstr "" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "" @@ -3130,70 +3157,70 @@ msgstr "" msgid "(7)" msgstr "" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "" @@ -3511,7 +3538,7 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "" @@ -3519,15 +3546,15 @@ msgstr "" msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -4231,160 +4258,160 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Abwesend" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Folgen:" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "Du siehst" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Optionen:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Die Version des Spieles anzeigen" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " - --help : Zeigt diesen Hilfstext an" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Mit angegebenem Benutzernamen anmelden" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password : Angegebenes Passwort benutzen" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --charakter : Mit angegebenem Spieler anmelden" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr " -s --server : Name oder IP-Adresse des Loginservers" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Port des Loginservers" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Wähle zuletzt benutzten Server und Spieler aus" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Ãœberspringe das Herunterladen von Updates" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4440,7 +4467,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Falscher Name." @@ -4485,11 +4512,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4522,81 +4549,81 @@ msgstr "" msgid "Unknown server response." msgstr "" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "Deine Guilde ist voll." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4705,11 +4732,11 @@ msgstr "" msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "" @@ -4725,54 +4752,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:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "Unbekannte ID" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Falsches Passwort." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "Account abgelaufen." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, 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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "" @@ -4814,46 +4841,46 @@ msgstr "" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "" -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "" -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Ach ja: Du bist Tot." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "" "Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Du bist nicht länger lebendig." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "Die kalten Hände des Sensemanns greifen nach Deiner Seele." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Game Over!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4861,7 +4888,7 @@ msgstr "" "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem " "besserem Ort gegangen." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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." @@ -4869,255 +4896,255 @@ msgstr "" "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider " "nicht ganz so genial, wie Du dachtest..." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Ich glaube, das war nicht so gut." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Möchtest du eine Auflistung Deiner Verletzungen?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Leider wurde niemals eine Spur von Dir gefunden..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Vernichtet." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Sieht aus, als würde Dein Kopf Dich anschauen." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" "Du hast schon wieder versagt. Spül Deine Ãœberreste hinunter und hol Dir ein " "paar Neue." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Du bist eine Leiche." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Nachricht" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "Konnte Party nicht beitreten!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 möchte mit dir handeln, stimmst du zu?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Handel abgebrochen." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Handel abgeschlossen." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Stärke" @@ -5126,7 +5153,7 @@ msgstr "Stärke" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Beweglichkeit" @@ -5135,7 +5162,7 @@ msgstr "Beweglichkeit" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Ausdauer" @@ -5144,7 +5171,7 @@ msgstr "Ausdauer" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Gesundheit" @@ -5153,7 +5180,7 @@ msgstr "Gesundheit" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Intelligenz" @@ -5464,74 +5491,74 @@ msgstr "Authentifizierung verweigert" msgid "No servers available." msgstr "Keine Server verfügbar" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Jemand anderes versucht diesen Account zu benutzen" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Dieser Account ist bereits angemeldet" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Geschwindigkeitsproblem festgestellt" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Mehrfache Anmeldung" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "Unbekannter Verbindungsfehler" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Verbindung zum Server unterbrochen!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Glück" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Verteidigung:" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "M.Angriff:" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "M.Verteidigung:" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% Accuracy" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% Evade" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% Critical" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5539,11 +5566,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "Empty address given to Network::connect()!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "Nicht möglich den host \" aufzulösen" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Verbindung mit Server abgebrochen. " @@ -5552,19 +5579,19 @@ msgstr "Verbindung mit Server abgebrochen. " msgid "%s is not in your party!" msgstr "%s ist nicht in Deiner Party!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Drucke '..'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Blinkender Name" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Schwebende '...' Blase" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Schwebende Blase" @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 23:19+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-15 05:26+0000\n" "Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" "manaplus/team/es/)\n" @@ -23,25 +23,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Visible sobre el mapa" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "evade" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "falla" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "I" @@ -143,15 +143,15 @@ msgstr "¡Error al crear la carpeta de actualizaciones!" 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Comando desconocido." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "¡No puedes enviar susurros vacÃos!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,152 +160,156 @@ msgstr "" "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya " "existe, o eres tú." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando la entrada del canal %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta el nombre del grupo." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Falta el nombre del Clan." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Por favor, especifique un nombre." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Volver a alternar el chat." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Mensaje cierra la charla." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Volver ahora a cambiar de chat." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Mensaje ahora cierra el chat." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "desatendido" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "¡Jugador ya es %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "¡Jugador %s exitosamente!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "¡Jugador no pudo ser %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "El jugador no estaba ignorado!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "¡El jugador ya no es ignorado!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "¡Al jugador no se le puede dejar de ignorar!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "en la lista negra" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "¡Jugador ya borrado!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "¡Jugador borrado con éxito!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "¡Jugador no pudo ser borrado!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Tiempo de actividad del cliente: %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dÃa" msgstr[1] "%d dÃas" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "tamaño de caché de fuente" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Tám. caché:" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Creado:" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Borrado:" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "Imágenes de recurso:" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "Imágenes de recurso huérfano:" @@ -315,11 +319,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "General" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Depurador" @@ -335,23 +339,23 @@ msgstr "¡El guardado de la captura de pantalla ha fallado!" msgid "The connection to the server was lost." msgstr "Se ha perdido la conexión con el servidor." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Error de Red" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Ignorando las peticiones de intercambio" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Aceptando las peticiones de intercambio" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "No se pudo cargar el mapa" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Error mientras cargaba %s" @@ -385,19 +389,19 @@ msgid "Name" msgstr "Nombre" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Hablar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Mover" @@ -410,8 +414,8 @@ msgid "Reset" msgstr "Restablecer" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Comprar" @@ -429,7 +433,7 @@ msgstr "Cantidad:" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -437,7 +441,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -450,7 +454,7 @@ msgstr "Salir" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Máximo" @@ -459,8 +463,8 @@ msgstr "Máximo" msgid "Shop" msgstr "Tienda" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -469,15 +473,15 @@ msgstr "Vender" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -648,7 +652,7 @@ msgid "Enter password:" msgstr "Ingrese contraseña:" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Borrar" @@ -724,7 +728,7 @@ msgstr "arco iris 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -735,12 +739,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jugadores estan presentes." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Susurrando a %s: %s" @@ -754,9 +758,10 @@ msgid "No" msgstr "No" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Ignorar" @@ -902,7 +907,7 @@ 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/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Cerrar" @@ -929,8 +934,8 @@ msgstr "Equipamiento" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Quitárselo" @@ -972,31 +977,31 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Tirar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Dividir" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Conjuntos" @@ -1005,17 +1010,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Almacenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Recuperar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Tirar" @@ -1153,7 +1158,7 @@ msgstr "¿%s %d?" msgid "jacko spawning" msgstr "desove de jacko" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "Has dejado el clan." @@ -1255,7 +1260,7 @@ msgstr "Enviar" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Limpiar" @@ -1293,321 +1298,331 @@ msgstr "Quitárselo antes" msgid "Away outfit" msgstr "Conjunto para modo AFK" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Intercambio" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Susurrar" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Sanar" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Ser amigo" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "Desatender" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "Lista negra" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Borrar" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Des-ignorar" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Imitación" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "Invitar a grupo" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Sacar del grupo" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Sacar del clan" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "Cambiar posición en el clan" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "Invitar al clan" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Sacar jugador" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "Eliminar" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Mostrar artÃculos" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Desvestir" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "Agregar comentario" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "Vender (?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Sacar" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "Remover de la lista de ataque" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "Añadir a la lista de ataque prioritaria" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "Agregar a la lista de ataque" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Agregar a la lista de ignorados" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Agregar nombre al chat" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Recoger" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Añadir al chat" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Mapa Objeto" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Renombrar" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Quitar" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "Deformar" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Cargar conjuntos antiguos" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Hechizos" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Cargar hechizos antiguos" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Editar hechizo" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Deshabilitar resaltado" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Habilitar resaltado" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "No remover nombre" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Remover nombre" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "Habilitar ausencia" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "Deshabilitar ausencia" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Dejar" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "Cambiar posición del Clan" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Renombrar señal del mapa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Nombre:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "Comentario del jugador " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "Comentario: " -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "Agredar al intercambio" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "Agregar 10 al intercambio" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "Agregar la mitad al intercambio" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "Agregar todo al intercambio" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Almacenar 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Almacenar la mitad" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Almacenar todo" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "Tirar todo" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Recuperar 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Recuperar la mitad" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Recuperar todo" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Cargar atajos antiguos de artÃculos" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Cargar atajos antiguos de soltar (drop)" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "Restablecer barra amarilla" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copiar al chat" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(predeterminado)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Subir" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Bajar" @@ -1863,6 +1878,10 @@ msgstr "Otro" msgid "Highlight words (separated by comma)" msgstr "Resaltar palabras (separadas por coma)" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "Mostrar mensajes MVP" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Asà es como se verá el color" @@ -2262,23 +2281,27 @@ msgstr "Ignorado" msgid "Erased" msgstr "Borrado" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "En la lista negra" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Permitir intercambios" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Permitir mensajes privados" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Viejo" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "Relaciones" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Cuando se ignora a alguien:" @@ -2538,7 +2561,7 @@ msgstr "Mostrar enlaces en anuncio" msgid "Auction" msgstr "Subasta" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Propuesta de intercambio" @@ -2837,182 +2860,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) desplazarse al objetivo en el rango de ataque" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "(a) rango de ataque de arquero" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) mover al objetivo" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) seguimiento predeterminado" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) seguimiento relativo" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) seguimiento tipo espejo" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "(P) seguimiento como mascota" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) seguimiento desconoicido" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) ataque predeterminado" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) intercambiar ataque sin escudo" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) intercambiar ataque con escudo" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) atacar" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) ir y atacar" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) ir, atacar, recoger" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) sin atacar automáticamente" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) recoger a 1x1 celdas (pequeño)" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) recoger a 2x1 celdas (predeterminado)" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) recoger interesadamente a 2x3 celda" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) recoger a 3x3 celdas" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) ir y recoger en distancia 4" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(G) ir y recoger en distancia 8" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) ir y recoger a máxima distancia" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) recoger" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) vista normal del mapa" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) vista depurar del mapa" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) ultra vista del mapa" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(U) ultra vista del mapa 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) vista vacÃa del mapa" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) vista del mapa en blanco y negro" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) vista del mapa" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) usar #flar para ataque mágico" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) usar #chiza para ataque mágico" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) usar #ingrav para ataque mágico" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) usar #frillyar para ataque mágico" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) usar #upmarmu para ataque mágico" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) ataque mágico" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) imitación predeterminada" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) imitación de conjuntos" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) imitación" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) en el teclado" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) lejos del teclado" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) afuera" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) modo de cámara de juego" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) modo de cámara libre" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "(D) Definir el modo operativo de la cámara" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Modificadores del juego están deshabilitados" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Modificadores del juego están habilitados" @@ -3064,18 +3091,18 @@ msgstr "Nivel: %d (GM %d)" msgid "Correction points: %d" msgstr "Puntos de corrección: %d" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3083,20 +3110,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3112,7 +3139,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3124,70 +3151,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3505,7 +3532,7 @@ msgstr "Limites de Lugar de Inicio" msgid "Road Point" msgstr "Mostrar camino" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Quién está conectado - Actualizando" @@ -3513,15 +3540,15 @@ msgstr "Quién está conectado - Actualizando" msgid "Update" msgstr "Actualizar" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Quienes están conectados - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Quienes están conectados - error" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "Quienes están conectados - Actualizar" @@ -4227,160 +4254,160 @@ msgstr "" "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego " "puede presentar un comportamiento raro." -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "Fuiste eliminado por " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Intentaste recoger un objeto inexistante." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "El artÃculo es muy pesado." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "El artÃculo está muy lejos." -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "El inventario está lleno." -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "El agrupamiento es demasiado grande." -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "El artÃculo pertenece a alguien más." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 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:1465 +#: src/localplayer.cpp:1466 #, 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@@]." -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Fuera del Teclado" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Seguir: " -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "Imitacion: " -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Imitación cancelada" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "Ves " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" +msgstr "manaplus [options] [manaplus-file]" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[mana-file] : El archivo mana es un archivo XML (.mana)" +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:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr " usado para establecer parámetros personalizados." -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr " al cliente manaplus." -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Opciones:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Archivo de registro a usar" -#: src/main.cpp:54 +#: src/main.cpp:55 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:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Muestra la versión" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " -h --help : Muestra la ayuda" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Carpeta de Configuración a usar" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Acceder con este nombre de usuario" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password : Acceder con la contraseña" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --character : Acceder con este jugador" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login server o IP" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Puerto del servidor" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr " --update-host : Usar este host de actualización" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Escoje el personaje por defecto y el servidor" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Saltarse las actualizaciones" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Carpeta por donde cargar los datos del juego" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Carpeta para usar los datos locales" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Carpeta donde guardar los screenshots" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Iniciar el juego en modo seguro" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Deshabilita OpenGL en esta sesion" @@ -4436,7 +4463,7 @@ msgstr "Error desconocido del char-server." 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:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Nombre equivocado." @@ -4481,11 +4508,11 @@ msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado." msgid "Whisper could not be sent, ignored by %s." msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s." -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "Jugador VIP." -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "Jugador MVP: " @@ -4518,81 +4545,81 @@ msgstr "La verificación de la guild no se effectuó." msgid "Unknown server response." msgstr "Respuesta del servidor desconocida." -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "Nombre del clan: %s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "Maestro del clan: %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "Nivel en el clan: %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "Miembros conectados: %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "Máx. Miembros: %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "Nivel promedio: %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "Experiencia del clan: %d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "Experiencia siguiente del clan: %d" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "Castillo del clan: %s" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "No se puede invitar jugadores al clan." -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "El jugador ha rechazado la invitación al clan." -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "El usuario es ahora de tu clan." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "Tu clan está lleno." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "Invitación desconocida a un clan." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%s ha dejado tu clan." -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "Usted fue expulsado del clan." -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%s saco alguien de tu clan." @@ -4711,11 +4738,11 @@ msgstr "Imposible compartir experiencia." msgid "Experience sharing unknown." msgstr "Compartir experiencia desconocido." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Fallo al usar el objeto." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "Imposible equipar." @@ -4731,41 +4758,41 @@ msgstr "Contrasena antigua incorrecta." msgid "New password too short." msgstr "Nueva contrasena es muy corta." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "ID no registrada." -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Contrasena incorrecta." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "La cuenta expiró." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "Rechazado del servidor." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 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." -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Cliente es demasiado antÃguo." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4774,15 +4801,15 @@ msgstr "" "Has sido baneado temporalmente del juego %s.\n" "Por favor contacta un GM de nuestro equipo via el foro." -#: src/net/ea/loginhandler.cpp:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Servidor sobrepoblado." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Este nombre de usuario ya está escogido." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Nombre de usuario borrado permanentemente." @@ -4824,45 +4851,45 @@ msgstr "%s no puede unirse a tu grupo porque está completamente lleno." msgid "QQQ Unknown invite response for %s." msgstr "QQQ respuesta desconocida a la invitacion de %s." -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "Has dejado el grupo." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s dejó tu grupo." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "Un miembro desconocido intentó decir: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Estás muerto" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: 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..." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "Las manos frÃas de la muerte se están apoderando de tu alma." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Fin Del Juego!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "Inserta moneda para continuar." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4870,7 +4897,7 @@ msgstr "" "No, niños. Tu jugador no murió realmente. Sólo... eeeh... fue a un lugar " "mejor." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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." @@ -4878,72 +4905,72 @@ msgstr "" "¡Parece que tu plan de romper las armas de tus enemigos con tu garganta " "falló!" -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Creo que esto no fue muy bien." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "¿Quieres que tus posesiones sean identificadas?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Desgraciadamente, nada de ti fue encontrado..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Aniquilado." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Parece que te tiraron tu cabeza a tus manos." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "Tu no estás muerto aún... sólo estás descansando." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Tu ya no existes más." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Parece que dejaste de existir." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Has expirado e ido a ver al tu creador." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Eres un cadáver." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Sin vida, descansa en paz." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Si no estuvieras tan animado, dirÃa que estás muerto." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "Tus procesos metabólicos son ya historia." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "Estás fuera de tus botas." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "Te han echado a patadas." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -4951,184 +4978,184 @@ msgstr "" "Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro " "de los invisibles." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "Eres un ex-jugador." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "Estas avanzando... hacia el barranco." -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Mensaje" -#: src/net/ea/playerhandler.cpp:337 +#: 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." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "Has cogido %s." -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "Has gastado %s." -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "¡Imposible incrementar!" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "Equipar las flechas primero." -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "¡Fallo al intercambiar!" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "¡Fallo al hacer un emoticono!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "¡Fallo al sentarse!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "¡Fallo al crear un chat!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "¡No se puede unir al grupo!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "¡Imposible gritar!" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "PV insuficiente!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "SP insuficiente!" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "No tienes ninguna nota armenzada!" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "No puedes hacer esto ahora mismo!" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Parece que necesitas más dinero... ;-)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "¡No puedes usar esta habilidad con este tipo de arma!" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "Necesitas otra Gema Roja!" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "Necesitas otra Gema Azul!" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "Llevas muchas cosas para hacer esto!" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "Huh? Qué es eso?" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "Fallo al teletransportar..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "No puedes robar nada..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "Veneno no tuvo ningún efecto..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 quiere comerciar contigo, aceptas?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" "No es posible realizar el Intercambio. El otro personaje está muy alejado." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "El intercambio no es posible. El personaje no existe." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "Intercambio cancelado por una razón desconocida." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "Intercambio: Tú y %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "Intercambio con %s cancelado." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "Intercambio no soportado." -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "Error al añadir objeto. El otro jugador lleva mucho peso." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "Error al añadir objeto. El otro jugador no tiene más espacio." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "Fallo al agregar artÃculo. No puedes intercambiar este artÃculo." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "Fallo al anadir objeto por una razón desconocida." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Intercambio Cancelado." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Intercambio Realizado." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Fuerza" @@ -5137,7 +5164,7 @@ msgstr "Fuerza" msgid "Strength %+.1f" msgstr "Fuerza %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Agilidad" @@ -5146,7 +5173,7 @@ msgstr "Agilidad" msgid "Agility %+.1f" msgstr "Agilidad %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Destreza" @@ -5155,7 +5182,7 @@ msgstr "Destreza" msgid "Dexterity %+.1f" msgstr "Destreza %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitalidad" @@ -5164,7 +5191,7 @@ msgstr "Vitalidad" msgid "Vitality %+.1f" msgstr "Vitalidad %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Inteligencia" @@ -5476,74 +5503,74 @@ msgstr "Fallo en la autentificación." msgid "No servers available." msgstr "Servidores indiponibles." -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Alguien está intentando usar tu cuenta." -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Ya hay alguien conectado con esta cuenta." -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Hack de velocidad detectado." -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Login duplicado." -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "Error de conexión desconocido." -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "¡Desconectado del servidor!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Suerte" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Defensa" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "Ataque M." -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "Defensa M." -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% Precisión" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% Evasión" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% CrÃtico" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "Retardo de Ataque" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "Retardo de Marcha" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "Alcance de Ataque" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "Daño por segundo." @@ -5551,11 +5578,11 @@ msgstr "Daño por segundo." msgid "Empty address given to Network::connect()!" msgstr "Adress vacÃa enviada a Network::connect()!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "No es posible determinar el host \"" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Conexión al servidor terminada." @@ -5564,19 +5591,19 @@ msgstr "Conexión al servidor terminada." msgid "%s is not in your party!" msgstr "%s no está en tu grupo!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Parpadear nombre" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Burbuja '...' flotante" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Burbuja Flotante" @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:45+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: fi\n" @@ -19,25 +19,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Näkyvillä kartalla" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "väistö" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "huti" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "" @@ -139,15 +139,15 @@ msgstr "Päivityshakemistoa luodessa tapahtui virhe!" 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Tuntematon komento." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Et voi lähettää tyhjiä kuiskauksia!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -156,152 +156,156 @@ msgstr "" "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai " "käytit omaa nimeäsi." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Pyyntö liittyä kanavalle %s lähetetty." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ryhmän nimi puuttuu." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Killan nimi puuttuu." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Anna nimi." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Viesti sulkee keskustelun." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Nyt viesti sulkee keskustelun." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "ystävä" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "vaimennettu" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutraali" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Pelaaja on jo %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Pelaaja on nyt %s." -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "Pelaajaa ei ollut jätetty huomiotta!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "Pelaaja huomioidaan taas." -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Pelaajan uudelleenhuomiointi epäonnistui." -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Pelaaja on jo pyyhitty!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Pelaaja pyyhitty." -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty." -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Ohjelma ollut käynnissä: %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d viikon" msgstr[1] "%d viikkoa" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d päivän" msgstr[1] "%d päivää" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d tunnin" msgstr[1] "%d tuntia" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuutin" msgstr[1] "%d minuuttia" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunnin" msgstr[1] "%d sekuntia" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "kirjasinvälimuistin koko" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Välimuistin koko:" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Luotu:" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Poistettu:" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "Resurssikuvat:" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "Orvot resurssikuvat:" @@ -312,11 +316,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Yleiset" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Debug" @@ -332,23 +336,23 @@ msgstr "Ruutukaappauksen tallentaminen epäonnistui!" msgid "The connection to the server was lost." msgstr "Yhteys palvelimeen katkesi." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Verkkovirhe" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Et huomioi kaupankäyntipyyntöjä" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Hyväksyt kaupankäyntipyynnöt" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Kartan lataaminen epäonnistui" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Kohdetta %s ladattaessa tapahtui virhe." @@ -382,19 +386,19 @@ msgid "Name" msgstr "Nimi" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Hyökkää" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Keskustele" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Liiku" @@ -407,8 +411,8 @@ msgid "Reset" msgstr "Nollaa" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Osta" @@ -426,7 +430,7 @@ msgstr "" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -434,7 +438,7 @@ msgstr "+" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -447,7 +451,7 @@ msgstr "Sulje" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Max" @@ -456,8 +460,8 @@ msgstr "Max" msgid "Shop" msgstr "Kauppa" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -466,15 +470,15 @@ msgstr "Myy" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -645,7 +649,7 @@ msgid "Enter password:" msgstr "Salasana:" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Poista" @@ -721,7 +725,7 @@ msgstr "sateenkaari 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -732,12 +736,12 @@ msgstr "???" msgid "Chat" msgstr "Keskustelu" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Läsnä: %s; %d pelaajaa paikalla." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Kuiskaat pelaajalle %s: %s" @@ -751,9 +755,10 @@ msgid "No" msgstr "Ei" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Ohita" @@ -899,7 +904,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Sulje" @@ -926,8 +931,8 @@ msgstr "Varusteet" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Poista varuste käytöstä" @@ -969,31 +974,31 @@ msgid "Filter:" msgstr "Suodin:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 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:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Käytä" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Pudota..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Jaa" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Asukokonaisuudet" @@ -1002,17 +1007,17 @@ msgid "Weight:" msgstr "Paino:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Varastoi" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Ota" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Pudota" @@ -1150,7 +1155,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "Olet eronnut killasta." @@ -1252,7 +1257,7 @@ msgstr "Lähetä" msgid "NPC" msgstr "Ei-pelaajahahmo (NPC)" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Tyhjennä" @@ -1290,321 +1295,331 @@ msgstr "Riisu ensin" msgid "Away outfit" msgstr "Poissaoloasu" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Tee kaupat" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Kuiskaa" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Paranna" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Ystävysty" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "Vaimenna" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Pyyhi" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Huomioi jälleen" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "Jätä täysin huomiotta" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Seuraa" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Matki" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "Kutsu ryhmään" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Potki ryhmästä" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Potki killasta" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "Muuta kilta-asemaa" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "Kutsu kiltaan" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Potki pelaaja" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "Pommita" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Näytä tavarat" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Riisu" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Potki" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "Poista hyökkäyslistasta" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "Lisää prioriteettihyökkäyslistalle" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "Lisää hyökkäyslistaan" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Lisää ohitettavien listaan" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Lisää nimi keskusteluun" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Nosta" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Lisää keskusteluun" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Karttaolio" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Nimeä uudelleen" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Poista" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Lataa vanhat asut" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Loitsut" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Lataa vanhat loitsut" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Muokkaa loitsua" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Estä korostus" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Salli korostus" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Poista nimi" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "Ota poissaolo käyttöön" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "Poista poissaolo käytöstä" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Eroa" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "Muuta asemaa killassa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Muuta merkin nimeä " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Nimi: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "Lisää kauppaan" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "Lisää 10 kauppaan" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "Lisää puolet kauppaan" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "Lisää kaikki kauppaan" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Varastoi 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Varastoi puolet" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Varastoi kaikki" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Ota 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Ota puolet" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Ota kaikki" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Lataa vanhat tavarapikavalinnat" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Lataa vanhat pudotuspikavalinnat" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Piilota" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Näytä" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "Palauta oletusmuokkaimet (keltainen palkki)" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(oletus)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Siirrä ylös" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Siirrä alas" @@ -1860,6 +1875,10 @@ msgstr "" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Väri näyttää tältä" @@ -2259,23 +2278,27 @@ msgstr "Huomiotta jätetty" msgid "Erased" msgstr "Pyyhitty" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Salli kaupakäynti" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Salli kuiskaukset" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Vanha" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Kun jätät huomiotta:" @@ -2533,7 +2556,7 @@ msgstr "Näytä linkit ilmoituksessa" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Kaupantekoehdotus" @@ -2832,182 +2855,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) siirry kohteen luo hyökkäyskantamalla" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) siirry kohteen luo" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) oletusseuraaminen" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) suhteellinen seuraaminen" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) peilikuvaseuraaminen" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "(P) lemmikkiseuraaminen" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) tuntematon seuraaminen" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) oletushyökkäys" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) vaihda hyökkäystä, ei kilpeä" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) vaihda hyökkäystä, kilpi mukana" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) hyökkäys" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) mene ja hyökkää" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) mene, hyökkää, nosta" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) ei automaattista hyökkäystä" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) pieni nosto 1x1 ruutua" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) oletusnosto 2x1 ruutua" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) nosto edestä 2x3 ruutua" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) nosto 3x3 ruutua" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) mene ja nosta etäisyydellä 4" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(G) mene ja nosta etäisyydellä 8" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) mene ja nosta maksimietäisyydellä" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) nosta" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) normaali karttanäkymä" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) debug-karttanäkymä" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) ultra-karttanäkymä" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(U) ultra-karttanäkymä 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) tyhjä karttanäkymä" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) mustavalkoinen karttanäkymä" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) karttanäkymä" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) #flar taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) #chiza taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) #ingrav taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) #frillyar taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) #upmarmu taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) taikahyökkäys" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) oletusmatkinta" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) asun matkinta" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) matkinta" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) paikalla" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) poissa" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) poissaolo" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) pelin kameratila" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) vapaa kamera" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "(D) suunnittelukamera" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Pelimuokkaimet poissa käytöstä" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Pelimuokkaimet käytössä" @@ -3059,18 +3086,18 @@ msgstr "Taso: %d (GM %d)" msgid "Correction points: %d" msgstr "Korjauspisteitä: %d" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3078,20 +3105,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3107,7 +3134,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3119,70 +3146,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3498,7 +3525,7 @@ msgstr "Kotipaikan raja" msgid "Road Point" msgstr "Väyläpiste" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Kuka on linjoila - päivitän" @@ -3506,15 +3533,15 @@ msgstr "Kuka on linjoila - päivitän" msgid "Update" msgstr "Päivitä" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Kuka on linjoilla - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Kuka on linjoilla - virhe" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "Kuka on linjoilla - päivitä" @@ -4221,161 +4248,161 @@ msgstr "" "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; " "ole hyvä ja poista päällekkäisyydet. " -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "Sinut otti hengiltä " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Yritit nostaa olemattoman tavaran." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "Tavara on liian painava." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "Tavara on liian kaukana." -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "Sinulla on liikaa tavaraa ennestään." -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "Kasa on liian suuri." -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "Tavara kuuluu jollekulle muulle." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "Tuntematon ongelma esti tavaran nostamisen." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, 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." -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Poissa" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Seuraa: " -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Seuraaminen keskeytetty" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "Matki: " -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Matkiminen keskeytetty" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "Näet " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [parametrit] [.mana-tiedosto]" +msgid "manaplus [options] [manaplus-file]" +msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[.mana-tiedosto] : Manatiedosto on XML-tiedosto (.mana)" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr " käytetään lisäasetusten antamiseen" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" +msgstr "" #: src/main.cpp:50 -msgid " to the manaplus client." -msgstr " manaplus-sovellukselle." +msgid " used to set custom parameters" +msgstr "" + +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Parametrit:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Käytettävä lokitiedosto" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Käytettävä keskustelulokihakemisto" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Näytä versionumero" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " -h --help : Näytä tämä ohje" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Käytä tätä asetushakemistoa" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Käyttäjätunnus sisäänkirjautumiseen" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password : Salasana sisäänkirjautumiseen" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --character : Hahmo sisäänkirjautumiseen" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" " -s --server : Palvelinnimi tai IP-osoite sisäänkirjautumiseen" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Palvelinportti sisäänkirjautumiseen " -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr " --update-host : Käytä tätä päivityspalvelinta" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Aseta oletushahmopalvelin ja -hahmo" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Ohita päivityslataukset" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Lataa pelidata tästä hakemistosta" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Hakemisto paikallisdatan tallennukseen" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Kuvankaappausten tallennushakemisto" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Käynnistä peli vikasietotilassa" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Poista OpenGL käytöstä tämän session ajaksi" @@ -4431,7 +4458,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:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Väärä nimi." @@ -4476,11 +4503,11 @@ msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään." msgid "Whisper could not be sent, ignored by %s." msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä." -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "MVP-pelaaja." -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "MVP-pelaaja: " @@ -4513,81 +4540,81 @@ msgstr "Emperium-tarkistus epäonnistui." msgid "Unknown server response." msgstr "Tuntematon palvelimen vastaus." -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "Killan nimi: %s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "Kiltamestari: %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "Kiltataso: %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "Jäseniä linjoilla: %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "Jäsenmaksimi: %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "Keskim. taso: %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "Kiltakokemusta: %d kkp" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "Seuraavaan tasoon: %d kkp" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "Killan linna: %s" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "Pelaajan kutsuminen kiltaan epäonnistui." -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "Käyttäjä ei ottanut kiltakutsua vastaan." -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "Käyttäjä liittyi kiltaasi." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "Kiltasi on täynnä." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "Tuntematon vastaus kiltakutsuun." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%s on eronnut killastasi." -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "Sinut on potkittu killasta." -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%s on potkittu ulos killastasi." @@ -4701,11 +4728,11 @@ msgstr "Kokemuksen jako ei ole mahdollista." msgid "Experience sharing unknown." msgstr "Kokemuksen jaon tila on tuntematon." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Tavaran käyttö ei onnistunut." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "Käyttöönotto ei onnistunut." @@ -4721,40 +4748,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:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "Rekisteröimätön tunniste." -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Väärä salasana." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "Tili vanhentunut." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "Palvelin ei kelpuuttanut yhteydenottoasi." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 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:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Liian vanha asiakasohjelma." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4763,15 +4790,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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Palvelin on täynnä." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Käyttäjätunnus on jo käytössä." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Käyttäjänimi pysyvästi poistettu." @@ -4813,45 +4840,45 @@ msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä." msgid "QQQ Unknown invite response for %s." msgstr "QQQ Tuntematon kutsuvastaus kohteella %s." -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "Erosit ryhmästä." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s on eronnut ryhmästä." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "Tuntematon jäsen yritti sanoa: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Olet kuollut." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Et ole enää erityisen elossa." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "Tuonelasta käy sieluusi kylmä viima." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Se siitä!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "Syötä kolikko jatkaaksesi." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4859,7 +4886,7 @@ msgstr "" "Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan " "paikkaan." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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." @@ -4867,72 +4894,72 @@ msgstr "" "Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi " "epäonnistui." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Ei tainnut mennä kovin lujaa." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Pim! Olet annihiloitu." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Jäi näköjään oma pää vetävän käteen." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "Et ole kuollut vielä, lepäät vain." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Olet lakannut olemasta." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Olet lähtenyt moikkaamaan luojaasi." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Raato mikä raato." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Olet eloton, mutta lepäät rauhassa." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Ellet olisi näin liikkuvainen, pukkaisit päivänkakkaraa." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "Aineenvaihduntaprosessisi ovat historiaa." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "Olet lopultakin nakkisuojassa." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "Potkaisit tyhjää." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -4940,183 +4967,183 @@ msgstr "" "Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan " "jokeen." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "Olet entinen pelaaja." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "Kaipaat kotivuonoille." -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Viesti" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "%s nostettu." -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "Käytit %s." -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "Taidon korottaminen epäonnistui!" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "Varusta ensin nuolia." -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "Kauppa epäonnistui!" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "Elehtiminen epäonnistui!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "Istuminen epäonnistui!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "Keskustelun luonti epäonnistui!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "Ryhmään liittyminen epäonnistui!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "Huutaminen epäonnistui!" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "Et ole vielä riittävän korkealla tasolla!" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "Voimapisteesi eivät riitä!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "Manapisteesi eivät riitä!" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "Sinulla ei ole muistioita (memo)." -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Et voi tehdä tätä juuri nyt." -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Näyttää siltä että tarvitset lisää rahaa." -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa." -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "Tarvitset toisen punaisen helmen." -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "Tarvitset toisen sinisen helmen." -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "Kannat liian paljon tehdäksesi tällaista!" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "Siis mikä?" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "Siirtymä (warp) epäonnistui..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "Varastaminen ei onnistunut..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "Myrkyllä ei ollut vaikutusta..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "Kaupanteko keskeytyi tuntemattomasta syystä." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "Kauppa: sinä ja %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "Kaupanteko pelaajan %s kanssa peruttu." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "Käsittelemätön kaupan peruutus -paketti." -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" "Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "Tavaran lisääminen epäonnistui. Et voi kaupitella sitä." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Kaupat peruttu." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Kaupat tuli." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Voima" @@ -5125,7 +5152,7 @@ msgstr "Voima" msgid "Strength %+.1f" msgstr "Voima %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Ketteryys" @@ -5134,7 +5161,7 @@ msgstr "Ketteryys" msgid "Agility %+.1f" msgstr "Ketteryys %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Näppäryys" @@ -5143,7 +5170,7 @@ msgstr "Näppäryys" msgid "Dexterity %+.1f" msgstr "Näppäryys %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Elinvoima" @@ -5152,7 +5179,7 @@ msgstr "Elinvoima" msgid "Vitality %+.1f" msgstr "Elinvoima %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Älykkyys" @@ -5464,74 +5491,74 @@ msgstr "Tunnistus epäonnistui." msgid "No servers available." msgstr "Palvelimia ei saatavilla." -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Joku muu yrittää käyttää tätä tunnusta." -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Tällä tunnuksella on jo kirjauduttu." -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Nopeusviritelmä havaittu." -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Kaksinkertainen sisäänkirjautuminen." -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "Tuntematon yhteysongelma." -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Yhteys palvelimeen katkesi!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Tuuri" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Puolustus" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "T.-hyökkäys" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "T.-puolustus" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% Tarkkuus" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% Välttö" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% Täysosuma" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "Hyökkäysviive" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "Kävelyviive" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "Hyökkäyskantama" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5539,11 +5566,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "Tyhjä osoite Network::connect()-pyynnössä!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "Osoitetta ei löydy: \"" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Yhteys palvelimeen katkaistu. " @@ -5552,19 +5579,19 @@ msgstr "Yhteys palvelimeen katkaistu. " msgid "%s is not in your party!" msgstr "%s ei ole ryhmässäsi!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Tulosta '...'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Vilkuta nimeä" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Leijuva '...' -puhekupla" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Leijuva puhekupla" @@ -7,13 +7,14 @@ # <antoinebcn@hotmail.com>, 2011. # Bernard <nard@bh28.net>, 2011. # Jumpy <antoinebcn@hotmail.com>, 2011. +# <reidyaro@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:45+0000\n" -"Last-Translator: akaras <akaras@inbox.ru>\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-15 00:41+0000\n" +"Last-Translator: reid <reidyaro@gmail.com>\n" "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/" "fr/)\n" "Language: fr\n" @@ -22,25 +23,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Visible sur la carte" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "esquivé" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "raté" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "I" @@ -143,15 +144,15 @@ 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Commande inconnue." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Vous ne pouvez pas envoyer de messages vides." -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,153 +161,157 @@ 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:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Demande de rejoindre le canal %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Le nom du groupe est manquant." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Le nom de la guilde est manquant." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Veuillez indiquer un nom." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "La touche <entrée> ferme la ligne d'entrée du chat." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Le message ferme la conversation." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "" "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Le message ferme maintenant la conversation." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "ami" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "écarté" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutre" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Joueur déjà %s !" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Joueur %s avec succès!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Le joueur n'a pas pu %s !" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "Le joueur n'était pas ignoré !" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "Le joueur n'est plus ignoré !" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "sous liste noir" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Joueur déjà effacé !" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Joueur éliminé avec succès !" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "le joueur n'a pas pu être effacé !" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Heure de lancement du client : %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondes" msgstr[1] "%d secondes" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "Taille du cache de polices" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Dimension du cache :" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Créé : " -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Effacé :" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "Images des ressources :" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "Images des ressources non affectées :" @@ -316,11 +321,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Général" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Informations" @@ -337,23 +342,23 @@ 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:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Erreur Réseau" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Ignorer les requêtes d'échanges entrantes" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Accepter les requêtes d'échanges entrantes" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "La carte n'a pu être chargée" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Erreur durant le chargement %s" @@ -387,19 +392,19 @@ msgid "Name" msgstr "Nom" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Attaquer" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Parler" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Déplacement" @@ -412,8 +417,8 @@ msgid "Reset" msgstr "Réinitialiser" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Acheter" @@ -425,13 +430,13 @@ msgstr "Prix : %s / Total : %s" #: src/gui/buydialog.cpp:103 msgid "Amount:" -msgstr "" +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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -439,7 +444,7 @@ msgstr "+" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -452,7 +457,7 @@ msgstr "Quitter" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Max." @@ -461,8 +466,8 @@ msgstr "Max." msgid "Shop" msgstr "Boutique" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -471,15 +476,15 @@ msgstr "Vendre" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -650,7 +655,7 @@ msgid "Enter password:" msgstr "Entrer le mot de passe :" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Supprimer" @@ -726,7 +731,7 @@ msgstr "arc en ciel 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -737,12 +742,12 @@ msgstr "???" msgid "Chat" msgstr "Conversation" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Présents : %s ; %d joueurs sont présents." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Message envoyé à %s : %s" @@ -756,9 +761,10 @@ msgid "No" msgstr "Non" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Ignorer" @@ -904,7 +910,7 @@ 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/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fermer" @@ -931,8 +937,8 @@ msgstr "Équipement" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Retirer" @@ -974,31 +980,31 @@ msgid "Filter:" msgstr "Filtre :" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Équiper" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Utiliser" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Jeter..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Partager" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Tenues" @@ -1007,17 +1013,17 @@ msgid "Weight:" msgstr "Poids :" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Entreposer" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Récupérer" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Jeter" @@ -1155,7 +1161,7 @@ msgstr "%s %d?" msgid "jacko spawning" msgstr "Arrivée de Jack0" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "vous avez quitté la guilde." @@ -1257,7 +1263,7 @@ msgstr "Soumettre" msgid "NPC" msgstr "PNJ" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Effacer" @@ -1295,321 +1301,331 @@ msgstr "Retirer d'abord l'équipement" msgid "Away outfit" msgstr "Équipement en absence" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Échange" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Message" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Soigner" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Être ami" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "Éviter" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "Liste noir" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Éliminer" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Ne plus ignorer" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "Ignorer complètement" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Suivre" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Imiter" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "Inviter dans le groupe" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Sortir du groupe" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Sortir de la guilde" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "Changer la position dans la guilde" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "Inviter dans la guilde" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Sortir le joueur" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "Annihiler" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Montrer les objets" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Déshabiller" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "Ajouter commentaire" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Acheter (?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "Vendre (?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Virer" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "Enlever de la liste d'attaque" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "Ajouter à la liste de priorités d'attaque" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "Ajouter à la liste d'attaque" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Ajouter à la liste d'ignorés" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Ajouter le nom dans la boite de dialogue" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Ramasser" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Ajouter à la conversation" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Objet de carte" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Renommer" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Enlever" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "Télétransportation" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Charger les anciennes tenues" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Sortilèges" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Charger les anciens sorts" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Éditer le sortilège" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Désactiver la surbrillance" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Activer la surbrillance" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "Ne pas enlever les noms" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Enlève le nom" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "Active la fonction Absence" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "Désactive la fonction Absence" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Quitter" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 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:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Renommer le panneau de carte" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Nom : " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "Le joueur commente " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "Commentaire : " -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "Ajouter à la transaction" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "Ajouter 10 dans l'échange" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "Ajouter la moitié dans l'échange" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "Ajouter tout dans l'échange" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Entreposer 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Entreposer la moitié" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Entreposer tout" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "Jeter tout" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Reprendre 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Reprendre la moitié" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Reprendre tout" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Charger les anciens raccourcis d'objets" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Charger les anciens raccourcis de jets d'objets" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Cacher" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Montrer" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "Remise aux valeurs de défaut de la barre jaune" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copier dans la conversation" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(défaut)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Aller vers le haut" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Aller vers le bas" @@ -1862,7 +1878,11 @@ msgstr "Autre" #: src/gui/setup_chat.cpp:125 msgid "Highlight words (separated by comma)" -msgstr "" +msgstr "Mots en surbrillance (séparer par un coma)" + +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "Montrer les messages MVP" #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" @@ -1989,7 +2009,7 @@ msgstr "Afficher la barre de vie des monstres" #: src/gui/setup_other.cpp:60 msgid "Cycle monster targets" -msgstr "Entourer les monstres visés" +msgstr "Sélectionner les monstres par ordre de distance" #: src/gui/setup_other.cpp:66 msgid "Show warps particles" @@ -2021,15 +2041,15 @@ msgstr "Afficher les touches-raccourcis sur la carte" #: src/gui/setup_other.cpp:87 msgid "Enable lazy scrolling" -msgstr "" +msgstr "Activer le défilement paresseux" #: src/gui/setup_other.cpp:90 msgid "Scroll laziness" -msgstr "" +msgstr "Paresse de défilement" #: src/gui/setup_other.cpp:93 msgid "Scroll radius" -msgstr "" +msgstr "Rayon de défilement" #: src/gui/setup_other.cpp:97 msgid "Moving" @@ -2065,7 +2085,7 @@ msgstr "Activer les statistiques instantanées" #: src/gui/setup_other.cpp:120 msgid "Cycle player targets" -msgstr "Entourer les joueurs visés" +msgstr "Sélectionner les joueurs par ordre de distance" #: src/gui/setup_other.cpp:123 msgid "Show job exp messages" @@ -2109,11 +2129,11 @@ msgstr "Supports de robot" #: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" -msgstr "" +msgstr "Activer le support pour auction bot" #: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" -msgstr "" +msgstr "Activer le support pour guild bot et désactiver le support par défault" #: src/gui/setup_other.cpp:168 msgid "Enable server side attack" @@ -2191,7 +2211,7 @@ msgstr "Disable advanced beings caching (Software)" #: src/gui/setup_perfomance.cpp:89 msgid "Disable beings caching (Software)" -msgstr "" +msgstr "Désactiver la mise en cache des êtres" #: src/gui/setup_players.cpp:48 msgid "Players" @@ -2211,7 +2231,7 @@ msgstr "Afficher son propre nom" #: src/gui/setup_players.cpp:63 msgid "Enable extended mouse targeting" -msgstr "" +msgstr "Activer la souris suplémentaire lors du ciblage" #: src/gui/setup_players.cpp:66 msgid "Target dead players" @@ -2265,23 +2285,27 @@ msgstr "Ignoré" msgid "Erased" msgstr "Effacé" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "Sous liste noir" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Autoriser les échanges" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Autoriser les messages privés" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Ancien" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "Relations" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Quand ignoré :" @@ -2546,7 +2570,7 @@ msgstr "Montrer les liens dans l'annonce" msgid "Auction" msgstr "Enchère" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Demande d'échange" @@ -2849,182 +2873,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) Aller à la cible dans le champ d'attaque" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "(a) Portée des attaques des Archéens" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) Aller à la cible" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) Suivre : défaut" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) Suivre: mouvement relatif" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) Suivre effet miroir" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "(P) Suivre comme un toutou" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) Suivre : mode inconnu" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) Attaque : défaut" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) Attaquer sans protection" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) Attaquer avec protection" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) Attaque" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) Se déplacer et attaquer" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) Se déplacer, attaquer et ramasser" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) Sans attaque automatique" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) Ramassage sur 1x1 case" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) Ramassage par défaut sur 2x1 cases" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Ramassage avant sur 2x3 cases" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) Ramassage sur 3x3 cases" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) Aller et ramasser jusqu'à 4 de distance" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(G) Aller et ramasser jusqu'à 8 de distance" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) Aller et ramasser jusqu'à la distance max" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) Ramassage" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) Vue normale du jeu" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) Vue du jeu mode déverminage" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) Vue du jeu mode Ultra 1" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(u) Vue du jeu mode Ultra 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) Vue de la carte vide" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) Vue de la carte en N&B" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) Carte" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) Utiliser #flar comme sort d'attaque" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) Utiliser #chiza comme sort d'attaque" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) Utiliser #ingrav comme sort d'attaque" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) Utiliser #frillyar comme sort d'attaque" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Utiliser #upmarmu comme sort d'attaque" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) Sorts d'attaque" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) Imitation par défaut" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) Imiter les équipements" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) Imitation" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) Présent sur le jeu" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) Absent" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) Absent" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) Mode camera du jeu" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) Mode camera libre" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "(D) Définir le mode camera" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Modificateurs de mode de jeu désactivés" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Modificateurs de mode de jeu activés" @@ -3076,18 +3104,18 @@ msgstr "Niveau : %d (GM %d)" msgid "Correction points: %d" msgstr "Points de correction : %d" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3095,20 +3123,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3124,7 +3152,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3136,70 +3164,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3261,7 +3289,7 @@ msgstr "Commande :" #: src/gui/textcommandeditor.cpp:200 msgid "Comment:" -msgstr "" +msgstr "Commentaire : " #: src/gui/textcommandeditor.cpp:203 msgid "Mana:" @@ -3517,7 +3545,7 @@ msgstr "Limites de votre position" msgid "Road Point" msgstr "Étape" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Qui est en ligne - Mise à jour" @@ -3525,15 +3553,15 @@ msgstr "Qui est en ligne - Mise à jour" msgid "Update" msgstr "Mise à jour" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Qui est en ligne - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Qui est en ligne - Erreur" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "Qui est en ligne - Mise à jour" @@ -3822,7 +3850,7 @@ msgstr "Sac" #: src/keyboardconfig.cpp:43 msgid "Basic Keys" -msgstr "" +msgstr "Touches de base" #: src/keyboardconfig.cpp:44 msgid "Move Up" @@ -3870,7 +3898,7 @@ msgstr "Arrêter d'attaquer" #: src/keyboardconfig.cpp:65 msgid "Untarget" -msgstr "" +msgstr "Désélectionner" #: src/keyboardconfig.cpp:66 msgid "Target Closest" @@ -3918,7 +3946,7 @@ msgstr "Sélectionner OK" #: src/keyboardconfig.cpp:85 msgid "Shortcuts Keys" -msgstr "" +msgstr "Touches des raccourcies" #: src/keyboardconfig.cpp:86 msgid "Item Shortcuts Key" @@ -3941,7 +3969,7 @@ msgstr "Raccourci Objet %d" #: src/keyboardconfig.cpp:128 msgid "Windows Keys" -msgstr "" +msgstr "Touches des fenêtres" #: src/keyboardconfig.cpp:129 msgid "Help Window" @@ -4033,7 +4061,7 @@ msgstr "Onglet de dialogue suivant" #: src/keyboardconfig.cpp:175 msgid "Emotes Keys" -msgstr "" +msgstr "Touches d'émoticones" #: src/keyboardconfig.cpp:176 msgid "Smilie" @@ -4068,7 +4096,7 @@ msgstr "Raccourci d'émoticône %d" #: src/keyboardconfig.cpp:270 msgid "Outfits Keys" -msgstr "" +msgstr "Touches d'habillages" #: src/keyboardconfig.cpp:271 msgid "Wear Outfit" @@ -4084,7 +4112,7 @@ msgstr "Copier l'équipement porté dans les tenues" #: src/keyboardconfig.cpp:277 msgid "Chat Keys" -msgstr "" +msgstr "Touches de la boite de dialogue" #: src/keyboardconfig.cpp:278 msgid "Toggle Chat" @@ -4128,7 +4156,7 @@ msgstr "Désactiver la saisie dans le chat" #: src/keyboardconfig.cpp:299 msgid "Other Keys" -msgstr "" +msgstr "Autre touches" #: src/keyboardconfig.cpp:300 msgid "Ignore input 1" @@ -4243,167 +4271,167 @@ msgstr "" "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des " "touches ou attendez vous à un possible comportement étrange du jeu." -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "Vous avez été tué par " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Vous avez essayé de prendre un item qui n'existe pas." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "L'objet est trop lourd." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "L'objet est trop éloigné" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "L'inventaire est plein" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "La pile est trop grande" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "L'objet appartient a quelqu'un d'autre" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 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:1465 +#: src/localplayer.cpp:1466 #, 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:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Inactif" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Suivre : " -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Suivi annulé" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "Imitation: " -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Imitation annulée" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "Vous voyez " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" +msgstr "manaplus [options] [manaplus-file]" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[mana-file] : Le fichier mana est un fichier XMl (.mana)" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr " utilisé pour configurer le client mana" +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 -msgid " to the manaplus client." -msgstr " to the manaplus client." +msgid " used to set custom parameters" +msgstr "utilisé pour définir des paramètres personnalisés" + +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr "pour le client manaplus." -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Options :" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : fichier journal à utiliser" -#: src/main.cpp:54 +#: src/main.cpp:55 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:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Affiche la version" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " -h --help : Montre cette rubrique d'aide" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Répertoire de configuration à utiliser" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Se connecter avec ce nom d'utilisateur" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password : Se connecter avec ce mot de passe" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --character : Se connecter avec ce personnage" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nom du serveur (ou IP) pour la connexion" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Port de connexion au serveur" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" " --update-host : Utilise cette URL pour les fichiers de mises à jour" -#: src/main.cpp:64 +#: src/main.cpp:65 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:66 +#: src/main.cpp:67 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:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Répertoire des données du jeu à charger" -#: src/main.cpp:69 +#: src/main.cpp:70 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:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Répertoire à utiliser pour les imprime-écrans" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Démarrer le jeu en mode sûr" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Désactive l'OpenGL pour cette session" @@ -4461,7 +4489,7 @@ msgstr "" "Impossible de créer ce personnage. Il est probable que ce nom soit déjà " "utilisé." -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Mauvais nom." @@ -4506,11 +4534,11 @@ msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne." msgid "Whisper could not be sent, ignored by %s." msgstr "Le message privé n'a pu être envoyé, vous êtes ignoré par %s." -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "Joueur MVP" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "MVP joueur :" @@ -4543,81 +4571,81 @@ msgstr "Erreur dans la création de la guilde." msgid "Unknown server response." msgstr "Réponse inconnue du serveur." -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "Nom de la guilde : %s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "Maître de la guilde : %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "Niveau de la guilde : %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "Membres en ligne : %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "Membres maximums : %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "Niveau moyen : %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "Expérience Groupe : %d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "Expérience suivante pour la guilde : %d" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "Château de la guilde : %s" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "N'a pas pu inviter le joueur dans la guilde. " -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "Le joueur a refusé l'invitation dans la guilde." -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "%s est maintenant membre de la guilde." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "Votre guilde est complète." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "Réponse d'invitation à la guilde inconnue." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%s a quitté votre guilde." -#: src/net/ea/guildhandler.cpp:484 +#: 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:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%s a sorti quelqu'un de votre guilde." @@ -4735,11 +4763,11 @@ msgstr "Partage d'expérience impossible." msgid "Experience sharing unknown." msgstr "Paramètre de partage d'expérience inconnu." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Impossible d'utiliser l'objet." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "Impossible d'équiper cet objet." @@ -4755,41 +4783,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:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "Id non enregistrée." -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Mauvais mot de passe." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "Le compte a expiré." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "Rejeté par le serveur." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 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:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Client trop ancien." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4798,15 +4826,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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Serveur surpeuplé." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Ce nom d'utilisateur est déjà utilisé." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Le nom de l'utilisateur a été éliminé de façon permanente." @@ -4848,47 +4876,47 @@ msgstr "%s ne peut rejoindre votre groupe. Celui-ci est complet." msgid "QQQ Unknown invite response for %s." msgstr "QQQ Erreur inconnue sur l'invitation de %s." -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "Vous avez quitté le groupe." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s a quitté le groupe." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "Un membre inconnu a essayé de dire : %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Vous êtes mort." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "" "Nous avons le regret de vous informer que votre personnage est mort sur le " "champ de bataille." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Vous n'êtes plus vraiment en vie." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "Les mains gelées de la faucheuse viennent réclamer ton âme." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Fin de la partie !" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "Introduire une pièce pour continuer" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4896,7 +4924,7 @@ msgstr "" "Non, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,... " "il... est parti dans un monde meilleur." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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." @@ -4904,76 +4932,76 @@ msgstr "" "Votre tentative de casser l'arme de votre ennemi en la frappant avec votre " "gorge a échoué." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Voulez-vous que vos biens soient identifiés ?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Vaporisé." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Il semble que l'on vous ait rendu votre tête." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" "Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un " "autre." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Vous n'existez plus." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Vous avez cessez d'exister." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Tu es fini. Tu es parti retrouver ton créateur." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Tu es un dur." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Privé de toute essence de vie, tu reposes en paix." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" "Si tu n'étais pas autant en forme, tu serais en train de manger les " "pissenlits par la racine." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "Vos processus métaboliques appartiennent au passé maintenant." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "Tu es en dehors des clous" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "Tu viens de toucher le fond." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -4981,190 +5009,190 @@ msgstr "" "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint " "l'armée de l'ombre." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "Tu n'es plus qu'un ancien joueur sans intérêt." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "Tu reposes au fond de l'eau." -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Message" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus " "en mesure de regagner vos points de vie." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Vous portez moins que la moitié de votre poids. Vous pouvez récupérer votre " "santé." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "Vous avez ramassé %s." -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "Vous avez dépensé %s." -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "Ne peut pas augmenter la capacité !" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "Équiper d'abord les flèches!" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "Échec de la transaction !" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "Émoticône non réalisée !" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "Vous n'avez pas pu vous asseoir !" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "Vous n'avez pas pu créer la conversation !" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "Vous n'avez pas pu rejoindre le groupe !" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "Vous ne pouvez pas crier !" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "Vous n'avez pas atteint un niveau suffisant !" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "Pas assez de vie !" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "PV insuffisant !" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "Vous n'avez pas de messages !" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Vous ne pouvez faire cela maintenant !" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "Vous avez besoin d'une autre pierre précieuse rouge !" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "Vous avez besoin d'une autre pierre précieuse bleue !" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "Vous portez trop de choses pour pouvoir faire cela !" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "Hé ? Qu'est-ce donc que cela ?" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "Enchainement échoué..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "Vous n'avez rien pu voler..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "Le poison fut sans effet..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 souhaite réaliser un échange avec vous. Acceptez-vous ?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "L'échange est impossible. Votre partenaire est trop éloigné." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "Échange impossible. Ce personnage n'existe pas." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "Échange annulé pour une raison inconnue." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "Échange : Vous et %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "Échange avec %s annulé." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "Échange non pris en compte." -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" "Impossible de rajouter un objet. Votre partenaire pour cet échange est " "surchargé." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" "Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus " "de place libre." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "Impossible de rajouter un objet pour une raison inconnue." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Échange annulé." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Échange finalisé." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Force" @@ -5173,7 +5201,7 @@ msgstr "Force" msgid "Strength %+.1f" msgstr "Force %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Agilité" @@ -5182,7 +5210,7 @@ msgstr "Agilité" msgid "Agility %+.1f" msgstr "Agilité %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Dextérité" @@ -5191,7 +5219,7 @@ msgstr "Dextérité" msgid "Dexterity %+.1f" msgstr "Dextérité %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitalité" @@ -5200,7 +5228,7 @@ msgstr "Vitalité" msgid "Vitality %+.1f" msgstr "Vitalité %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Intelligence" @@ -5516,86 +5544,86 @@ msgstr "Échec de l'authentification." msgid "No servers available." msgstr "Aucun serveur n'est disponible." -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Quelqu'un d'autre essaie d'utiliser ce compte." -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Ce compte est déjà connecté." -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Speed hack détecté." -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Authentification déjà effectuée." -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "Erreur de connexion inconnue." -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Vous avez été déconnecté du serveur !" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Chance" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Défense" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "Attaque M." -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "Défense M." -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% Précision" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% Esquive" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% Coup critique" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "Temps de l'attaque" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "Temps de déplacement" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "Portée de l'attaque" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." -msgstr "" +msgstr "Dommage par s." #: src/net/tmwa/network.cpp:152 msgid "Empty address given to Network::connect()!" msgstr "Une adresse vide a été donnée à la commande Network::connect() !" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "Impossible de connecter au serveur \"" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Connexion au serveur terminée." @@ -5604,19 +5632,19 @@ msgstr "Connexion au serveur terminée." msgid "%s is not in your party!" msgstr "%s n'est pas membre de votre groupe !" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Affiche '...'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Fais clignoter le nom" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Bulle flottante '...'" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Bulle flottante" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" "PO-Revision-Date: 2011-08-09 22:16+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,25 +18,25 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "" @@ -138,15 +138,15 @@ msgstr "" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Nepoznata naredba." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Ne mogu poslati prazan Å¡apate!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -155,97 +155,101 @@ msgstr "" "Ne mogu stvoriti Å¡apat karticu za nadimak \"%s\"! To već postoji ili ste to " "vi." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Zahtjev za pridruživanje kanalu %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ime partije nedostaje." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Poruka zatvara chat." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Poruka sada zatvara chat." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -253,7 +257,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" @@ -261,7 +265,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -269,7 +273,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -277,7 +281,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -285,27 +289,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -314,11 +318,11 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Općenito" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "" @@ -334,23 +338,23 @@ msgstr "Spremanje screenshot-a nije uspjelo!" msgid "The connection to the server was lost." msgstr "" -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Mreža GreÅ¡ka" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Ignoriranje dolaznih zahtjeva za trgovanje" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "GreÅ¡ka prilikom uÄitavanja %s" @@ -384,19 +388,19 @@ msgid "Name" msgstr "Ime" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Napad" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Govori" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "" @@ -409,8 +413,8 @@ msgid "Reset" msgstr "PoniÅ¡ti" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Kupi" @@ -429,7 +433,7 @@ msgstr "KorisniÄki raÄun: %s" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "" @@ -437,7 +441,7 @@ msgstr "" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "" @@ -450,7 +454,7 @@ msgstr "Izlaz" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Max" @@ -459,8 +463,8 @@ msgstr "Max" msgid "Shop" msgstr "Trgovina" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -469,15 +473,15 @@ msgstr "Prodaj" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -648,7 +652,7 @@ msgid "Enter password:" msgstr "" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "ObriÅ¡i" @@ -724,7 +728,7 @@ msgstr "" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -735,12 +739,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Å aptaj prema %s: %s" @@ -754,9 +758,10 @@ msgid "No" msgstr "Ne" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "" @@ -902,7 +907,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Zatvori" @@ -929,8 +934,8 @@ msgstr "Oprema" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Skini opremu" @@ -974,31 +979,31 @@ msgid "Filter:" msgstr "" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Opremi" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Upotrijebi" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Razdvoji" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "" @@ -1007,17 +1012,17 @@ msgid "Weight:" msgstr "Težina:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Pohrani" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Preuzmi" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Ispusti" @@ -1157,7 +1162,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "" @@ -1259,7 +1264,7 @@ msgstr "Dostavi" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "" @@ -1297,321 +1302,331 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Trgovanje" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "" @@ -1865,6 +1880,10 @@ msgstr "" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Ovako izgleda boja" @@ -2264,23 +2283,27 @@ msgstr "Ignorirano" msgid "Erased" msgstr "" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Dozvoli trgovanje" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Dozvoli Å¡apate" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Kad ignorira:" @@ -2537,7 +2560,7 @@ msgstr "" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Zahtjev za Trgovanje" @@ -2836,182 +2859,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3063,18 +3090,18 @@ msgstr "" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "" @@ -3082,20 +3109,20 @@ msgstr "" msgid "(C)" msgstr "" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "" @@ -3111,7 +3138,7 @@ msgstr "" msgid "(2)" msgstr "" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "" @@ -3123,70 +3150,70 @@ msgstr "" msgid "(7)" msgstr "" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "" @@ -3502,7 +3529,7 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "" @@ -3510,15 +3537,15 @@ msgstr "" msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -4221,41 +4248,41 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4263,119 +4290,119 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Opcije:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4431,7 +4458,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "" @@ -4476,11 +4503,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4513,81 +4540,81 @@ msgstr "" msgid "Unknown server response." msgstr "" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4696,11 +4723,11 @@ msgstr "" msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "" @@ -4716,54 +4743,54 @@ msgstr "" msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, 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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "" @@ -4805,305 +4832,305 @@ msgstr "" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "" -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "" -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Vi ste mrtvi." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "Žao nam je obavijestiti vas da je vaÅ¡ lik je bio ubijen u borbi." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Niste viÅ¡e tako živi." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Kraj Igre!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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 "" "Ne, djeco. VaÅ¡ lik zapravo nije umro. On... err... je otiÅ¡ao na bolje mjesto." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "" -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Predpostavljam da ovo nije iÅ¡lo previÅ¡e dobro." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Želite li svoju imovinu identificirati?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Nažalost, ni traga od vas nije nikada pronaÄ‘eno ..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "UniÅ¡ten." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Izgleda da su vam predali vaÅ¡u glavu." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" "Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 želi trgovati s vama, prihvaćate li?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Otkazano trgovanje." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Trgovanje je zavrÅ¡eno." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Snaga" @@ -5112,7 +5139,7 @@ msgstr "Snaga" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Okretnost" @@ -5121,7 +5148,7 @@ msgstr "Okretnost" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Spretnost" @@ -5130,7 +5157,7 @@ msgstr "Spretnost" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitalnost" @@ -5139,7 +5166,7 @@ msgstr "Vitalnost" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Inteligencija" @@ -5447,74 +5474,74 @@ msgstr "" msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Sreća" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5522,11 +5549,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "" @@ -5535,19 +5562,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%s nije u vaÅ¡oj partiji!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" "PO-Revision-Date: 2011-08-09 22:16+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,25 +17,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "" @@ -137,15 +137,15 @@ msgstr "Hiba a frissÃtési könyvtár létrehozása közben!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Ismeretlen parancs." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Nem küldhetsz üres üzenetet!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -153,152 +153,156 @@ msgid "" msgstr "" "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Kapcsolódási kérelem a %s nevű csatornába." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "A csapatnév hiányzik." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Az enter megnyitja a bevitelt." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Az üzenet bezárja a bevitelt." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Az enter mostantól megnyitja a bevitelt." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Az üzenet mostantól bezárja a bevitelt." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -309,11 +313,11 @@ msgstr "" "LehetÅ‘ségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", " "\"0\"." -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Ãltalános" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "" @@ -329,23 +333,23 @@ msgstr "Hiba a képernyÅ‘ mentése során!" msgid "The connection to the server was lost." msgstr "" -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Hálózati hiba" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Kereskedési kérelmek elutasÃtása" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Kereskedési kérelmek elfogadása" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Hiba %s betöltése közben" @@ -379,19 +383,19 @@ msgid "Name" msgstr "Név" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Támadás" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Csevegés" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "" @@ -404,8 +408,8 @@ msgid "Reset" msgstr "Alaphelyzet" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Vétel" @@ -424,7 +428,7 @@ msgstr "Fiók: %s" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "" @@ -432,7 +436,7 @@ msgstr "" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "" @@ -445,7 +449,7 @@ msgstr "Kilépés" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Max." @@ -454,8 +458,8 @@ msgstr "Max." msgid "Shop" msgstr "Ãœzlet" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -464,15 +468,15 @@ msgstr "Eladás" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -643,7 +647,7 @@ msgid "Enter password:" msgstr "" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Törlés" @@ -719,7 +723,7 @@ msgstr "" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -730,12 +734,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Ãœzenet %s számára: %s" @@ -749,9 +753,10 @@ msgid "No" msgstr "Nem" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "" @@ -897,7 +902,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Bezár" @@ -924,8 +929,8 @@ msgstr "Felszerelés" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Nem használ" @@ -969,31 +974,31 @@ msgid "Filter:" msgstr "" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Használ" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Bevet" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Felosztás" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "" @@ -1002,17 +1007,17 @@ msgid "Weight:" msgstr "Súly:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Raktároz" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Magához vesz" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Eldob" @@ -1150,7 +1155,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "" @@ -1252,7 +1257,7 @@ msgstr "Küldés" msgid "NPC" msgstr "Gépjátékos" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "" @@ -1290,321 +1295,331 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Ãœzlet" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "" @@ -1858,6 +1873,10 @@ msgstr "" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Ãgy fog kinézni a felirat." @@ -2257,23 +2276,27 @@ msgstr "Tiltott" msgid "Erased" msgstr "" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Ãœzletelés engedélyezése" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Privát engedélyezése" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Ha ignorolva van:" @@ -2530,7 +2553,7 @@ msgstr "" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Ãœzleti ajánlat" @@ -2829,182 +2852,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3056,18 +3083,18 @@ msgstr "" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "" @@ -3075,20 +3102,20 @@ msgstr "" msgid "(C)" msgstr "" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "" @@ -3104,7 +3131,7 @@ msgstr "" msgid "(2)" msgstr "" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "" @@ -3116,70 +3143,70 @@ msgstr "" msgid "(7)" msgstr "" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "" @@ -3496,7 +3523,7 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "" @@ -3504,15 +3531,15 @@ msgstr "" msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -4216,160 +4243,160 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Opciók:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4425,7 +4452,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "" @@ -4470,11 +4497,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4507,81 +4534,81 @@ msgstr "" msgid "Unknown server response." msgstr "" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4690,11 +4717,11 @@ msgstr "" msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "" @@ -4710,54 +4737,54 @@ msgstr "" msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, 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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "" @@ -4799,45 +4826,45 @@ msgstr "" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "" -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "" -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Meghaltál." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "A karaktered elvérzett a csatában." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Nem vagy már az élÅ‘k sorában." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "A kaszás eljött érted, hogy elvigye a lelked." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Vége a játéknak!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4845,7 +4872,7 @@ msgstr "" "Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba " "került." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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." @@ -4853,253 +4880,253 @@ msgstr "" "A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek " "bizonyult." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Úgy látszik nem futottál túl gyorsan." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Meg akarod bánni a bűneid?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Kövesd a fényt az alagút végén." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Megöltek." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Kezedbe adták a fejed." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "Sikolyok közepette kerültél a másvilágra." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 üzletelni akar veled. Te akarsz vele?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Az üzlet megszakadt." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Sikeres üzlet." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "ErÅ‘" @@ -5108,7 +5135,7 @@ msgstr "ErÅ‘" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Mozgékonyság" @@ -5117,7 +5144,7 @@ msgstr "Mozgékonyság" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Ãœgyesség" @@ -5126,7 +5153,7 @@ msgstr "Ãœgyesség" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Egészség" @@ -5135,7 +5162,7 @@ msgstr "Egészség" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Intelligencia" @@ -5443,74 +5470,74 @@ msgstr "" msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Lekapcsolódtál a szerverrÅ‘l!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Szerencse" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5518,11 +5545,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "" @@ -5531,19 +5558,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%s nincs a csapatodban!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-27 19:20+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/" "id/)\n" @@ -21,25 +21,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Terlihat di peta" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "Menghindar" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "Luput" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "l" @@ -141,15 +141,15 @@ msgstr "Gagal membuat direktori update!" 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Perintah tidak dikenal." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Tidak dapat mengirimkan pesan tanpa nama" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,147 +158,151 @@ msgstr "" "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, " "atau nama anda sendiri" -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Meminta untuk masuk ke channel %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Nama kelompok tidak dapat di temukan" -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Nama organisasi tidak ditemukan." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Tetapkan sebuah nama" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Kembalikan pengalihan obrolan" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Tutup pesan obrolan" -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Kembalikan sekarang pengalihan obrolan" -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Pesan menutup obrolan" -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "Teman" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "Diabaikan" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "netral" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Pemain telah %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Pemain telah berhasil %s!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Pemain tidak bisa %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "Pemain tidak diabaikan!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "Pemain tidak lagi diabaikan!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Pemain tidak dapat diabaikan" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Pemain telah terhapus" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Pemain telah berhasil dihapus" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Pemain tidak dapat dihapus" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "Ukuran jenis huruf cache" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Ukuran Cache:" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Buat" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Hapus" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "Sumber gambar" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -308,11 +312,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Umum" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Debug" @@ -328,23 +332,23 @@ msgstr "Gagal menyimpan screenshot!" msgid "The connection to the server was lost." msgstr "Koneksi ke server terputus" -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Kesalahan jaringan" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Abaikan permohonan transaksi" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Terima permohonan transaksi" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Tidak dapat menampilkan peta" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Error ketika menunggu %s" @@ -378,19 +382,19 @@ msgid "Name" msgstr "Nama" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Pukul" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Berbicara" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Jalan" @@ -403,8 +407,8 @@ msgid "Reset" msgstr "Reset" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Beli" @@ -415,15 +419,14 @@ msgid "Price: %s / Total: %s" msgstr "Harga: %s/ Total: %s" #: src/gui/buydialog.cpp:103 -#, fuzzy msgid "Amount:" -msgstr "Akun:%s" +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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -431,7 +434,7 @@ msgstr "+" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -444,7 +447,7 @@ msgstr "Keluar" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Max" @@ -453,8 +456,8 @@ msgstr "Max" msgid "Shop" msgstr "Toko" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -463,15 +466,15 @@ msgstr "Jual" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -642,7 +645,7 @@ msgid "Enter password:" msgstr "Masukkan sandi" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Hapus" @@ -718,7 +721,7 @@ msgstr "pelangi 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -729,12 +732,12 @@ msgstr "???" msgid "Chat" msgstr "Obrolan" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Kehadiran: %s; %d pemain yang hadir." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Berbisik ke %s: %s" @@ -748,9 +751,10 @@ msgid "No" msgstr "Tidak" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Abaikan" @@ -896,7 +900,7 @@ 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/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Tutup" @@ -923,8 +927,8 @@ msgstr "Perlengkapan" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Lepaskan" @@ -966,31 +970,31 @@ msgid "Filter:" msgstr "Penyaring:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Pakai" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Gunakan" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Buang..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Pecah" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Setelan" @@ -999,17 +1003,17 @@ msgid "Weight:" msgstr "Berat" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Simpan" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Kembalikan" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Buang" @@ -1145,7 +1149,7 @@ msgstr "%s %d?" msgid "jacko spawning" msgstr "Jacko bertelur" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "" @@ -1247,7 +1251,7 @@ msgstr "Masukan" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Hapus" @@ -1285,321 +1289,331 @@ msgstr "Copot lebih dahulu" msgid "Away outfit" msgstr "Setelan saat bepergian" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Tukar" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Berbisik" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Menyembuhkan" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Jadikan teman" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Hapus" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Batalkan pengabaian" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Mengikuti" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Tirukan" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "Undang ke kelompok" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Keluarkan dari kelompok" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Keluarkan dari organisasi" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "Ubah posisi di organisasi" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "Undang ke organisasi" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "keluarkan pemain" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "Sembunyikan" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Perlihatkan item" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Tanggalkan pakaian" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "Penambahan komentar" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Beli(?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "Jual(?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "keluarkan" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "Hapus dari daftar menyerang" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "Tambahkan prioritas daftar menyerang" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "Tambahkan ke daftar menyerang" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Tambahkan ke daftar Abaikan" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Tambahkan nama ke Obrolan" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Ambil" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Ambil ke obrolan" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Daftar barang" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Ganti nama" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Hapus" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Memuat setelan lama" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Mantra" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Memuat mantra lama" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Edit mantra" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Nonaktifkan sorotan" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Aktifkan sorotan" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "hapus nama" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "Ubah posisi Organisasi" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Ubah nama tanda peta" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Nama:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "Komentar pemain" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "komentar" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "Tambahkan semua ke Penukaran" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Masukkan 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Masukkan setengah" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Masukkan semua" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "Buang semuanya" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Ambil 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Ambil setengah" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Ambil semua" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Muat jalan pintas iItem lama" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Muat jalan pintas Buang yang lama" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Sembunyikan" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Tampilkan" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "Atur ulang bar kuning" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Pindahkan ke chat" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(kembalikan)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Bergerak keatas" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Bergerak kebawah" @@ -1853,6 +1867,10 @@ msgstr "Lainnya" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Warnanya terlihat seperti ini" @@ -2252,23 +2270,27 @@ msgstr "Ditolak" msgid "Erased" msgstr "Dihapus" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Perbolehkan penukaran" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Perbolehkan berbisik" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Lama" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Ketika menolak:" @@ -2525,7 +2547,7 @@ msgstr "Perlihatkan link di Umumkan" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Meminta untuk menukar" @@ -2824,182 +2846,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?)bergerak ke target" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) pukulan normal" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) ganti pukulan tanpa pelindung" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) pukulan dengan pelindung" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?)serangan" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) jalan dan serang" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) jalan, serang, ambil" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) tanpa penyerangan otomatis" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?)mengambil" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) penampilan peta normal" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) penampilan peta kosong" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b)penampilan peta hitam & putih" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) gunakan #flar untuk serangan magic" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) gunakan #chiza untuk serangan magic" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(l) gunakan #ingrav untuk serangan magic" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) gunakan #frillyar untuk serangan magic" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gunakan #upmarmu untuk serangan magic" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) serangan magic" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) pada keyboard" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) pergi" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) pergi" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Perombakan game tidak diperbolehkan" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Perombakan game diperbolehkan" @@ -3051,18 +3077,18 @@ msgstr "" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(l)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3070,20 +3096,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3099,7 +3125,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3111,70 +3137,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3490,7 +3516,7 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "" @@ -3498,15 +3524,15 @@ msgstr "" msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -3834,9 +3860,8 @@ msgid "Stop Attack" msgstr "" #: src/keyboardconfig.cpp:65 -#, fuzzy msgid "Untarget" -msgstr "Target" +msgstr "" #: src/keyboardconfig.cpp:66 msgid "Target Closest" @@ -4207,159 +4232,159 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Mencoba mengambil item yang tidak lagi ada" -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "item terlalu berat" -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "barang terlalu jauh" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "Perbekalan sudah penuh" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "Barang milik orang lain." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Ikuti:" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Batal mengikuti" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "Tirukan:" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Batal menirukan" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." -msgstr "ke klien manaplus" +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4415,7 +4440,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "" @@ -4460,11 +4485,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4497,81 +4522,81 @@ msgstr "" msgid "Unknown server response." msgstr "" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4680,11 +4705,11 @@ msgstr "" msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "" @@ -4700,54 +4725,54 @@ msgstr "" msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Versi yang digunakan sudah kadaluarsa." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, 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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Server kepenuhan." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Username dihapus permanen." @@ -4789,305 +4814,305 @@ msgstr "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh." msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "" -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "" -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "" -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "" -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "" -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "" -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "" -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "" -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat " "beregenerasi." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Anda tidak dapat melakukannya sekarang" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 "" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "Gagal menambahkan barang. Kamu tidak dapat menukar barang ini." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "" -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "" @@ -5096,7 +5121,7 @@ msgstr "" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "" @@ -5105,7 +5130,7 @@ msgstr "" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "" @@ -5114,7 +5139,7 @@ msgstr "" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "" @@ -5123,7 +5148,7 @@ msgstr "" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "" @@ -5431,74 +5456,74 @@ msgstr "" msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5506,11 +5531,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "" @@ -5519,19 +5544,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "" @@ -5,13 +5,14 @@ # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. # <guglielmo__@hotmail.it>, 2011. +# <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-09-16 23:07+0300\n" -"PO-Revision-Date: 2011-09-16 20:11+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n" "MIME-Version: 1.0\n" @@ -20,7 +21,7 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1088 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "" @@ -46,43 +47,43 @@ msgstr "" msgid "Setup" msgstr "Impostazioni" -#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" msgstr "" -#: src/client.cpp:846 src/gui/setup_video.cpp:315 +#: src/client.cpp:847 src/gui/setup_video.cpp:315 msgid "Video" msgstr "Video" -#: src/client.cpp:851 +#: src/client.cpp:852 msgid "Themes" msgstr "" -#: src/client.cpp:932 +#: src/client.cpp:934 msgid "Connecting to server" msgstr "Connessione al server" -#: src/client.cpp:963 +#: src/client.cpp:965 msgid "Logging in" msgstr "Accesso" -#: src/client.cpp:996 +#: src/client.cpp:998 msgid "Entering game world" msgstr "Accesso al gioco" -#: src/client.cpp:1096 +#: src/client.cpp:1098 msgid "Requesting characters" msgstr "Ricerca personaggi" -#: src/client.cpp:1127 +#: src/client.cpp:1129 msgid "Connecting to the game server" msgstr "Connessione al server del gioco" -#: src/client.cpp:1137 +#: src/client.cpp:1139 msgid "Changing game servers" msgstr "Cambiamento server del gioco" -#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 +#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 @@ -92,63 +93,63 @@ msgstr "Cambiamento server del gioco" msgid "Error" msgstr "Errore" -#: src/client.cpp:1196 +#: src/client.cpp:1198 msgid "Requesting registration details" msgstr "Richiesta dettagli di registrazione" -#: src/client.cpp:1222 +#: src/client.cpp:1224 msgid "Password Change" msgstr "Cambiamento password" -#: src/client.cpp:1223 +#: src/client.cpp:1225 msgid "Password changed successfully!" msgstr "Password modificata con successo!" -#: src/client.cpp:1242 +#: src/client.cpp:1244 msgid "Email Change" msgstr "Cambio Email" -#: src/client.cpp:1243 +#: src/client.cpp:1245 msgid "Email changed successfully!" msgstr "Email cambiata con successo!" -#: src/client.cpp:1263 +#: src/client.cpp:1265 msgid "Unregister Successful" msgstr "Annullamento registrazione effettuato con successo" -#: src/client.cpp:1264 +#: src/client.cpp:1266 msgid "Farewell, come back any time..." msgstr "Addio, torna quando vuoi..." -#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 -#: src/client.cpp:1933 src/client.cpp:1940 +#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510 +#: src/client.cpp:1935 src/client.cpp:1942 #, 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:1639 +#: src/client.cpp:1641 #, c-format msgid "Invalid update host: %s" msgstr "Invalido aggiornamento host: %s" -#: src/client.cpp:1673 src/client.cpp:1679 +#: src/client.cpp:1675 src/client.cpp:1681 msgid "Error creating updates directory!" msgstr "Errore durante la creazione della directory degli aggiornamenti" -#: src/client.cpp:1700 +#: src/client.cpp:1702 #, 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Comando sconosciuto." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Impossibile inviare un sussurro vuoto!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is" @@ -157,152 +158,156 @@ msgstr "" "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già , oppure " "sei tu." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Richiesta per accedere al canale %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Manca il nome del party." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Manca il nome della gilda." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Prego specificare un nome." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Invio attiva/disattiva la conversazione." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "I messaggi chiudono la conversazione." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "\"Invio\" adesso attiva/disattiva la conversazione." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "I messaggi adesso chiudono la conversazione." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "Amico" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "Disprezzato" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "Neutro" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Giocatore già %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Giocatore %s con successo!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Player non può essere %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "Il giocatore non era ignorato!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "Giocatore non più ignorato!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Impossibile annullare l'ignoro!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Il giocatore è già cancellato!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Giocatore cancellato dal tuo schermo con successo!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Il giocatore non può essere cancellato!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -313,11 +318,11 @@ msgstr "" "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" " "(falso), \"1\", \"0\"." -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Generale" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Debug" @@ -333,23 +338,23 @@ msgstr "Salvataggio della schermata fallito!" msgid "The connection to the server was lost." msgstr "La connessione al server è stata persa." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Errore di rete" -#: src/game.cpp:1320 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno ignorate" -#: src/game.cpp:1330 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno accettate" -#: src/game.cpp:1729 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Impossibile caricare la mappa." -#: src/game.cpp:1730 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Errore durante il caricamento di %s" @@ -383,19 +388,19 @@ msgid "Name" msgstr "Nome" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Attacco" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Parla" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Movimento" @@ -407,44 +412,48 @@ msgstr "Risultato" msgid "Reset" msgstr "Reimposta" -#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Compra" -#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303 +#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332 #: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325 #, c-format msgid "Price: %s / Total: %s" msgstr "Prezzo: %s / Totale: %s" +#: src/gui/buydialog.cpp:103 +msgid "Amount:" +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:94 src/gui/itemamountwindow.cpp:207 +#: 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:973 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 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:97 src/gui/itemamountwindow.cpp:206 +#: 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:985 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" -#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 +#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 -#: src/keyboardconfig.cpp:290 +#: src/keyboardconfig.cpp:84 msgid "Quit" msgstr "Esci" -#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95 -#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553 -#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003 +#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 +#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Massimo" @@ -453,8 +462,8 @@ msgstr "Massimo" msgid "Shop" msgstr "Negozio" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -463,17 +472,17 @@ msgstr "Vendi" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72 -#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238 +#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 msgid "Cancel" @@ -643,7 +652,7 @@ msgstr "" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 -#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241 +#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Elimina" @@ -718,7 +727,7 @@ msgstr "Arcobaleno 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -729,12 +738,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Presente: %s; %d giocatori sono presenti." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Sussurra a %s: %s" @@ -748,9 +757,10 @@ msgid "No" msgstr "No" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Ignora" @@ -895,8 +905,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Chiudi" @@ -922,9 +932,9 @@ msgid "Equipment" msgstr "Equipaggiamento" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 -#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Togli" @@ -952,49 +962,45 @@ msgstr "" msgid "by type" msgstr "" -#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventario" -#: src/gui/inventorywindow.cpp:136 +#: src/gui/inventorywindow.cpp:137 msgid "Slots:" msgstr "Slot:" -#: src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:149 msgid "Filter:" msgstr "Filtro:" -#: src/gui/inventorywindow.cpp:149 -msgid "Sort:" -msgstr "Ordina per:" - -#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541 -#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Equipaggia" -#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542 -#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Usa" -#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Lascia..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Dividi" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Attrezzatura" @@ -1002,18 +1008,18 @@ msgstr "Attrezzatura" msgid "Weight:" msgstr "Peso:" -#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Magazzino" -#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Recupera" -#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Lascia" @@ -1151,7 +1157,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "" @@ -1253,7 +1259,7 @@ msgstr "Invia" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Cancella" @@ -1291,321 +1297,331 @@ msgstr "Rimuovi prima" msgid "Away outfit" msgstr "Away outfit" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Commercia" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Aggiungi alla chat" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Oggetto mappa" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Spells" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Disabilita highlight" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Abilita highlight" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "Cambia posizione nella gilda" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Nome:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Salva 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Salva metà " -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Salva tutto" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Ritira 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Ritira metà " -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Ritira tutto" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Carica vecchie scorciatoie oggetti" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Carica vecchie scorciatoie drop" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "" @@ -1861,6 +1877,10 @@ msgstr "" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Come appaiono i colori" @@ -1894,15 +1914,15 @@ msgstr "" #: src/gui/setup_colors.cpp:112 msgid "Red:" -msgstr "" +msgstr "rosso" #: src/gui/setup_colors.cpp:127 msgid "Green:" -msgstr "" +msgstr "verde" #: src/gui/setup_colors.cpp:142 msgid "Blue:" -msgstr "" +msgstr "blu" #: src/gui/setup_colors.cpp:314 msgid "Alpha:" @@ -2205,30 +2225,34 @@ msgid "Show own name" msgstr "" #: src/gui/setup_players.cpp:63 -msgid "Target dead players" +msgid "Enable extended mouse targeting" msgstr "" #: src/gui/setup_players.cpp:66 +msgid "Target dead players" +msgstr "" + +#: src/gui/setup_players.cpp:69 msgid "Visible names" msgstr "Nomi visibili" -#: src/gui/setup_players.cpp:69 +#: src/gui/setup_players.cpp:72 msgid "Secure trades" msgstr "" -#: src/gui/setup_players.cpp:72 +#: src/gui/setup_players.cpp:75 msgid "Unsecure chars in names" msgstr "" -#: src/gui/setup_players.cpp:75 +#: src/gui/setup_players.cpp:78 msgid "Show statuses" msgstr "" -#: src/gui/setup_players.cpp:78 +#: src/gui/setup_players.cpp:81 msgid "Show ip addresses on screenshots" msgstr "" -#: src/gui/setup_players.cpp:81 +#: src/gui/setup_players.cpp:84 msgid "Allow self heal with mouse click" msgstr "" @@ -2256,6 +2280,10 @@ msgstr "Ignorato" msgid "Erased" msgstr "" +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + #: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Permetti scambi" @@ -2529,7 +2557,7 @@ msgstr "" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Richiesta di commercio" @@ -2828,182 +2856,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3055,130 +3087,130 @@ msgstr "" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712 -#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748 -#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823 -#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "" -#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "" -#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "" -#: src/gui/statuswindow.cpp:656 +#: src/gui/statuswindow.cpp:657 msgid "(C)" msgstr "" -#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "" -#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676 -#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724 -#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760 -#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812 -#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852 -#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881 +#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "" -#: src/gui/statuswindow.cpp:673 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "" -#: src/gui/statuswindow.cpp:684 +#: src/gui/statuswindow.cpp:685 msgid "(0)" msgstr "" -#: src/gui/statuswindow.cpp:687 +#: src/gui/statuswindow.cpp:688 msgid "(1)" msgstr "" -#: src/gui/statuswindow.cpp:690 +#: src/gui/statuswindow.cpp:691 msgid "(2)" msgstr "" -#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "" -#: src/gui/statuswindow.cpp:696 +#: src/gui/statuswindow.cpp:697 msgid "(5)" msgstr "" -#: src/gui/statuswindow.cpp:699 +#: src/gui/statuswindow.cpp:700 msgid "(7)" msgstr "" -#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754 -#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "" -#: src/gui/statuswindow.cpp:715 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "" -#: src/gui/statuswindow.cpp:718 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "" -#: src/gui/statuswindow.cpp:721 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "" -#: src/gui/statuswindow.cpp:735 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "" -#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "" -#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806 -#: src/gui/statuswindow.cpp:859 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "" -#: src/gui/statuswindow.cpp:767 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "" -#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797 -#: src/gui/statuswindow.cpp:862 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "" -#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "" -#: src/gui/statuswindow.cpp:803 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "" -#: src/gui/statuswindow.cpp:820 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "" -#: src/gui/statuswindow.cpp:826 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "" -#: src/gui/statuswindow.cpp:832 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "" -#: src/gui/statuswindow.cpp:835 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "" -#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "" @@ -3239,30 +3271,34 @@ msgid "Command:" msgstr "" #: src/gui/textcommandeditor.cpp:200 +msgid "Comment:" +msgstr "" + +#: src/gui/textcommandeditor.cpp:203 msgid "Mana:" msgstr "" -#: src/gui/textcommandeditor.cpp:206 +#: src/gui/textcommandeditor.cpp:209 msgid "Target Type:" msgstr "" -#: src/gui/textcommandeditor.cpp:212 +#: src/gui/textcommandeditor.cpp:215 msgid "Icon:" msgstr "" -#: src/gui/textcommandeditor.cpp:218 +#: src/gui/textcommandeditor.cpp:221 msgid "Magic level:" msgstr "" -#: src/gui/textcommandeditor.cpp:224 +#: src/gui/textcommandeditor.cpp:227 msgid "Magic School:" msgstr "" -#: src/gui/textcommandeditor.cpp:230 +#: src/gui/textcommandeditor.cpp:233 msgid "School level:" msgstr "" -#: src/gui/textcommandeditor.cpp:235 +#: src/gui/textcommandeditor.cpp:238 msgid "Save" msgstr "" @@ -3493,23 +3529,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:104 +#: src/gui/whoisonline.cpp:108 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:297 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:488 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:519 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -3792,548 +3828,580 @@ msgid "Cart" msgstr "" #: src/keyboardconfig.cpp:43 +msgid "Basic Keys" +msgstr "" + +#: src/keyboardconfig.cpp:44 msgid "Move Up" msgstr "Muoviti verso l'alto" -#: src/keyboardconfig.cpp:44 +#: src/keyboardconfig.cpp:45 msgid "Move Down" msgstr "Muoviti verso il basso" -#: src/keyboardconfig.cpp:45 +#: src/keyboardconfig.cpp:46 msgid "Move Left" msgstr "Muoviti verso sinistra" -#: src/keyboardconfig.cpp:46 +#: src/keyboardconfig.cpp:47 msgid "Move Right" msgstr "Muoviti verso destra" -#: src/keyboardconfig.cpp:49 +#: src/keyboardconfig.cpp:50 msgid "Target & Attack" msgstr "Mirino e attacco" -#: src/keyboardconfig.cpp:51 +#: src/keyboardconfig.cpp:52 msgid "Move to Target" msgstr "" -#: src/keyboardconfig.cpp:53 +#: src/keyboardconfig.cpp:54 msgid "Change Move to Target type" msgstr "" -#: src/keyboardconfig.cpp:55 +#: src/keyboardconfig.cpp:56 msgid "Move to Home location" msgstr "" -#: src/keyboardconfig.cpp:57 +#: src/keyboardconfig.cpp:58 msgid "Set home location" msgstr "" -#: src/keyboardconfig.cpp:59 +#: src/keyboardconfig.cpp:60 msgid "Move to navigation point" msgstr "" -#: src/keyboardconfig.cpp:61 -msgid "Smilie" -msgstr "" - #: src/keyboardconfig.cpp:63 msgid "Stop Attack" msgstr "Ferma attacco" -#: src/keyboardconfig.cpp:64 -msgid "Target Closest" +#: src/keyboardconfig.cpp:65 +msgid "Untarget" msgstr "" #: src/keyboardconfig.cpp:66 +msgid "Target Closest" +msgstr "" + +#: src/keyboardconfig.cpp:68 msgid "Target NPC" msgstr "Punta NPC" -#: src/keyboardconfig.cpp:67 +#: src/keyboardconfig.cpp:69 msgid "Target Player" msgstr "Punta Giocatore" -#: src/keyboardconfig.cpp:69 +#: src/keyboardconfig.cpp:71 msgid "Pickup" msgstr "Raccogli" -#: src/keyboardconfig.cpp:70 +#: src/keyboardconfig.cpp:72 msgid "Change Pickup Type" msgstr "" -#: src/keyboardconfig.cpp:72 +#: src/keyboardconfig.cpp:74 msgid "Hide Windows" msgstr "Nascondi la Finestra" -#: src/keyboardconfig.cpp:74 +#: src/keyboardconfig.cpp:76 msgid "Sit" msgstr "Siediti" -#: src/keyboardconfig.cpp:75 +#: src/keyboardconfig.cpp:77 msgid "Screenshot" msgstr "Screenshot" -#: src/keyboardconfig.cpp:76 +#: src/keyboardconfig.cpp:78 msgid "Enable/Disable Trading" msgstr "Abilita/Disabilita Scambi" -#: src/keyboardconfig.cpp:78 +#: src/keyboardconfig.cpp:80 msgid "Change Map View Mode" msgstr "" -#: src/keyboardconfig.cpp:80 +#: src/keyboardconfig.cpp:82 +msgid "Select OK" +msgstr "Seleziona OK" + +#: src/keyboardconfig.cpp:85 +msgid "Shortcuts Keys" +msgstr "" + +#: src/keyboardconfig.cpp:86 msgid "Item Shortcuts Key" msgstr "" -#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96 -#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100 -#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104 -#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108 -#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113 -#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117 -#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121 -#: src/keyboardconfig.cpp:360 +#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90 +#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94 +#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98 +#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102 +#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106 +#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110 +#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114 +#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119 +#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123 +#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127 +#: src/keyboardconfig.cpp:369 #, c-format msgid "Item Shortcut %d" msgstr "Scorciatoia %d" -#: src/keyboardconfig.cpp:122 +#: src/keyboardconfig.cpp:128 +msgid "Windows Keys" +msgstr "" + +#: src/keyboardconfig.cpp:129 msgid "Help Window" msgstr "Finestra di Aiuto" -#: src/keyboardconfig.cpp:124 +#: src/keyboardconfig.cpp:131 msgid "Status Window" msgstr "Finestra degli Status" -#: src/keyboardconfig.cpp:126 +#: src/keyboardconfig.cpp:133 msgid "Inventory Window" msgstr "Finestra dell'Inventario" -#: src/keyboardconfig.cpp:128 +#: src/keyboardconfig.cpp:135 msgid "Equipment Window" msgstr "Finestra dell'Equipaggiamento" -#: src/keyboardconfig.cpp:130 +#: src/keyboardconfig.cpp:137 msgid "Skill Window" msgstr "Finestra delle Capacità " -#: src/keyboardconfig.cpp:132 +#: src/keyboardconfig.cpp:139 msgid "Minimap Window" msgstr "Finestra Minimappa" -#: src/keyboardconfig.cpp:134 +#: src/keyboardconfig.cpp:141 msgid "Chat Window" msgstr "Finestra della Chat" -#: src/keyboardconfig.cpp:136 +#: src/keyboardconfig.cpp:143 msgid "Item Shortcut Window" msgstr "Finestra Scorciatoia Oggetti" -#: src/keyboardconfig.cpp:138 +#: src/keyboardconfig.cpp:145 msgid "Setup Window" msgstr "Finestra del Setup" -#: src/keyboardconfig.cpp:140 +#: src/keyboardconfig.cpp:147 msgid "Debug Window" msgstr "Finestra di debug" -#: src/keyboardconfig.cpp:142 +#: src/keyboardconfig.cpp:149 msgid "Social Window" msgstr "" -#: src/keyboardconfig.cpp:144 +#: src/keyboardconfig.cpp:151 msgid "Emote Shortcut Window" msgstr "" -#: src/keyboardconfig.cpp:146 +#: src/keyboardconfig.cpp:153 msgid "Outfits Window" msgstr "" -#: src/keyboardconfig.cpp:148 +#: src/keyboardconfig.cpp:155 msgid "Shop Window" msgstr "" -#: src/keyboardconfig.cpp:150 +#: src/keyboardconfig.cpp:157 msgid "Quick drop Window" msgstr "" -#: src/keyboardconfig.cpp:152 +#: src/keyboardconfig.cpp:159 msgid "Kill Stats Window" msgstr "" -#: src/keyboardconfig.cpp:154 +#: src/keyboardconfig.cpp:161 msgid "Commands Window" msgstr "" -#: src/keyboardconfig.cpp:156 +#: src/keyboardconfig.cpp:163 msgid "Bot Checker Window" msgstr "" -#: src/keyboardconfig.cpp:159 +#: src/keyboardconfig.cpp:166 msgid "Who Is Online Window" msgstr "" -#: src/keyboardconfig.cpp:161 +#: src/keyboardconfig.cpp:168 msgid "Did you know Window" msgstr "" -#: src/keyboardconfig.cpp:164 +#: src/keyboardconfig.cpp:171 msgid "Previous Social Tab" msgstr "" -#: src/keyboardconfig.cpp:166 +#: src/keyboardconfig.cpp:173 msgid "Next Social Tab" msgstr "" -#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170 -#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174 -#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178 -#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182 -#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186 -#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190 +#: src/keyboardconfig.cpp:175 +msgid "Emotes Keys" +msgstr "" + +#: src/keyboardconfig.cpp:176 +msgid "Smilie" +msgstr "" + +#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179 +#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183 +#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187 +#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191 #: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195 #: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199 -#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203 -#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207 -#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211 -#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215 -#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220 -#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226 -#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230 -#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234 -#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238 -#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242 -#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247 +#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204 +#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208 +#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212 +#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216 +#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220 +#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224 +#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229 +#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235 +#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239 +#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243 +#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251 -#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255 -#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259 -#: src/keyboardconfig.cpp:355 +#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256 +#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260 +#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264 +#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268 +#: src/keyboardconfig.cpp:364 #, c-format msgid "Emote Shortcut %d" msgstr "" -#: src/keyboardconfig.cpp:261 +#: src/keyboardconfig.cpp:270 +msgid "Outfits Keys" +msgstr "" + +#: src/keyboardconfig.cpp:271 msgid "Wear Outfit" msgstr "" -#: src/keyboardconfig.cpp:263 +#: src/keyboardconfig.cpp:273 msgid "Copy Outfit" msgstr "" -#: src/keyboardconfig.cpp:265 +#: src/keyboardconfig.cpp:275 msgid "Copy equipped to Outfit" msgstr "" -#: src/keyboardconfig.cpp:267 +#: src/keyboardconfig.cpp:277 +msgid "Chat Keys" +msgstr "" + +#: src/keyboardconfig.cpp:278 msgid "Toggle Chat" msgstr "Attiva Chat" -#: src/keyboardconfig.cpp:269 +#: src/keyboardconfig.cpp:280 msgid "Scroll Chat Up" msgstr "Scorre la chat in alto" -#: src/keyboardconfig.cpp:271 +#: src/keyboardconfig.cpp:282 msgid "Scroll Chat Down" msgstr "Scorre la chat in basso" -#: src/keyboardconfig.cpp:273 +#: src/keyboardconfig.cpp:284 msgid "Previous Chat Tab" msgstr "Scheda Chat Precedente" -#: src/keyboardconfig.cpp:275 +#: src/keyboardconfig.cpp:286 msgid "Next Chat Tab" msgstr "Scheda Chat Successiva" -#: src/keyboardconfig.cpp:278 +#: src/keyboardconfig.cpp:289 msgid "Close current Chat Tab" msgstr "" -#: src/keyboardconfig.cpp:280 +#: src/keyboardconfig.cpp:291 msgid "Previous chat line" msgstr "" -#: src/keyboardconfig.cpp:282 +#: src/keyboardconfig.cpp:293 msgid "Next chat line" msgstr "" -#: src/keyboardconfig.cpp:284 +#: src/keyboardconfig.cpp:295 msgid "Chat Auto Complete" msgstr "" -#: src/keyboardconfig.cpp:286 +#: src/keyboardconfig.cpp:297 msgid "Deactivate Chat Input" msgstr "" -#: src/keyboardconfig.cpp:288 -msgid "Select OK" -msgstr "Seleziona OK" +#: src/keyboardconfig.cpp:299 +msgid "Other Keys" +msgstr "" -#: src/keyboardconfig.cpp:291 +#: src/keyboardconfig.cpp:300 msgid "Ignore input 1" msgstr "Ignora input 1" -#: src/keyboardconfig.cpp:293 +#: src/keyboardconfig.cpp:302 msgid "Ignore input 2" msgstr "Ignora input 2" -#: src/keyboardconfig.cpp:295 +#: src/keyboardconfig.cpp:304 msgid "Direct Up" msgstr "" -#: src/keyboardconfig.cpp:296 +#: src/keyboardconfig.cpp:305 msgid "Direct Down" msgstr "" -#: src/keyboardconfig.cpp:298 +#: src/keyboardconfig.cpp:307 msgid "Direct Left" msgstr "" -#: src/keyboardconfig.cpp:299 +#: src/keyboardconfig.cpp:308 msgid "Direct Right" msgstr "" -#: src/keyboardconfig.cpp:301 +#: src/keyboardconfig.cpp:310 msgid "Crazy moves" msgstr "" -#: src/keyboardconfig.cpp:303 +#: src/keyboardconfig.cpp:312 msgid "Change Crazy Move mode" msgstr "" -#: src/keyboardconfig.cpp:305 +#: src/keyboardconfig.cpp:314 msgid "Quick Drop N Items from 0 slot" msgstr "" -#: src/keyboardconfig.cpp:307 +#: src/keyboardconfig.cpp:316 msgid "Quick Drop N Items" msgstr "" -#: src/keyboardconfig.cpp:309 +#: src/keyboardconfig.cpp:318 msgid "Switch Quick Drop Counter" msgstr "" -#: src/keyboardconfig.cpp:311 +#: src/keyboardconfig.cpp:320 msgid "Quick heal target or self" msgstr "" -#: src/keyboardconfig.cpp:313 +#: src/keyboardconfig.cpp:322 msgid "Use #itenplz spell" msgstr "" -#: src/keyboardconfig.cpp:315 +#: src/keyboardconfig.cpp:324 msgid "Use magic attack" msgstr "" -#: src/keyboardconfig.cpp:317 +#: src/keyboardconfig.cpp:326 msgid "Switch magic attack" msgstr "" -#: src/keyboardconfig.cpp:319 +#: src/keyboardconfig.cpp:328 msgid "Change move type" msgstr "" -#: src/keyboardconfig.cpp:321 +#: src/keyboardconfig.cpp:330 msgid "Change Attack Weapon Type" msgstr "" -#: src/keyboardconfig.cpp:323 +#: src/keyboardconfig.cpp:332 msgid "Change Attack Type" msgstr "" -#: src/keyboardconfig.cpp:325 +#: src/keyboardconfig.cpp:334 msgid "Change Follow mode" msgstr "" -#: src/keyboardconfig.cpp:327 +#: src/keyboardconfig.cpp:336 msgid "Change Imitation mode" msgstr "" -#: src/keyboardconfig.cpp:330 +#: src/keyboardconfig.cpp:339 msgid "Disable / Enable Game modifier keys" msgstr "" -#: src/keyboardconfig.cpp:331 +#: src/keyboardconfig.cpp:340 msgid "On / Off audio" msgstr "" -#: src/keyboardconfig.cpp:333 +#: src/keyboardconfig.cpp:342 msgid "Enable / Disable away mode" msgstr "" -#: src/keyboardconfig.cpp:335 +#: src/keyboardconfig.cpp:344 msgid "Emulate right click from keyboard" msgstr "" -#: src/keyboardconfig.cpp:337 +#: src/keyboardconfig.cpp:346 msgid "Toggle camera mode" msgstr "" -#: src/keyboardconfig.cpp:339 +#: src/keyboardconfig.cpp:348 msgid "Modifier key" msgstr "" -#: src/keyboardconfig.cpp:411 +#: src/keyboardconfig.cpp:427 #, c-format msgid "" "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " "strange behaviour." msgstr "" -#: src/localplayer.cpp:377 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1416 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1418 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1420 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1422 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1424 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1430 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1454 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3168 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "" -#: src/localplayer.cpp:3468 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3477 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3832 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Opzioni" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4389,7 +4457,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "" @@ -4434,11 +4502,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4471,81 +4539,81 @@ msgstr "" msgid "Unknown server response." msgstr "" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4622,15 +4690,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:286 +#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284 msgid "Item sharing enabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296 +#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294 msgid "Item sharing disabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306 +#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304 msgid "Item sharing not possible." msgstr "" @@ -4638,15 +4706,15 @@ msgstr "" msgid "Item sharing unknown." msgstr "" -#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248 +#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246 msgid "Experience sharing enabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258 +#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256 msgid "Experience sharing disabled." msgstr "" -#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268 +#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266 msgid "Experience sharing not possible." msgstr "" @@ -4654,11 +4722,11 @@ msgstr "" msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "" @@ -4674,135 +4742,135 @@ msgstr "" msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, 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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "" -#: src/net/ea/partyhandler.cpp:82 +#: src/net/ea/partyhandler.cpp:80 msgid "Could not create party." msgstr "" -#: src/net/ea/partyhandler.cpp:84 +#: src/net/ea/partyhandler.cpp:82 msgid "Party successfully created." msgstr "" -#: src/net/ea/partyhandler.cpp:140 +#: src/net/ea/partyhandler.cpp:138 #, c-format msgid "%s has joined your party." msgstr "" -#: src/net/ea/partyhandler.cpp:176 +#: src/net/ea/partyhandler.cpp:174 #, c-format msgid "%s is already a member of a party." msgstr "" -#: src/net/ea/partyhandler.cpp:181 +#: src/net/ea/partyhandler.cpp:179 #, c-format msgid "%s refused your invitation." msgstr "" -#: src/net/ea/partyhandler.cpp:186 +#: src/net/ea/partyhandler.cpp:184 #, c-format msgid "%s is now a member of your party." msgstr "" -#: src/net/ea/partyhandler.cpp:191 +#: src/net/ea/partyhandler.cpp:189 #, c-format msgid "%s can't join your party because party is full." msgstr "" -#: src/net/ea/partyhandler.cpp:196 +#: src/net/ea/partyhandler.cpp:194 #, c-format msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:356 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "" -#: src/net/ea/partyhandler.cpp:369 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "" -#: src/net/ea/partyhandler.cpp:448 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Sei morto." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "" "Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Non sei più così vivo." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "Le fredde mani della morte stanno afferrando la tua anima." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4810,7 +4878,7 @@ msgstr "" "No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato " "in un posto migliore." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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." @@ -4818,254 +4886,254 @@ msgstr "" "Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola " "ha fallito." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Suppongo non sia andata troppo bene." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Tristemente, nessuna traccia di te è stata mai trovata..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Annichilito." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "" -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain " "health." msgstr "" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "" -#: src/net/ea/specialhandler.cpp:164 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "" -#: src/net/ea/specialhandler.cpp:177 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "" -#: src/net/ea/specialhandler.cpp:196 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "" -#: src/net/ea/specialhandler.cpp:209 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "" -#: src/net/ea/specialhandler.cpp:226 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 vuole commerciare con te, accetti?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Scambio cancellato." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Scambio completato." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Forza" @@ -5074,7 +5142,7 @@ msgstr "Forza" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Agilità " @@ -5083,7 +5151,7 @@ msgstr "Agilità " msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Destrezza" @@ -5092,7 +5160,7 @@ msgstr "Destrezza" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitalità " @@ -5101,7 +5169,7 @@ msgstr "Vitalità " msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Intelligenza" @@ -5409,74 +5477,74 @@ msgstr "" msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Disconnesso dal server!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Fortuna" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5484,11 +5552,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "" @@ -5497,19 +5565,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%s non è nel tuo party!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "" @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:45+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/" "ja/)\n" @@ -22,25 +22,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "ドッジ" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "ミス" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "" @@ -142,15 +142,15 @@ msgstr "更新フォルダã®ä½œæˆã‚¨ãƒ©ãƒ¼" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "エラー： %s ã¯å˜åœ¨ã—ãªã„ã®ã§ä½œæˆã™ã‚‹ã“ã¨ãŒä¸å¯èƒ½ï¼çµ‚了ä¸â€¦" -#: src/commandhandler.cpp:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰" -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "空ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -159,147 +159,151 @@ msgstr "" "%sã¨è¨€ã†ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚¿ãƒ–ã®ä½œæˆãŒã§ãã¾ã›ã‚“ï¼ãã‚Œã¯ã‚‚ã†æ—¢ã«å˜åœ¨ã—ã¦ã„ã‚‹ã‹ã€è‡ªåˆ†" "ã§ã™ã€‚" -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "%sã¨ã„ã†ãƒãƒ£ãƒ³ãƒãƒ«ã¸ã®å‚åŠ ã‚’è¦æ±‚ã—ã¦ã„ã¾ã™ã€‚" -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "パーティåãŒãªã„。" -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "ギルドåãŒãªã„。" -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "åå‰ã‚’æ•™ãˆã¦ãã ã•ã„。" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "リターンã¯ãƒãƒ£ãƒƒãƒˆã‚’ç•™ã‚ã¦ãŠãã¾ã™ã€‚" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "メッセージã¯ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™ã€‚" -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "リターンã¯ã“ã‚Œã‹ã‚‰ãƒãƒ£ãƒƒãƒˆã‚’ç•™ã‚ã¦ãŠãã¾ã™ã€‚" -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "メッセージã¯ã“ã‚Œã‹ã‚‰ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™ã€‚" -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "å‹é”" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "無視" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "ä¸æ€§" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "プレイヤーã¯ã‚‚ã†%s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "プレイヤーã¯%sæˆåŠŸï¼" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "é¸æ‰‹ã¯%sを居られãªã‹ã£ãŸ " -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "プレイヤーã¯ç„¡è¦–ã•ã‚Œãªã‹ã£ãŸï¼" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "プレイヤーã¯ã‚‚ã†ç„¡è¦–ã—ã¦ã„ãªã„ï¼" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Playerã¯unignoredã“ã¨ãŒã§ããªã‹ã£ãŸï¼" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "プレイヤーã¯ã‚‚ã†æ¶ˆã—ã¦ã„ã‚‹!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "プレーアãŒé¦–尾よãã«æ¶ˆåŽ»ï¼" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "クライアントã®ç¨¼åƒæ™‚間：%s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -310,11 +314,11 @@ msgstr "" "/%sã¸ã®å¯èƒ½ãªã‚ªãƒ—ションã¯ï¼š\"yes\", \"no\", \"true\", \"false\", \"1\", " "\"0\"。" -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "一般" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "デãƒãƒƒã‚°" @@ -330,23 +334,23 @@ msgstr "スクリーンショットをä¿å˜ã™ã‚‹ã“ã¨ã«å¤±æ•—ã—ã¾ã—ãŸï¼ msgid "The connection to the server was lost." msgstr "" -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "他人ã‹ã‚‰ã®ãƒˆãƒ¬ãƒ¼ãƒ‰ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’無視ã—ã¾ã™ã€‚" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "他人ã‹ã‚‰ã®ãƒˆãƒ¬ãƒ¼ãƒ‰ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å—ã‘入れã¾ã™ã€‚" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "マップをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "%sã‚’ãƒãƒ¼ãƒ‰ã—ã¦ã„ã‚‹é–“ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—ãŸã€‚" @@ -380,19 +384,19 @@ msgid "Name" msgstr "åå‰" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "攻撃" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "話ã™" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "å‹•ã" @@ -405,8 +409,8 @@ msgid "Reset" msgstr "リセット" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "è²·ã†" @@ -424,7 +428,7 @@ msgstr "" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -432,7 +436,7 @@ msgstr "+" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -445,7 +449,7 @@ msgstr "終了" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "最大" @@ -454,8 +458,8 @@ msgstr "最大" msgid "Shop" msgstr "店" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -464,15 +468,15 @@ msgstr "売る" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -643,7 +647,7 @@ msgid "Enter password:" msgstr "" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "削除" @@ -719,7 +723,7 @@ msgstr "虹 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -730,12 +734,12 @@ msgstr "???" msgid "Chat" msgstr "ãƒãƒ£ãƒƒãƒˆ" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "%sã«é€ä¿¡ä¸ï¼š %s" @@ -749,9 +753,10 @@ msgid "No" msgstr "ã„ã„ãˆ" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "無視" @@ -897,7 +902,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "é–‰ã˜ã‚‹" @@ -924,8 +929,8 @@ msgstr "装備" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "外ã™" @@ -967,31 +972,31 @@ msgid "Filter:" msgstr "フィルタ：" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "装備ã™ã‚‹" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "使ã†" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "è½ã¨ã™..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "分割ã™ã‚‹" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "æœ" @@ -1000,17 +1005,17 @@ msgid "Weight:" msgstr "é‡é‡" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "ä¿å˜" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "å–り戻ã™" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "è½ã¨ã™" @@ -1146,7 +1151,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "" @@ -1248,7 +1253,7 @@ msgstr "決定" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "クリア" @@ -1286,321 +1291,331 @@ msgstr "外ã™ç¬¬ä¸€" msgid "Away outfit" msgstr "装備一å¼ä¸åœ¨ã§" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "交æ›" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "完全無視" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "ãƒãƒ£ãƒƒãƒˆã«è¿½åŠ " -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "マップアイテム" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "å–り去る" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "呪文" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "強調表示を無効" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "強調表示を有効" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "ã§ã‚‹" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "ギルドãƒã‚¸ã‚·ãƒ§ãƒ³ã‚’変更" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr " åå‰: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "ã«è²¿æ˜“を足ã™" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "10ä¿å˜" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "åŠåˆ†ä¿å˜" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "全部ä¿å˜" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "10å–ã‚‹" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "åŠåˆ†å–ã‚‹" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "全部å–ã‚‹" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr " éš ã™" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "見ã›ã‚‹" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(デフォルト)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "" @@ -1856,6 +1871,10 @@ msgstr "" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "ã“ã‚ŒãŒãã®è‰²ãŒã©ã®ã‚ˆã†ã«è¦‹ãˆã‚‹ã‹ã§ã™ã€‚" @@ -2255,23 +2274,27 @@ msgstr "無視ã™ã‚‹" msgid "Erased" msgstr "消ã—ãŸ" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "交æ›ã‚’承èªã™ã‚‹" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "プライベートメッセージをå—ã‘å–ã‚‹ã“ã¨ã‚’承èªã™ã‚‹" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "å¤ã„" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "無視ã®éš›ã«ã¯ï¼š" @@ -2528,7 +2551,7 @@ msgstr "" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "å–引è¦æ±‚" @@ -2827,182 +2850,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) 襲ã†" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) 拾ã„上ã’ã‚‹" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) " -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) " -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) ä¸åœ¨ã§" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3054,18 +3081,18 @@ msgstr "レベル： %d (GM %d)" msgid "Correction points: %d" msgstr "ä¿®æ£ç‚¹ï¼š %d" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3073,20 +3100,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3102,7 +3129,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3114,70 +3141,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3495,7 +3522,7 @@ msgstr "" msgid "Road Point" msgstr "ãƒãƒ¼ãƒ‰ã®ãƒã‚¤ãƒ³ãƒˆ" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "" @@ -3503,15 +3530,15 @@ msgstr "" msgid "Update" msgstr "アップデート" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -4216,159 +4243,159 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "去ã£ã¦" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "従ã†: " -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "擬ã„: " -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "ã‚ãªãŸ" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [オプション]ã¯[マナファイル]ã‚’" +msgid "manaplus [options] [manaplus-file]" +msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "オプション:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4424,7 +4451,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "ã‚ャラクター作æˆå¤±æ•—。本åã¯ã®ã†ä½¿ã‚ã‚Œã¦ã„る。" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "åå‰é–“é•ã„" @@ -4469,11 +4496,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "プレイヤー MVP" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "プレイヤー MVP " @@ -4506,81 +4533,81 @@ msgstr "" msgid "Unknown server response." msgstr "ä¸æ˜Žãªã‚µãƒ¼ãƒãƒ¼ã®å¿œç”。" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "ギルドå：%s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "ギルドマスタ： %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "ギルドレベル：%d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "オンラインウザー： %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "最大ã®ãƒ¡ãƒ³ãƒãƒ¼ï¼š %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "å¹³å‡ãƒ¬ãƒ™ãƒ«ï¼š %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "ギルド経験：%d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "ギルド城：%s" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4693,11 +4720,11 @@ msgstr "経験シェアä¸å¯èƒ½" msgid "Experience sharing unknown." msgstr "経験シェアä¸æ˜Ž" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "アイテム使用失敗" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "装備ä¸å¯èƒ½" @@ -4713,39 +4740,39 @@ msgstr "" msgid "New password too short." msgstr "新パスワードã¯çŸã„éŽãŽã¾ã™ã€‚" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "未登録ãªID。" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "入力ã—ãŸãƒ‘スワードã¯é–“é•ã£ã¦ã„ã¾ã™ã€‚" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "アカウントã®æœ‰åŠ¹æœŸé™ãŒåˆ‡ã‚‰ã‚ŒãŸã€‚" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4754,15 +4781,15 @@ msgstr "" "ã‚ãªãŸã¯%sã¾ã§ã‚²ãƒ¼ãƒ ã‹ã‚‰ãƒãƒ¼ãƒ³ã•ã‚ŒãŸã€‚\n" "ゲームマスターãŸã¡ã«ã”連絡ãã ã•ã„。" -#: src/net/ea/loginhandler.cpp:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "ユーザåã¯ã‚‚ã†ä½¿ã‚ã‚Œã¦ã„る。" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "" @@ -4804,45 +4831,45 @@ msgstr "" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "パーティã‹ã‚‰é›¢ã‚ŒãŸã€‚" -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%sãŒãƒ‘ーティã‹ã‚‰é›¢ã‚ŒãŸã€‚" -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "ä¸æ˜Žãªãƒ¡ãƒ³ãƒãƒ¼ãŒè¨€ãŠã†ã¨ã—ãŸäº‹: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "ã‚ãªãŸã¯æ»ã«ã¾ã—ãŸã€‚" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "残念ãªãŠçŸ¥ã‚‰ã›ã§ã™ãŒã€ã‚ãªãŸæ§˜ã®ã‚ャラã¯æˆ¦é—˜ä¸äº¡ããªã£ã¦ã—ã¾ã„ã¾ã—ãŸã€‚" -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "今ã‹ã‚‰ç”Ÿãã¦ã„ãªã„。" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "æ»ç¥žã®å†·ãŸã„手ã«é‚ãŒå–られã¦ã—ã¾ã£ãŸã€‚" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "ゲームオーãƒãƒ¼!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "ゲームを続ã‘ã‚‹ãŸã‚ã«ã¯ã‚³ã‚¤ãƒ³ã‚’入れã¦ãã ã•ã„。" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4850,261 +4877,261 @@ msgstr "" "ã†ã†ã‚“ã€æ£’ã‚„ã‚„ã¡ã€‚ã‚ãªãŸã®ã‚ャラã¯æœ¬å½“ã«ã—ã‚“ã§ãªã‹ã£ãŸã€‚ã‚‚ã£ã¨ç¶ºéº—ãªã¨ã“ã‚ã«" "å‘ã‹ã£ãŸã ã‘。" -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "å–‰ã§çš„ã®æ¦å™¨ã‚’æ½°ã™äºˆå®šã ã£ãŸãŒâ€¦å¤±æ•—ã—ãŸã€‚" -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "ã‚ã‚“ã¾ã‚Šä¸Šæ‰‹ãã„ã‹ãªã‹ã£ãŸãœãƒ¼" -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "æŒã¡ç‰©ã‚’確定ã—ã¦æ¬²ã—ã„？" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "悲ã—ã•ã®ã‚ã¾ã‚Šã€ç—•è·¡ã§ã•ãˆè¦‹ã¤ã‹ã‚‰ãªã‹ã£ãŸã€‚" -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "全滅ã•ã‚ŒãŸã€‚" -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "相手ã‹ã‚‰è‡ªåˆ†ã®é ãŒæ¸¡ã•ã‚ŒãŸã¿ãŸã„。" -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "ã‚‚ã†ä¸€å›žå€’ã•ã‚ŒãŸã€æ°´é“管ã‹ã‚‰æ»ä½“を這ã£ã¦ã¿ãŸå¾Œã€æ–°ä½“ã‚’å—ã‘å–ã£ã¦ã¿ã¦" -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "ã¾ã æ»ãªãªã‹ã£ãŸã€‚休憩ä¸ã ã‘ã§ã‚る。" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "ã‚ãªãŸã¯ã‚‚ã†å˜åœ¨ã—ã¦ã„ãªã„。" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "生ãã‚‹ã“ã¨ãªãã€ã„ãªããªã£ãŸã€‚" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "ã‚ãªãŸã¯æ¯ã‚’引ãå–ã‚Šã€ã‚ãªãŸã‚’作ã£ãŸäººã¸é€¢ã„ã«è¡Œã£ã¦ã—ã¾ã£ãŸã€‚" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "ã‚ãªãŸã¯æ»ä½“ã§ã‚る。" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "命を失ã„ã€å¤©å›½ã«å‘ã‹ã£ãŸã€‚" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" "ã‚‚ã—ã‚ãªãŸãŒãã‚“ãªã«ã‚‚生気ã«æº€ã¡ã¦ã„ãªã‹ã£ãŸãªã‚‰ã°ã€æ»ã‚“ã§è‘¬ã‚‰ã‚Œã¦ã„ãŸã‚“ã˜ã‚ƒ" "ãªã„ã‹ï¼Ÿ" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "ã‚ãªãŸã®ãŒã‚“ã°ã‚Šã¯ä»Šã‚„æ´å²ã¨ãªã£ãŸã‚‰ã—ã„。" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "クタãƒãƒƒã‚¿ã¿ãŸã„ãªã€‚" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "人間界ã‹ã‚‰è¿½ã„出ã•ã‚ŒãŸã€‚" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "最後ã®å‘¼å¸ã ã£ãŸã€‚æ»ç¥žã«ä¼šã£ãŸå¾Œã€ç„¡ã¨çµåˆã—ã¡ã‚ƒã£ãŸã€‚" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "旧プレイヤーã§ã‚る。" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "ãŠå‰ã®é‚ã¯åŒ—極ã¾ã§é£›ã°ã‚ŒãŸã€‚" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "メッセージ" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "æŒã£ã¦ã„るアイテムã¯ä½“é‡ã‚ˆã‚ŠåŠåˆ†ä»¥ä¸Šãªã®ã§ã€ä½“力ãŒå›žå¾©ã§ããªã„。" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "ã‚ãªãŸã¯ %s を費やã—" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "スã‚ルã¯ã‚‚ã†ä¸ŠãŒã‚‰ãªã„ï¼" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "矢を先ã«è£…å‚™ã—ã¦ãã ã•ã„。" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "å–引失敗" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "スマイリー表示失敗" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "触るã“ã¨ãŒå¤±æ•—ã—ãŸã€‚" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "ãƒãƒ£ãƒƒãƒˆä½œæˆå¤±æ•—" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "パーティã«å‚åŠ ã§ããªã‹ã£ãŸï¼" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "å«ã¹ãªã„ï¼" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "ã‚ãªãŸã¯ã¾ã å分ã«é«˜ã„lvlã‚’é”ã—ã¦ã„ãªã„ï¼" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "HPä¸è¶³ï¼" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "SPä¸è¶³ï¼" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "メモãªã—ï¼" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "今ã“ã®è¡Œå‹•ã¯ç„¡ç†ã€‚" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "é‡‘æ¬ ã¿ãŸã„ã‚“ã˜ã‚ƒãªã„ã‹â€¦" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "本スã‚ルãŒã“ã®æ¦å™¨ã¨ä½¿ãˆãªã„。" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "ä»–ã®èµ¤å®çŸ³ãŒå¿…è¦ã¨ãªã£ãŸï¼" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "ä»–ã®é’å®çŸ³ãŒå¿…è¦ã¨ãªã£ãŸï¼" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "アイテムãŒæŒã¡ã™ãŽã¦ã„る状態ï¼" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "ã†ã‚“？何ãれ？" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "ワープãŒå¤±æ•—ã—ãŸã€‚" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "何も盗ã‚ãªã‹ã£ãŸâ€¦" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "毒ã¯ä¸åŠ¹æžœ" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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ã¯ã‚ãªãŸã¨å–引ã—ãŸã„ã¿ãŸã„ãŒã€å¿œã˜ã‚‹ï¼Ÿ" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "å–引ã¯ä¸å¯èƒ½ã€‚å–引ã®ç›¸æ‰‹ã¯é ã™ãŽã‚‹ã€‚" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "å–引ã¯ä¸å¯èƒ½ã€‚本ã‚ャラãŒå˜åœ¨ã—ã¦ã„ãªã„。" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "ä¸æ˜Žãªç†ç”±ã§å–引ãŒä¸æ¢ã•ã‚ŒãŸã€‚" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "ã‚ãªãŸã¨%sã¨ã®å–引" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "%sã¨ã®å–引ãŒä¸æ¢ã•ã‚ŒãŸã€‚" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "ã§ããªã‹ã£ãŸå–引ã‚ャンセルパケット" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—ã€‚ç›¸æ‰‹ã¯ã‚¢ã‚¤ãƒ†ãƒ ã‚’æŒã¡ã™ãŽã¦ã„る状態ã§ã‚る。" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—ã€‚ç›¸æ‰‹ã®ç©ºã„ã¦ã„るスãƒãƒƒãƒˆã¯ãªã„。" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "ä¸æ˜Žãªç†ç”±ã§ã‚¢ã‚¤ãƒ†ãƒ è¿½åŠ å¤±æ•—" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "å–引ä¸æ¢" -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "å–引完了" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "å¼·ã•" @@ -5113,7 +5140,7 @@ msgstr "å¼·ã•" msgid "Strength %+.1f" msgstr "強度 (str) %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "ç´ æ—©ã•" @@ -5122,7 +5149,7 @@ msgstr "ç´ æ—©ã•" msgid "Agility %+.1f" msgstr "æ©Ÿæ•ã• (agi) %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "器用ã•" @@ -5131,7 +5158,7 @@ msgstr "器用ã•" msgid "Dexterity %+.1f" msgstr "器用㕠(dex) %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "活力" @@ -5140,7 +5167,7 @@ msgstr "活力" msgid "Vitality %+.1f" msgstr "活気 (vit) %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "知能" @@ -5448,74 +5475,74 @@ msgstr "èªè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "é‡è¤‡ã—ãƒã‚°ã‚¤ãƒ³ã€‚" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "サーãƒãƒ¼ã‹ã‚‰åˆ‡æ–ã•ã‚ŒãŸã€‚" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "é‹" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "防御" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "特攻撃" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "特防御" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "ï¼… 精度" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "ï¼… 回é¿" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% å±æ©Ÿ" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "攻撃é…延" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr " å¾’æ©é…延" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "攻撃è·é›¢" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5523,11 +5550,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "ホストåを解決ã§ãã¾ã›ã‚“。" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "" @@ -5536,19 +5563,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%sã¯ãƒ‘ーティã«ã¯ã„ãªã„ï¼" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "'...'を表示ã™ã‚‹" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "åå‰ã‚’瞬ã" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "フãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°'...'ãƒãƒ–ル" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "フãƒãƒ¼ãƒ†ã‚£ãƒ³ã‚°ãƒãƒ–ル" diff --git a/po/manaplus.pot b/po/manaplus.pot index 6d582de39..f141b3248 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-10-01 01:22+0300\n" +"POT-Creation-Date: 2011-10-15 00:08+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" @@ -18,25 +18,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "" @@ -138,167 +138,171 @@ msgstr "" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "" -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "" -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "" -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "" -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "" -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -307,11 +311,11 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "" @@ -327,23 +331,23 @@ msgstr "" msgid "The connection to the server was lost." msgstr "" -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "" @@ -377,19 +381,19 @@ msgid "Name" msgstr "" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "" @@ -402,8 +406,8 @@ msgid "Reset" msgstr "" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "" @@ -421,7 +425,7 @@ msgstr "" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "" @@ -429,7 +433,7 @@ msgstr "" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "" @@ -442,7 +446,7 @@ msgstr "" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "" @@ -451,8 +455,8 @@ msgstr "" msgid "Shop" msgstr "" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -461,15 +465,15 @@ msgstr "" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -640,7 +644,7 @@ msgid "Enter password:" msgstr "" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "" @@ -716,7 +720,7 @@ msgstr "" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -727,12 +731,12 @@ msgstr "" msgid "Chat" msgstr "" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "" @@ -746,9 +750,10 @@ msgid "No" msgstr "" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "" @@ -894,7 +899,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "" @@ -921,8 +926,8 @@ msgstr "" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "" @@ -964,31 +969,31 @@ msgid "Filter:" msgstr "" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "" @@ -997,17 +1002,17 @@ msgid "Weight:" msgstr "" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "" @@ -1145,7 +1150,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "" @@ -1247,7 +1252,7 @@ msgstr "" msgid "NPC" msgstr "" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "" @@ -1285,321 +1290,331 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "" @@ -1853,6 +1868,10 @@ msgstr "" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "" @@ -2252,23 +2271,27 @@ msgstr "" msgid "Erased" msgstr "" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "" @@ -2525,7 +2548,7 @@ msgstr "" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "" @@ -2824,182 +2847,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3051,18 +3078,18 @@ msgstr "" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "" @@ -3070,20 +3097,20 @@ msgstr "" msgid "(C)" msgstr "" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "" @@ -3099,7 +3126,7 @@ msgstr "" msgid "(2)" msgstr "" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "" @@ -3111,70 +3138,70 @@ msgstr "" msgid "(7)" msgstr "" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "" @@ -3490,7 +3517,7 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "" @@ -3498,15 +3525,15 @@ msgstr "" msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "" @@ -4206,160 +4233,160 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" +msgid "manaplus [options] [manaplus-file]" msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" msgstr "" -#: src/main.cpp:49 -msgid " used to set custom parameters" +#: src/main.cpp:50 +msgid " used to set custom parameters" msgstr "" -#: src/main.cpp:50 -msgid " to the manaplus client." +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4415,7 +4442,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "" @@ -4460,11 +4487,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4497,81 +4524,81 @@ msgstr "" msgid "Unknown server response." msgstr "" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4680,11 +4707,11 @@ msgstr "" msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "" @@ -4700,54 +4727,54 @@ msgstr "" msgid "New password too short." msgstr "" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, 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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "" @@ -4789,303 +4816,303 @@ msgstr "" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "" -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "" -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "" -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "" -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "" -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "" -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "" -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "" -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "" -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "" -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 "" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "" -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "" @@ -5094,7 +5121,7 @@ msgstr "" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "" @@ -5103,7 +5130,7 @@ msgstr "" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "" @@ -5112,7 +5139,7 @@ msgstr "" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "" @@ -5121,7 +5148,7 @@ msgstr "" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "" @@ -5429,74 +5456,74 @@ msgstr "" msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5504,11 +5531,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "" @@ -5517,19 +5544,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index 511a5d758..748c3fb5b 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:45+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+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" @@ -20,25 +20,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Zichtbaar op de map" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "ontwijkt" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "mist" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "I" @@ -140,15 +140,15 @@ msgstr "Fout bij het creëren van de update map!" 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Onbekend commando." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Kan geen lege berichten sturen!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -157,152 +157,156 @@ msgstr "" "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds " "bestaat, of het is jezelf." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Aanvragen om bij kanaal %s toegevoegd te worden." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Groepsnaam ontbreekt." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Guild-naam ontbreekt." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Gelieve een naam te specifiëren" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Ga terug naar chat" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Bericht sluit chat." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Ga nu terug naar chat." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Bericht sluit nu chat." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "vriend" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "genegeerd" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutraal" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Speler reeds %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Speler succesvol %s!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Speler kan niet %s zijn!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "Speler is niet genegeerd!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "Speler niet langer genegeerd!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Speler kan niet worden genegeerd!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Speler reeds verwijderd!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Speler succesvol verwijderd!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Speler kan niet worden verwijderd!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Client uptime: %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uren" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d seconden" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Aangemaakt:" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Verwijdered:" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -312,11 +316,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Algemeen" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Debug" @@ -332,23 +336,23 @@ msgstr "Opslaan van screenshot mislukt!" msgid "The connection to the server was lost." msgstr "De verbinding met de server is verbroken." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Netwerkfout" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Inkomende handelsaanvragen negeren" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Inkomende handelsaanvragen accepteren" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Kon Map Niet Laden" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Fout bij het laden van %s" @@ -382,19 +386,19 @@ msgid "Name" msgstr "Naam" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Aanvallen" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Spreken" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Beweeg" @@ -407,8 +411,8 @@ msgid "Reset" msgstr "Reset" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Kopen" @@ -426,7 +430,7 @@ msgstr "" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -434,7 +438,7 @@ msgstr "+" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -447,7 +451,7 @@ msgstr "Afsluiten" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Maximum" @@ -456,8 +460,8 @@ msgstr "Maximum" msgid "Shop" msgstr "Winkel" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -466,15 +470,15 @@ msgstr "Verkopen" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -645,7 +649,7 @@ msgid "Enter password:" msgstr "Geef wachtwoord:" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Verwijderen" @@ -721,7 +725,7 @@ msgstr "regenboog 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -732,12 +736,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Aanwezig: %s; %d speler zijn aanwezig." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Fluisteren naar %s: %s" @@ -751,9 +755,10 @@ msgid "No" msgstr "Nee" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Negeer" @@ -899,7 +904,7 @@ 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/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Sluiten" @@ -926,8 +931,8 @@ msgstr "Uitrusting" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Afdoen" @@ -969,31 +974,31 @@ msgid "Filter:" msgstr "Filter:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Uitrusten" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Gebruiken" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Neerleggen..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Splitsen" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Kleren" @@ -1002,17 +1007,17 @@ msgid "Weight:" msgstr "Gewicht:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Opslaan" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Afhalen" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Neerleggen" @@ -1150,7 +1155,7 @@ msgstr "" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "" @@ -1252,7 +1257,7 @@ msgstr "Indienen" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Wissen" @@ -1290,321 +1295,331 @@ msgstr "Verwijder uitrusting eerst" msgid "Away outfit" msgstr "Kleren om weg te gaan" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handel" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Fluister" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Genees" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Word vriend" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "Geen rekening mee houden" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Wis" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "Volledig genegeerd" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Volg" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Imiteer" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Schop speler" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Toon Voorwerpen" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "ontkleed" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Koop (?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "Verkoop (?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Schop" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Raap op" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Aan chat toevoegen" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Plaats voorwerp op de kaart" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Hernoem" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Verwijder" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Inladen oude kleren" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Spreuken" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Laad oude spreuken" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Wijzig spreuk" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Markering afzetten" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Markering aanzetten" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Verwijder naam" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "away aanzetten" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "away afzetten" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Verlaat" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "Wijzig uw guild positie" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Kaart bordje hernoemen " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Naam: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Plaats 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Plaats de helft" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Plaats alles" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "Laat alles vallen" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Haal 10 op" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Haal de helft op" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Haal alles op" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Laden van oude voorwerpsnelkoppelingen" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Laden van oude neerleggingsnelkoppeling" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Verberg" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Toon" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Kopieer naar chat" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(standaard)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Beweeg naar boven" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Beweeg naar beneden" @@ -1860,6 +1875,10 @@ msgstr "Andere" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Dit is hoe de kleur eruit ziet" @@ -2259,23 +2278,27 @@ msgstr "Genegeerd" msgid "Erased" msgstr "Gewist" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Handelen toestaan" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Fluisteren toestaan" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Oud" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "Relaties" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Tijdens negeren:" @@ -2538,7 +2561,7 @@ msgstr "Toon links in aankondigingen" msgid "Auction" msgstr "" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Handel aanvragen" @@ -2837,182 +2860,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) beweeg tot aan doel in aanvalsbereik" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) beweeg tot aan doel" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) standaard volgen" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) relatief volgen" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) gespiegeld volgen" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "(P) huisdier volgen" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) onbekend volgen" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) standaard aanval" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) wissel aanval zonder schild" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) wissel aanval met schild" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) aanval" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) ga en val aan" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) ga, val aan, raap op" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) zonder auto aanval" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) klein raap op 1x1 velden" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) standaard raap op 2x1 velden" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) vooruit raap op 2x3 velden" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) raap op 3x3 velden" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) go en raap op met bereik 4" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(G) ga en raap op met bereik 8" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) ga en raap op zonder bereiklimiet" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) raap op" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) normale map tonen" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) debug map tonen" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) ultra map tonen" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(U) ultra map tonen 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) lege map tonen" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) zwart & witte map tonen" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) map tonen" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) gebruik #flar voor magie aanval" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) gebruik #chiza voor magie aanval" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) gebruik #ingrav voor magie aanval" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) gebruik #frillyar voor magie aanval" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gebruik #upmarmu voor magie aanval" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) magie aanval" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) standaard imitatie" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) kleren imitatie" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) imitatie" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) op toetsenbord" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) weg" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) weg" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) spel camera modus" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) vrije camera modus" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "(D) design camera modus" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3064,18 +3091,18 @@ msgstr "Niveau: %d (GM %d)" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3083,20 +3110,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3112,7 +3139,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3124,70 +3151,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3505,7 +3532,7 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Wie Is Online - Bijwerken" @@ -3513,15 +3540,15 @@ msgstr "Wie Is Online - Bijwerken" msgid "Update" msgstr "Bijwerken" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Wie Is Online - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Wie Is Online - fout" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "Wie Is Online - Bijgewerkt" @@ -4230,160 +4257,160 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "U bent gedoodt door " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Geprobeerd een nietbestaand voorwerp op te rapen." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "Voorwerp is te zwaar." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "Voorwerp is te ver weg." -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "Voorwerp behoort bij iemand anders." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 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:1465 +#: src/localplayer.cpp:1466 #, 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:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Weg" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Volg: " -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Volgen onderbroken" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "Imitatie: " -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Imitatie onderbroken" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [opties] [mana-bestand]" +msgid "manaplus [options] [manaplus-file]" +msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[mana-bestand]: Het mana bestand is een XML bestand (.mana)" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr " om manuele parameters te gebruiken" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" +msgstr "" #: src/main.cpp:50 -msgid " to the manaplus client." -msgstr " aan de manaplus client." +msgid " used to set custom parameters" +msgstr "" + +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Opties:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Log bestand te gebruiken" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Chat log bestand te gebruiken" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Toon de versie" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " -h --help : Toon deze help" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Configuratie map te gebruiken" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Login met deze gebruikersnaam" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password : Loging met dit wachtwoord" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --character : Login met dit karakter" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr " -s --server : Login servernaam of IP" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Login serverpoort" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr " --update-host : Updateserver te gebruiken" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr " -D --default : Kies standaard karakterserver en karakter" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : update downloads overslaan" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Map om spelgegevens te laden" -#: src/main.cpp:69 +#: src/main.cpp:70 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:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir: Map te gebruiken om screenshots te bewaren" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Start spel in veilige modus" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Zet OpenGL af voor deze sessie" @@ -4441,7 +4468,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:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Verkeerde naam." @@ -4486,11 +4513,11 @@ msgstr "" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "" @@ -4523,81 +4550,81 @@ msgstr "" msgid "Unknown server response." msgstr "" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "" -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "" -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "" -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "" @@ -4714,11 +4741,11 @@ msgstr "Ervaringsdeling is niet mogelijk." msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Kan voorwerp niet gebruiken." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "Kan dit niet uitrusten." @@ -4734,39 +4761,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:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Verkeerd wachtwoord." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "Geweigered door de server." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Client is te oud." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4775,15 +4802,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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Deze gebruikersnaam is al genomen." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Gebruikersnaam is compleet verwijderd" @@ -4825,47 +4852,47 @@ msgstr "" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "Je hebt de groep verlaten." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s heeft jouw groep verlaten." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "Een onbekend lid probeerde te zeggen: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Je bent dood." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "" "We betreuren het om je te melden dat jouw personage is gestorven in een " "gevecht." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Je bent niet langer levend." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "De koude handen van Pietje de Dood grijpen naar jouw ziel." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Game Over!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "Werp een muntstuk in om verder te spelen." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4873,7 +4900,7 @@ msgstr "" "Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is " "naar een beter plaats gegaan." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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." @@ -4881,257 +4908,257 @@ msgstr "" "Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel " "te slaan is mislukt." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Dit verliep niet zoals gepland." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Verslagen" -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Het ziet ernaar uit dat je je pijp aan Maarten mag geven." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" "Je hebt het weer verknald, dump jouw lichaam en ga er een nieuw halen." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "Je bent nog niet dood. Je bent maar aan het rusten." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Je bent niet langer." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Je hebt opgehouden te zijn." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Je bent stokstijf." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Beroofd van het leven, rust je in vrede." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "Jouw metabolische processen behoren nu tot het verleden." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "Je bent een ex-speler." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Bericht" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven " "herstellen." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "Handel mislukte!" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "Emoticon gefaald!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "Zitten niet mogelijk!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "Chatcreatie mislukte!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "Kan je niet bij de groep voegen!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "Kan niet roepen!" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "Je hebt nog geen hoog genoeg level bereikt!" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "Onvoldoende leven!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "Onvoldoende Vaardigheidspunten!" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "Je hebt geen memo's!" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Je kan dat nu niet doen!" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "Je hebt een andere rode edelsteen nodig!" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "Je hebt een andere blauwe edelsteen nodig!" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "Je draagt teveel bij je om dit te doen!" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "Huh? Wat is dat?" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "Warp mislukt..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "Kon niets stelen..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "Gif had geen effect..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 wil met jou handelen, aanvaard je dit?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Handelen is niet mogelijk. Partner is te ver weg." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "Handelen is niet mogelijk. Personage bestaat niet." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "Handel onderbroken vanwege een onbekende reden." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "Handelen: Jij en %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "Handel met %s geannuleerd." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "" "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "Kan voorwerp niet toevoegen voor een onbekende reden." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Handel geannuleerd." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Handel voltooid." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Kracht" @@ -5140,7 +5167,7 @@ msgstr "Kracht" msgid "Strength %+.1f" msgstr "Kracht %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Behendigheid" @@ -5149,7 +5176,7 @@ msgstr "Behendigheid" msgid "Agility %+.1f" msgstr "Behendigheid %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Handigheid" @@ -5158,7 +5185,7 @@ msgstr "Handigheid" msgid "Dexterity %+.1f" msgstr "Handigheid %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitaliteit" @@ -5167,7 +5194,7 @@ msgstr "Vitaliteit" msgid "Vitality %+.1f" msgstr "Vitality %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Intelligentie" @@ -5476,74 +5503,74 @@ msgstr "Authenticatie gefaald." msgid "No servers available." msgstr "Geen servers beschikbaar." -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Iemand anders is aan het proberen deze account te gebruiken." -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Deze account is al ingelogd." -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Snelheidshack gedetecteerd." -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Verdubbelde login." -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "Onbekende connectiefout." -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "De verbinding met de server werd verbroken!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Geluk" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Verdediging" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "M.Aanval" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "M.Verdediging" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% Nauwkeurigheid" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% Ontwijking" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "Aanvalsvertraging" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "Wandelvertraging" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "Aanvalsbereik" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "" @@ -5551,11 +5578,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "Leeg adres gegeven aan Network::connect()!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "Niet mogelijk te resolven van host \"" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Verbinding met server beëindigd. " @@ -5564,19 +5591,19 @@ msgstr "Verbinding met server beëindigd. " msgid "%s is not in your party!" msgstr "%s is niet in jouw groep!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Say '...'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Blink naam" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Zwevende '...' bel" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Zwevende bel" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-10-01 01:07+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-15 02:55+0000\n" "Last-Translator: freya <freya.df@gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/" "pt/)\n" @@ -21,25 +21,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Visivel no mapa" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "desviou" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "errou" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "l" @@ -141,15 +141,15 @@ msgstr "Erro ao criar pasta de atualizações!" 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Não é possÃvel enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,152 +158,156 @@ 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:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Não foi possÃvel deixar de ignorar o jogador!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "Na Lista Negra" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "Tamanho do cache de fonte" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Tamanho de Cache:" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "Recursos de imagens:" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "Recursos de imagens orfãos:" @@ -313,11 +317,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Geral" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Depurador" @@ -333,23 +337,23 @@ msgstr "Falha ao salvar screenshot!" msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Não foi possÃvel carregar o mapa" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -383,19 +387,19 @@ msgid "Name" msgstr "Nome" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Mover" @@ -408,8 +412,8 @@ msgid "Reset" msgstr "Resetar" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Comprar" @@ -427,7 +431,7 @@ msgstr "Quantidade:" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -435,7 +439,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -448,7 +452,7 @@ msgstr "Sair" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Máximo" @@ -457,8 +461,8 @@ msgstr "Máximo" msgid "Shop" msgstr "Loja" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -467,15 +471,15 @@ msgstr "Vender" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -646,7 +650,7 @@ msgid "Enter password:" msgstr "Entre com a senha" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Excluir" @@ -722,7 +726,7 @@ msgstr "arco-Ãris 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -733,12 +737,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -752,9 +756,10 @@ msgid "No" msgstr "Não" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Ignora" @@ -900,7 +905,7 @@ 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/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fechar" @@ -927,8 +932,8 @@ msgstr "Equipamento" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Desequipar" @@ -970,31 +975,31 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Dividir" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Roupas" @@ -1003,17 +1008,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1151,7 +1156,7 @@ msgstr "%s %d?" msgid "jacko spawning" msgstr "JackOvai aparecer" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "Você saiu da Guilda." @@ -1253,7 +1258,7 @@ msgstr "Enviar" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Limpar" @@ -1291,321 +1296,331 @@ msgstr "Desequipar antes" msgid "Away outfit" msgstr "Roupas de ocupado" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Negócios" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Sussuro" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Curar:" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Ser Amigo" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "Ser inimigo" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "Lista Negra" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Apagar" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Não ignorar" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Imitar" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "Convidar para grupo" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Chutar do grupo" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Chutar da Guilda" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "Mudar posição da Guilda" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "Convidar para Guilda" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Chutar Jogador" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "Deixar pelado" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Mostar itens:" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Deixar sem Roupas" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "Adicionar comentário" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "Vender (?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Chutar" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "Remover da Lista de Ataques" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "Adicionar a prioridade na lista de ataques" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "Adicionar a lista de ataques" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Adicionar a lista de ignorados" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Adicionar nome ao chat" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Nome no chat" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Mapa Item" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "A Remover" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "Urdidura" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Carregar Antigas Roupas" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Feitiços" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Carregar Antigos Feitiços" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Editar Feitiços" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Desabilitar destaque" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Habilitar destaque" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "Não remova o nome" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Remover nome" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "Habilitar longe do teclado" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "Desabilitar longe do teclado" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Sair" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 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:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "Resetar barra amarela" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copiar para o chat" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Mover a cima" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Mover a baixo" @@ -1860,6 +1875,10 @@ msgstr "Outro" msgid "Highlight words (separated by comma)" msgstr "Palavras Destacadas (separadas por vÃrgulas)" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "Ver mensagens MVP" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "A cor vai ficar assim" @@ -2259,23 +2278,27 @@ msgstr "Ignorado" msgid "Erased" msgstr "Apagado" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "Na Lista Negra " + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Permitir negociações" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Permitir mensagens particulares" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Antigo" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "Relações" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Quando ignorar:" @@ -2536,7 +2559,7 @@ msgstr "Mostrar links em anúncio" msgid "Auction" msgstr "Leilão" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Proposta de negociação" @@ -2835,182 +2858,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "(a) Alcance de arqueiros" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) Ataque" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) Visualizador de mapa" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) MÃmica padrão" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) MÃmica de roupas" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) MÃmica" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) Ausente" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) Ausente" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "(D) Modo de jogo câmera design" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo ativados" @@ -3062,18 +3089,18 @@ msgstr "NÃvel: %d (GM %d)" msgid "Correction points: %d" msgstr "Pontos de correção: %d" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3081,20 +3108,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3110,7 +3137,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3122,70 +3149,70 @@ msgstr "(4)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3502,7 +3529,7 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" @@ -3510,15 +3537,15 @@ msgstr "Quem está online - Atualizando" msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -4222,164 +4249,164 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "Você foi morto por " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 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:1465 +#: src/localplayer.cpp:1466 #, 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:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "Você vê " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [opções] [mana-file]" +msgid "manaplus [options] [manaplus-file]" +msgstr "manaplus [opções] [manaplus-arquivo]" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[mana-file] : O arquivo mana está em um XML (.mana)" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr " usado para definir parâmetros" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" +msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)" #: src/main.cpp:50 -msgid " to the manaplus client." -msgstr " para o cliente manaplus." +msgid " used to set custom parameters" +msgstr "usado para definir parâmetros customizados" -#: src/main.cpp:52 +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr "para o cliente manaplus. " + +#: src/main.cpp:53 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:64 +#: src/main.cpp:65 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:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:67 +#: src/main.cpp:68 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:69 +#: src/main.cpp:70 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:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4435,7 +4462,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:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Nome errado." @@ -4480,11 +4507,11 @@ msgstr "Mensagem privada não pode ser enviada, %s está offline." msgid "Whisper could not be sent, ignored by %s." msgstr "Mensagem privada não pode ser enviada, ignorado por %s." -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "Jogador VIP." -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "Jogador VIP: " @@ -4517,81 +4544,81 @@ msgstr "Falha ao checar Emperium" msgid "Unknown server response." msgstr "Resposta do servidor desconhecida." -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "Nome Guilda: %s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "Mestre da guilda: %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "NÃvel Guilda: %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "Membros Online: %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "Max Membros: %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "NÃvel médio: %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "Guilda exp: %d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "Guilda prox. exp: %d" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "Castelo Guilda : %s" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "Não foi possÃvel convidar jogador para a guilda." -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "O jogador rejeitou o convite." -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "Usuário agora é um membro da sua guilda." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "Sua guilda está cheia." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "Resposta desconhecida de convite para guilda." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%s saiu de sua Guilda." -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "Você foi expulso da Guilda." -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%s foi expulso da Guilda." @@ -4707,11 +4734,11 @@ msgstr "Não é possÃvel compartilhar experiência." msgid "Experience sharing unknown." msgstr "Compartilhamento de experiência desconhecido." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Falha ao usar item." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "ImpossÃvel equipar." @@ -4727,41 +4754,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:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "ID não registrado." -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Senha incorreta." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "A conta expirou." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "Rejeitado pelo servidor." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 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:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Cliente muito antigo." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4770,15 +4797,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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Server lotado." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Este nome de usuário já está em uso." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Usuário deletado." @@ -4820,45 +4847,45 @@ msgstr "%s não pode se juntar ao gupo cheio." msgid "QQQ Unknown invite response for %s." msgstr "QQQ resposta de convite desconhecida por %s." -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "Você saiu do grupo." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s saiu do seu grupo." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "Um membro desconhecido tentou dizer: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Você está morto." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Lamentamos informar que seu personagem foi morto em combate." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Você não me parece assim tão vivo." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "As mãos frias da morte estão levando sua alma." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Fim de jogo!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "Insira uma moeda para continuar." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4866,79 +4893,79 @@ msgstr "" "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para " "um lugar melhor." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "" "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Eu acho que as coisas não correram tão bem." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Você quer uma identificação de suas posses?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Infelizmente, seus traços nunca foram encontrados..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Aniquilado." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Parece que te ofereceram sua própria cabeça." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "Você estragou tudo de novo, jogue fora seu corpo e arranje outro." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "Você não morreu ainda. Está apenas descansando." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Você não é mais." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Você deixou de ser." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Você expirou e foi encontrar seu criador." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Você é um cadáver." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Sem vida, você descansa em paz." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Se não fosse tão animado, estaria comendo grama pela raiz." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "Seus processos metabólicos agora são história." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "Você bateu as botas." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "Você chutou o balde." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -4946,186 +4973,186 @@ msgstr "" "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito " "coro invisÃvel." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "Você é um ex-jogador" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "Você foi desta para melhor." -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Mensagem" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Você está carregando mais que a metade de seu peso. Você não poderá mais " "recuperar HP." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Você está carregando menos da metade de seu peso. Você vai recuperar-se " "novamente." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "Você pegou %s." -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "Você gastou %s" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "ImpossÃvel aumentar o atributo!" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "Equipe as flechas primeiro." -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "Falha na negociação!" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "Falha no emoticon!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "Falha ao sentar!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "Falha ao criar Chat!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "Impossivel entrar no grupo!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "Impossivel gritar!" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "Você ainda não tem o nivel necessário!" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "HP insuficiente!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "SP insuficiente!" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "Você não tem nenhuma nota armazenada!" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Você não pode fazer isso agora!" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Parece que você precisa de mais dinheiro... ;-)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Você não pode usar essa habilidade com esse tipo de arma!" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "Você precisa de outra gema vermelha!" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "Você precisa de outra jóia azul!" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "Você está com muita carga para fazer isso!" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "Hã? O que é isso?" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "Falha ao transportar..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "Não foi possÃvel roubar nada..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "Veneno não surtiu efeito..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 quer negociar com você, você aceita?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Negociação impossÃvel. O parceiro de negócios está muito longe." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "Negociação impossÃvel. O personagem não existe." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "Negociação cancelada devido a uma razão desconhecida." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "Negociação: Você e %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "Negociação com %s cancelada." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "Troca injusta pacote cancelado." -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "Falha ao adicionar item. Você não pode trocar este item." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "Erro ao adicionar item devido a um motivo desconhecido." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Negociação cancelada." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Negociação realizada." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Força" @@ -5134,7 +5161,7 @@ msgstr "Força" msgid "Strength %+.1f" msgstr "Força %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Agilidade" @@ -5143,7 +5170,7 @@ msgstr "Agilidade" msgid "Agility %+.1f" msgstr "Agilidade %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Destreza" @@ -5152,7 +5179,7 @@ msgstr "Destreza" msgid "Dexterity %+.1f" msgstr "Destreza %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitalidade" @@ -5161,7 +5188,7 @@ msgstr "Vitalidade" msgid "Vitality %+.1f" msgstr "Vitalidade %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Inteligência" @@ -5471,74 +5498,74 @@ msgstr "Falha de autenticação." msgid "No servers available." msgstr "Servidores indisponÃveis." -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Outra pessoa está tentando utilizar esta conta." -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Existe alguém conectado a esta conta." -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Hack de velocidade detectado." -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Login duplicado." -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "Erro de conexão desconhecido." -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Você foi desconectado do servidor!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Sorte" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Defesa" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "Atq. Mágico" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "Def. Mágica" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% Exatidão" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% Evasão" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% CrÃticos" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "Atraso de ataque" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "Atraso de movimento" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "Atraso de alcance" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "Dano por seg." @@ -5546,11 +5573,11 @@ msgstr "Dano por seg." msgid "Empty address given to Network::connect()!" msgstr "Endereço vazio enviado para Network::connect()!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "Não foi possÃvel determinar o host \"" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Conexão com o servidor interrompida. " @@ -5559,19 +5586,19 @@ msgstr "Conexão com o servidor interrompida. " msgid "%s is not in your party!" msgstr "%s não está em seu grupo!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Bolha Flutuante" diff --git a/po/pt_BR.po b/po/pt_BR.po index c049a45e7..e13e5acfe 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-10-01 01:07+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-15 02:52+0000\n" "Last-Translator: freya <freya.df@gmail.com>\n" "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/" "manaplus/team/pt_BR/)\n" @@ -23,25 +23,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Mapa visivel " -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "por nome" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "por id" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "I" @@ -143,15 +143,15 @@ msgstr "Erro ao criar pasta de atualizações!" 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:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "Não é possÃvel enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,152 +160,156 @@ 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:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Não foi possÃvel deixar de ignorar o jogador!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "Na Lista Negra" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "Tamanho de fonte Cache" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Tamanho de cache:" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "Recursos de imagem:" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "Recurso de imagem orfão:" @@ -315,11 +319,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Geral" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Depurador" @@ -335,23 +339,23 @@ msgstr "Falha ao salvar screenshot!" msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Não foi possÃvel carregar o mapa" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -385,19 +389,19 @@ msgid "Name" msgstr "Nome" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Mover" @@ -410,8 +414,8 @@ msgid "Reset" msgstr "Resetar" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Comprar" @@ -429,7 +433,7 @@ msgstr "Quantidade:" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -437,7 +441,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -450,7 +454,7 @@ msgstr "Sair" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "Máximo" @@ -459,8 +463,8 @@ msgstr "Máximo" msgid "Shop" msgstr "Loja" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -469,15 +473,15 @@ msgstr "Vender" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -648,7 +652,7 @@ msgid "Enter password:" msgstr "Entre com a senha:" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Excluir" @@ -724,7 +728,7 @@ msgstr "arco-Ãris 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -735,12 +739,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -754,9 +758,10 @@ msgid "No" msgstr "Não" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Ignora" @@ -902,7 +907,7 @@ 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/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fechar" @@ -929,8 +934,8 @@ msgstr "Equipamento" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "Desequipar" @@ -972,31 +977,31 @@ msgid "Filter:" msgstr "Filtro:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Equipar" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "Usar" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Dividir" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "Roupas" @@ -1005,17 +1010,17 @@ msgid "Weight:" msgstr "Peso:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1153,7 +1158,7 @@ msgstr "%s %d?" msgid "jacko spawning" msgstr "Aparição do JackO" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "Você saiu da Guilda." @@ -1255,7 +1260,7 @@ msgstr "Enviar" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "Limpar" @@ -1293,321 +1298,331 @@ msgstr "Desequipar antes" msgid "Away outfit" msgstr "Roupas de ocupado" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Negócios" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Mensagem Privada:" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Cura" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "Ser amigo" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "Ser inimigo" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "Lista Negra" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Apagar" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Não ignorar" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Imitar" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "Convidar para grupo" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Expulsar do grupo" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Expulsar da guilda" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "Mudar pos na Guilda" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "Convidar pra Guilda" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Chutar Jogador" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "Nu" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Mostrar itens:" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Despir" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "Add comentário" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "vender (?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Chutar" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "Remover da lista de ataque" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "Adicionar na prioridade da lista de ataques" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "Adicionar a lista de ataques" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Adicionar a lista de ignorados" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Adicionar nome ao chat" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Nome no chat" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Mapa Item" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Remover" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "Urdidura" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Carregar velhas roupas" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Feitiços" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Carregar velhos feitiços" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Editar feitiços" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Desabilitar destaque" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Habilitar destaque" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "Não retire o nome" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Remover o nome" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "Habilitar modo indisponÃvel" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "Desabilitar modo indisponÃvel" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Sair" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 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:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "Zerar barra amarela" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copiar para chat" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Mover para cima" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Mover para baixo" @@ -1862,6 +1877,10 @@ msgstr "Outro" msgid "Highlight words (separated by comma)" msgstr "Palavras destacadas (separadas em vÃrgulas)" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "Ver Mensagens MVP" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "A cor vai ficar assim" @@ -2261,23 +2280,27 @@ msgstr "Ignorado" msgid "Erased" msgstr "Apagado" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "Na Lista Negra " + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Permitir negociações" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Permitir mensagens particulares" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Antigo" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "Relações" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Quando ignorar:" @@ -2538,7 +2561,7 @@ msgstr "Mostrar links em anúncio" msgid "Auction" msgstr "Leilão" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Proposta de negociação" @@ -2837,182 +2860,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "(a) Alcance ataque de arqueiro" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) Ataque" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) Visualizador de mapa" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) MÃmica padrão" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) MÃmica de roupas" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) MÃmica" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) Ausente" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) Ausente" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "(D) Modo de jogo câmera design" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo desativados" @@ -3064,18 +3091,18 @@ msgstr "NÃvel: %d (GM %d)" msgid "Correction points: %d" msgstr "Pontos de correção: %d" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(l)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3083,20 +3110,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3112,7 +3139,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3124,70 +3151,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3504,7 +3531,7 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" @@ -3512,15 +3539,15 @@ msgstr "Quem está online - Atualizando" msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -4224,164 +4251,164 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "Você foi morto por " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 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:1465 +#: src/localplayer.cpp:1466 #, 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:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Seguindo cancelado" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "Você vê " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [opções] [mana-file]" +msgid "manaplus [options] [manaplus-file]" +msgstr "Manaplus [opções] [manaplus-arquivo]" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[mana-file] : O arquivo mana está em um XML (.mana)" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr " usado para definir parâmetros" +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 -msgid " to the manaplus client." -msgstr " para o cliente manaplus." +msgid " used to set custom parameters" +msgstr "Usado para parâmetros customizados" -#: src/main.cpp:52 +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr "Para o cliente Manaplus." + +#: src/main.cpp:53 msgid "Options:" msgstr "Opções:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : Usar arquivo de log" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : Diretório para log de chat " -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Exibe a versão" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " -h --help : Exibe esta ajuda" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : Diretório de configuração a ser usado" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Efetua login com este usuário" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password :Efetua login com esta senha" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --character :Efetua login com este personagem" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr " -s --server : Nome ou IP do servidor de login" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Porta do servidor de login" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr " --update-host : Usa este host de update" -#: src/main.cpp:64 +#: src/main.cpp:65 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:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : Não faz downloads de atualização" -#: src/main.cpp:67 +#: src/main.cpp:68 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:69 +#: src/main.cpp:70 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:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr " --safemode : Inicia o jogo em modo seguro" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Desabilita OpenGL nesta sessão" @@ -4437,7 +4464,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:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Nome errado." @@ -4482,11 +4509,11 @@ msgstr "Mensagem privada não pode ser enviada, %s está offline." msgid "Whisper could not be sent, ignored by %s." msgstr "Mensagem privada não pode ser enviada, ignorado por %s." -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "Jogador VIP." -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "Jogador VIP: " @@ -4519,81 +4546,81 @@ msgstr "Falha ao checar Emperium" msgid "Unknown server response." msgstr "Resposta do servidor desconhecida." -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "Nome Guilda: %s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "Mestre da guilda: %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "NÃvel Guilda: %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "Membros Online: %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "Max Membros: %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "NÃvel médio: %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "Guilda exp: %d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "Guilda prox. exp: %d" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "Castelo Guilda : %s" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "Não foi possÃvel convidar jogador para a guilda." -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "O jogador rejeitou o convite." -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "Usuário agora é um membro da sua guilda." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "Sua guilda está cheia." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "Resposta desconhecida de convite para guilda." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%s saiu de sua Guilda." -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "Você foi expulso da Guilda." -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%s foi expulso da Guilda." @@ -4709,11 +4736,11 @@ msgstr "Não é possÃvel compartilhar experiência." msgid "Experience sharing unknown." msgstr "Compartilhamento de experiência desconhecido." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Falha ao usar item." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "ImpossÃvel equipar." @@ -4729,41 +4756,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:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "ID não registrado." -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Senha incorreta." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "A conta expirou." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "Rejeitado pelo servidor." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 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:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Cliente muito antigo." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4772,15 +4799,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:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Servidor lotado." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Este nome de usuário já está em uso." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Usuário apagado permanentemente. " @@ -4822,45 +4849,45 @@ msgstr "%s não pode se juntar ao grupo cheio." msgid "QQQ Unknown invite response for %s." msgstr "QQQ resposta de convite desconhecida por %s." -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "Você saiu do grupo." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s saiu do seu grupo." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "Um membro desconhecido tentou dizer: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Você está morto." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." msgstr "Lamentamos informar que seu personagem foi morto em combate." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Você não me parece assim tão vivo." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "As mãos frias da morte estão levando sua alma." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Fim de jogo!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "Insira uma moeda para continuar." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4868,79 +4895,79 @@ msgstr "" "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para " "um lugar melhor." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "" "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Eu acho que as coisas não correram tão bem." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Você quer uma identificação de suas posses?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "Infelizmente, seus traços nunca foram encontrados..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Aniquilado." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Parece que te ofereceram sua própria cabeça." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "Você estragou tudo de novo, jogue fora seu corpo e arranje outro." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "Você não morreu ainda. Está apenas descansando." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Você não é mais." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Você deixou de ser." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Você expirou e foi encontrar seu criador." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Você é um cadáver." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Sem vida, você descansa em paz." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "Se não fosse tão animado, estaria comendo grama pela raiz." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "Seus processos metabólicos agora são história." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "Você bateu as botas." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "Você chutou o balde." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -4948,186 +4975,186 @@ msgstr "" "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito " "coro invisÃvel." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "Você é um ex-jogador" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "Você foi desta para melhor." -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Mensagem" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Você está carregando mais que a metade de seu peso. Você não poderá mais " "recuperar HP." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Você está carregando menos ou metade de seu peso. Você pode recuperar-se " "novamente." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "Você pegou %s." -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "Você gastou %s" -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "ImpossÃvel aumentar o atributo!" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "Equipe as flechas primeiro." -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "Falha na negociação!" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "Falha no emoticon!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "Falha ao sentar!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "Falha ao criar Chat!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "Impossivel entrar no grupo!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "Impossivel gritar!" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "Você ainda não tem o nivel necessário!" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "HP insuficiente!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "SP insuficiente!" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "Você não tem nenhuma nota armazenada!" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Você não pode fazer isso agora!" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Parece que você precisa de mais dinheiro... ;-)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Você não pode usar essa habilidade com esse tipo de arma!" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "Você precisa de outra gema vermelha!" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "Você precisa de outra jóia azul!" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "Você está com muita carga para fazer isso!" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "Hã? O que é isso?" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "Falha ao transportar..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "Não foi possÃvel roubar nada..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "Veneno não surtiu efeito..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 quer negociar com você, você aceita?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Negociação impossÃvel. O parceiro de negócios está muito longe." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "Negociação impossÃvel. O personagem não existe." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "Negociação cancelada devido a uma razão desconhecida." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "Negociação: Você e %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "Negociação com %s cancelada." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "Troca injusta pacote cancelado." -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "Falha ao adicionar item. Você não pode trocar este item." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "Erro ao adicionar item devido a um motivo desconhecido." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Negociação cancelada." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Negociação realizada." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Força" @@ -5136,7 +5163,7 @@ msgstr "Força" msgid "Strength %+.1f" msgstr "Força %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Agilidade" @@ -5145,7 +5172,7 @@ msgstr "Agilidade" msgid "Agility %+.1f" msgstr "Agilidade %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Destreza" @@ -5154,7 +5181,7 @@ msgstr "Destreza" msgid "Dexterity %+.1f" msgstr "Destreza %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Vitalidade" @@ -5163,7 +5190,7 @@ msgstr "Vitalidade" msgid "Vitality %+.1f" msgstr "Vitalidade %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Inteligência" @@ -5473,74 +5500,74 @@ msgstr "Falha de autenticação." msgid "No servers available." msgstr "Servidores indisponÃveis." -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Outra pessoa está tentando utilizar esta conta." -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Existe alguém conectado a esta conta." -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Hack de velocidade detectado." -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Login duplicado." -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "Erro de conexão desconhecido." -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Você foi desconectado do servidor!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Sorte" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Defesa" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "Atq. Mágico" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "Def. Mágica" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% Exatidão" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% Evasão" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% CrÃticos" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "Atraso de ataque" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "Atraso de movimento" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "Atraso de alcance" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "Dano por seg." @@ -5548,11 +5575,11 @@ msgstr "Dano por seg." msgid "Empty address given to Network::connect()!" msgstr "Endereço vazio enviado para Network::connect()!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "Não foi possÃvel determinar o host \"" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Conexão com o servidor interrompida. " @@ -5561,19 +5588,19 @@ msgstr "Conexão com o servidor interrompida. " msgid "%s is not in your party!" msgstr "%s não está em seu grupo!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Bolha Flutuante" @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:47+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:13+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/" "ru/)\n" @@ -23,25 +23,25 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "Видимые на карте" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "уворот" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" msgstr "промах" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "О" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "Б" @@ -143,15 +143,15 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸ Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»Ðµ msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Ошибка: %s не ÑущеÑтвует, и не может быть Ñоздан! Выход." -#: src/commandhandler.cpp:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°." -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ пуÑтые ÑообщениÑ!" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,97 +160,101 @@ msgstr "" "Ðевозможно Ñоздать вкладку Ð´Ð»Ñ Ð»Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ¾Ð¼ \"%s\"! Или вкладка " "уже Ñоздана, или Ñтот игрок Ð’Ñ‹ Ñами." -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° приÑоединение к каналу %s." -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ðе указано название группы" -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "Ðе задано Ð¸Ð¼Ñ Ð³Ð¸Ð»ÑŒÐ´Ð¸Ð¸." -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "ПожалуйÑта, укажите имÑ" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "Enter переключает Ð’Ð°Ñ Ð½Ð° окно чата." -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "Сообщение закрывает чат." -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "Теперь Return переключает чат." -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "Теперь Ñообщение закрывает чат." -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "друг" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "пренебрегаемый" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "нейтральный" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "Игрок уже %s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "Игрок удачно %s!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" msgstr "Игрок не может быть %s!" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "Игрок не был игнорируемым!" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "Игрок больше не игнорируетÑÑ!" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "Игрок не может быть удален из ÑпиÑка игнорированиÑ!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "добавлен в черный ÑпиÑок" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "Игрок и так уже удален!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" msgstr "Игрок удален!" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" msgstr "Игрок не может быть удален!" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "Ð’Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ клиента: %s" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -258,7 +262,7 @@ msgstr[0] "%d неделÑ" msgstr[1] "%d недели" msgstr[2] "%d недель" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" @@ -266,7 +270,7 @@ msgstr[0] "%d день" msgstr[1] "%d днÑ" msgstr[2] "%d дней" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -274,7 +278,7 @@ msgstr[0] "%d чаÑ" msgstr[1] "%d чаÑа" msgstr[2] "%d чаÑов" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -282,7 +286,7 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -290,27 +294,27 @@ msgstr[0] "%d Ñекунда" msgstr[1] "%d Ñекунды" msgstr[2] "%d Ñекунд" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" msgstr "размер кеша шрифта" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "Размер кеша:" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "Создано:" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "Удалено:" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "Изображений:" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "Удаленных изображений:" @@ -321,11 +325,11 @@ msgstr "" "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или " "\"0\"." -#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Общие" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "Отладка" @@ -341,23 +345,23 @@ msgstr "Ошибка при Ñохранении Ñнимка Ñкрана!" msgid "The connection to the server was lost." msgstr "Соединение Ñ Ñервером потерÑно." -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "Ошибка Ñети" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "Игнорировать Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾ торговле" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "Принимать Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾ торговле" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "Ðе удалоÑÑŒ загрузить карту" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ %s" @@ -391,19 +395,19 @@ msgid "Name" msgstr "ИмÑ" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Ðтака" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Разговор" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "Движение" @@ -416,8 +420,8 @@ msgid "Reset" msgstr "СброÑить" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "Купить" @@ -435,7 +439,7 @@ msgstr "КоличеÑтво:" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -443,7 +447,7 @@ msgstr "+" #. You may change this symbol if your language uses another. #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 -#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -456,7 +460,7 @@ msgstr "Выход" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "МакÑ" @@ -465,8 +469,8 @@ msgstr "МакÑ" msgid "Shop" msgstr "Магазин" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -475,15 +479,15 @@ msgstr "Продать" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -654,7 +658,7 @@ msgid "Enter password:" msgstr "Введите пароль:" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Удалить" @@ -730,7 +734,7 @@ msgstr "радуга 3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -741,12 +745,12 @@ msgstr "???" msgid "Chat" msgstr "Чат" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "ПриÑутÑтвуют: %s; Ð’Ñего %d игроков." -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "Ð’Ñ‹ прошептали %s: %s" @@ -760,9 +764,10 @@ msgid "No" msgstr "Ðет" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "Игнорировать" @@ -908,7 +913,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Закрыть" @@ -935,8 +940,8 @@ msgstr "СнарÑжение" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "СнÑÑ‚ÑŒ" @@ -978,31 +983,31 @@ msgid "Filter:" msgstr "Фильтр:" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "Ðадеть" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "ИÑпользовать" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "БроÑить" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "Разделить" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" msgstr "ÐарÑды" @@ -1011,17 +1016,17 @@ msgid "Weight:" msgstr "ВеÑ:" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "Сохранить" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "Получить" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "БроÑить" @@ -1161,7 +1166,7 @@ msgstr "%s %d?" msgid "jacko spawning" msgstr "jacko поÑвлÑетÑÑ" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "Ð’Ñ‹ покинули гильдию." @@ -1263,7 +1268,7 @@ msgstr "Применить" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "ОчиÑтить" @@ -1301,321 +1306,331 @@ msgstr "Сначала ÑнÑÑ‚ÑŒ" msgid "Away outfit" msgstr "нарÑд отÑутÑтвиÑ" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Торговать" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "Приват" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "Лечить" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "ПодружитьÑÑ" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "Пренебречь" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "Черный ÑпиÑок" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "Стереть" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "Ðе игнорировать" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "@@ignore|ПолноÑтью игнорировать@@" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "Следовать" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "Имитировать" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "ПриглаÑить в группу" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "Выкинуть из группы" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "Выкинуть из гильдии" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "Сменить позицию в гильдии" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "ПриглаÑить в гильдию" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "Кикнуть игрока" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "Уничтожить" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "Показать предметы" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "Раздеть" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "Добавить коментарий" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "Купить (?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "Продать (?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "Кикнуть" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "Удалить из ÑпиÑка атаки" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "Добавить в приоритетный ÑпиÑок" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "Добавить в ÑпиÑок атаки" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "Добавить в ÑпиÑок игнорированиÑ" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "Добавить Ð¸Ð¼Ñ Ð² чат" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "ПоднÑÑ‚ÑŒ" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "Добавить в чат" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "Ðлмент карты" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "Переименовать" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "Удалить" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "Прыгнуть" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "Загрузить Ñтарые нарÑды" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "ЗаклинаниÑ" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "Загрузить Ñтарые заклинаниÑ" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "Изменить заклинание" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "Отключить уведомление" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "Включить уведомление" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "Ðе Ñкрывать имÑ" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" msgstr "Скрывать имÑ" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "Рарешить режим отошел" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "Запретить режим отошел" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Покинуть" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "Сменить позицию в гильдии" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "Переименовать знак на карте" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "ИмÑ: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "Комментарий " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "Комментарий: " -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "Добавить к Ñделке" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "Добавить к Ñделке 10" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "Добавить к Ñделке половину" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "Добавить к торговле вÑе" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "Сохранить 10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "Сохранить половину" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "Сохранить вÑе" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "БроÑить вÑе" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "Получить 10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "Получить половину" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "Получить вÑе" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "Загрузить Ñтарые горÑчие клавиши предметов" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "Загрузить Ñтарые данные" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "СпрÑтать" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "Показать" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "ÑброÑить наÑтройки" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Скопировать в чат" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(по умолчанию)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "Передвинуть выше" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "Передвинуть ниже" @@ -1870,6 +1885,10 @@ msgstr "Другое" msgid "Highlight words (separated by comma)" msgstr "ПодÑвечиваемые Ñлова (разделенные запÑтыми)" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "Показывать MVP ÑообщениÑ" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "Вот, как выглÑдит Ñей цвет" @@ -2274,23 +2293,27 @@ msgstr "Игнорировано" msgid "Erased" msgstr "Стерт" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "Ð’ черном ÑпиÑке" + +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "Разрешить торговлю" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "Разрешить шептание" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "Старые" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "СвÑзи" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "Когда игнорируетÑÑ:" @@ -2553,7 +2576,7 @@ msgstr "Показывать ÑÑылки" msgid "Auction" msgstr "Ðукцион" -#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° Торговлю" @@ -2852,182 +2875,186 @@ msgid "(A) moves to target in attack range" msgstr "(A) движение к цели на раÑÑтоÑние атаки" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "(a) атака лучника" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?) неизвеÑтное движение к цели" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "(D) Ñледование по умолчанию" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "(R) отноÑительное Ñледование" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "(M) зеркальное Ñледование" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "(P) Ñледование как животное" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "(?) неизвеÑтное Ñледование" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "(D) Ð¾Ð±Ñ‹Ñ‡Ð½Ð°Ñ Ð°Ñ‚Ð°ÐºÐ°" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "(s) переключение атаки без щита" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "(S) переключение атаки Ñо щитом" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) неизвеÑÑ‚Ð½Ð°Ñ Ð°Ñ‚Ð°ÐºÐ°" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) идти и атаковать" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "(A) идти, атаковать, Ñобирать" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "(d) без автоатаки" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "(S) поднÑтие в облаÑти 1x1" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "(D) поднÑтие из облаÑти 2x1" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "(F) поднÑтие из облаÑти Ñпереди 2x3" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "(3) поднÑтие из облаÑти 3x3" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "(g) движение и поднÑтие на раÑÑтоÑнии 4" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "(g) движение и поднÑтие на раÑÑтоÑнии 8" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "(A) движение и поднÑтие на макÑимальном раÑÑтоÑнии" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?) неизвеÑтный режим поднÑтиÑ" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "(N) обычный режим карты" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "(D) отладочный режим карты" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "(u) Ñпециальный режим карты" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "(U) Ñпециальный режим карты 2" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "(e) режим пуÑтой карты" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "(b) черно-белый режим карты" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "(?) неизвеÑтный режим карты" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "(f) иÑпользовать #flar Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "(c) иÑпользовать #chiza Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "(I) иÑпользовать #ingrav Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "(F) иÑпользовать #frillyar Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "(U) иÑпользовать #upmarmu Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "(?) неизвеÑÑ‚Ð½Ð°Ñ Ð¼Ð°Ð³Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ð°Ñ‚Ð°ÐºÐ°" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "(D) Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ð¿Ð¾ умолчанию" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "(O) Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ð½Ð°Ñ€Ñдов" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "(?) неизвеÑÑ‚Ð½Ð°Ñ Ð¸Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "(O) возле компьютера" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "(A) отошел" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "(?) неизвеÑтный режим отошел" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "(G) Ð¸Ð³Ñ€Ð¾Ð²Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð°" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "(F) ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð°" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "(D) камера в режиме разработки" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "Игровые модификаторы выключены" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "Игровые модификаторы включены" @@ -3079,18 +3106,18 @@ msgstr "Уровень: %d (GM %d)" msgid "Correction points: %d" msgstr "Очков навыков: %d" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3098,20 +3125,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3127,7 +3154,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3139,70 +3166,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3520,7 +3547,7 @@ msgstr "Бордюр домашней позиции" msgid "Road Point" msgstr "Точка дороги" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "Кто онлайн - обновление" @@ -3528,15 +3555,15 @@ msgstr "Кто онлайн - обновление" msgid "Update" msgstr "Обновить" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "Кто онлайн - " -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "Кто онлайн - ошибка" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "Кто онлайн - обновление" @@ -4241,41 +4268,41 @@ msgstr "" "Конфликт клавиш \"%s\" и \"%s\".ИÑправьте их, или игра может ÑÐµÐ±Ñ Ñтранно " "веÑти." -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "Ð’Ñ‹ были убиты " -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "Попытка поднÑÑ‚ÑŒ неÑущеÑтвующий предмет." -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "Предмет Ñлишком Ñ‚Ñжелый." -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "Предмет Ñлишком далеко" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "Инвентарь переполнен." -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "Слишком много предметов." -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "Предмет принадлежит кому-то еще." -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° при поднÑтии предмета." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4283,120 +4310,120 @@ msgstr[0] "Ð’Ñ‹ поднÑли %d [@@%d|%s@@]." msgstr[1] "Ð’Ñ‹ поднÑли %d [@@%d|%s@@]." msgstr[2] "Ð’Ñ‹ поднÑли %d [@@%d|%s@@]." -#: src/localplayer.cpp:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "Отошел" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "Следование: " -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "Следование отменено" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "ИмитациÑ: " -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "Ð˜Ð¼Ð¸Ñ‚Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "Ð’Ñ‹ видите " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [опции] [файлы]" +msgid "manaplus [options] [manaplus-file]" +msgstr "manaplus [параметры] [файл-manaplus]" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[mana-file] : Мана-файл - Ñто XML-файл (.mana)" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr "иÑпользуетÑÑ Ð´Ð»Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñвоих параметров" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" +msgstr "[файл-manaplus] : Файл manaplus Ñто xml файл (.manaplus)" #: src/main.cpp:50 -msgid " to the manaplus client." -msgstr " в клиенте manaplus." +msgid " used to set custom parameters" +msgstr " иÑпользуетÑÑ Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… параметров" -#: src/main.cpp:52 +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr " в клиенте." + +#: src/main.cpp:53 msgid "Options:" msgstr "Опции:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr " -l --log-file : ИÑпользовать указанный файл как лог" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr " -L --chat-log-dir : ИÑпользовать указанный каталог Ð´Ð»Ñ Ð»Ð¾Ð³Ð°" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr " -v --version : Показать верÑию" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr " -h --help : Показать Ñту Ñправку" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr " -C --config-dir : ИÑпользовать указанный каталог конфигурации" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr " -U --username : Войти Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ логином" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr " -P --password : Войти Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ паролем" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr " -c --character : ИÑпользовать указанный перÑонаж" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr " -s --server : Ð˜Ð¼Ñ Ð¸Ð»Ð¸ IP Ñервера авторизации" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr " -p --port : Порт Ñервера авторизации" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr " --update-host : ИÑпользовать Ñтот узел обновлений" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" " -D --default : Выбрать перÑонаж и Ñервер перÑонажей по умолчанию" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr " -u --skip-update : ПропуÑтить обновление" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr " -d --data : Загрузить игровые данные из Ñтого каталога" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr " -L --localdata-dir : Каталог Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… данных" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr " --screenshot-dir : СохранÑÑ‚ÑŒ Ñкриншоты в указанном каталоге" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr " --safemode : ЗапуÑк игры в безопаÑном режиме" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr " --no-opengl : Ðе иÑпользовать OpenGL Ð´Ð»Ñ Ñтой ÑеÑÑии" @@ -4453,7 +4480,7 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° Ñервера перÑонажей. msgid "Failed to create character. Most likely the name is already taken." msgstr "Ðевозможно Ñоздать перÑонажа. Скорее вÑего, таке Ð¸Ð¼Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ." -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "Ðекорректное имÑ." @@ -4498,11 +4525,11 @@ msgstr "Сообщение не может быть отправлено, %s Ð¾Ñ msgid "Whisper could not be sent, ignored by %s." msgstr "Приватное Ñообщение не может быть поÑлано: %s игнорирует его." -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "Игрок MVP." -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "Игрок MVP: " @@ -4535,81 +4562,81 @@ msgstr "ИмперÑÐºÐ°Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° провалена" msgid "Unknown server response." msgstr "ÐеизвеÑтный ответ Ñервера." -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "Ð˜Ð¼Ñ Ð³Ð¸Ð»ÑŒÐ´Ð¸Ð¸: %s" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "МаÑтер гильдии: %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "Уровень гильдии: %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "Пользователей онлайн: %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "МакÑ. членов: %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "Средний уровень: %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "Опыт гильдии: %d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "Ðужно опыта до Ñледующего уровнÑ: %d" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "Замки: %s" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "Ðе удалоÑÑŒ приглаÑить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² гиьдию." -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "Пользователь отклонил приглашение." -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "Пользователь теперь в Вашей гильдии." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "Ваша Ð³Ð¸Ð»ÑŒÐ´Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð°." -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "ÐеизвеÑтный ответ на приглашение в гильдию." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%s покинул Вашу гильдию." -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "Ð’Ñ‹ были кикнуты из гильдии." -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%s был вышвырнут из Вашей гильдии." @@ -4723,11 +4750,11 @@ msgstr "Обмен опытом невозможен." msgid "Experience sharing unknown." msgstr "Политика раÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ‹Ñ‚Ð° неизвеÑтна." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "Ðе удалоÑÑŒ иÑпользовать предмет." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñкипировать!" @@ -4743,39 +4770,39 @@ msgstr "Старый пароль указан неверно." msgid "New password too short." msgstr "Ðовый пароль Ñлишком короткий." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "ÐезарегиÑтрированный ID" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "Ðеверный пароль" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ проÑрочена." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "Получен отказ от Ñервера.." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "Ð’Ð°Ñ Ð½Ð°Ð²Ñегда забанили. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ ГМ-ов." -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "Клиент уÑтарел" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4783,15 +4810,15 @@ msgid "" msgstr "" "Ð’Ð°Ñ Ð·Ð°Ð±Ð°Ð½Ð¸Ð»Ð¸ до %s. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ ГМ-ов через форум." -#: src/net/ea/loginhandler.cpp:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "Сервер переполнен" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "Ðто Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ занÑто." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "Пользователь удален" @@ -4833,45 +4860,45 @@ msgstr "%s не может приÑоединитьÑÑ Ðº Вашей групп msgid "QQQ Unknown invite response for %s." msgstr "QQQ ÐеизвеÑтный ответ на приглашение Ð´Ð»Ñ %s" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "Ð’Ñ‹ покинули группу." -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%s покинул Вашу группу." -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "ÐеизвеÑтный учаÑтник попыталÑÑ Ñказать: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "Ð’Ñ‹ мертвы." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "С груÑтью Ñообщаем вам, что Ваш перÑонаж пал в бою." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Ð’Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ нет Ñреди живых." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "Холодные руки Смерти извлекают Вашу душу." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Игра Окончена!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "ОпуÑтите монетку Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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." @@ -4879,78 +4906,78 @@ msgstr "" "Ðет, детки. Ваш перÑонаж на Ñамом деле не умер. Он...Ñммм...ушел в лучший " "мир." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "Ваш план Ñломать оружие врагов о Ñвое горло провалилÑÑ." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Похоже, Ñто было не Ñлишком хорошо." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "Хочешь, предÑкажу твою Ñудьбу?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "ГруÑтно, Ð’Ð°Ñ Ð²Ñ€Ñд ли когда-нибудь найдут..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Уничтожен." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Похоже, Вам отдали Вашу голову." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "Ð’Ñ‹ опÑÑ‚ÑŒ пролетели, выброÑите Ñвоё тело в трубу, и получите другое." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "Ð’Ñ‹ не мертвы. Ð’Ñ‹ проÑто отдыхаете." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "Ð’Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ нет." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "Ð’Ñ‹ переÑтали быть." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "Ваше Ð²Ñ€ÐµÐ¼Ñ Ð¸Ñтекло, пора вÑтретитьÑÑ Ñ Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÐµÐ»ÐµÐ¼." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "Ð’Ñ‹ ÑдулиÑÑŒ." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "Лишенный жизни, покойÑÑ Ñ Ð¼Ð¸Ñ€Ð¾Ð¼." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "ЕÑли бы Ð’Ñ‹ не были нариÑованными, Ð’Ñ‹ бы отправлиÑÑŒ на тот Ñвет" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "Ваш обмен вещеÑтв Ñтал иÑторией." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "Ð’Ñ‹ упали Ñ Ð²ÐµÑ‚ÐºÐ¸." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "Ð’Ñ‹ протÑнули ноги." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." @@ -4958,186 +4985,186 @@ msgstr "" "Ð’Ñ‹ затаÑкали Ñвою Ñмертную оболочку, Ñорвали Ð·Ð°Ð½Ð°Ð²ÐµÑ Ð¸ незримо " "приÑоединилиÑÑŒ к кровоточащему хору..." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "Ð’Ñ‹ не жилец." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "Ð’Ð°Ñ Ð¿Ñ€Ð¸ÑˆÐ¿Ð¸Ð»Ð¸Ð²Ð°ÑŽÑ‚ к фьордам." -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "Сообщение" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "" "Ð’Ñ‹ неÑете груз больший, чем половина вашей грузоподъемноÑти. Здоровье " "воÑÑтанавливатьÑÑ Ð½Ðµ будет." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" "Ð’ÐµÑ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð¾Ð² ÑоÑтавлÑет менее половины допуÑтимого. Теперь Ð’Ñ‹ можете " "воÑÑтанавливатьÑÑ." -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "Ð’Ñ‹ получили %s." -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "Ð’Ñ‹ потратили %s." -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "Ðе удалоÑÑŒ увеличить навык!" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "Ð”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° ÑкипируйтеÑÑŒ Ñтрелами!" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "Ðе удалоÑÑŒ начать торговлю!" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "Ðе удалоÑÑŒ иÑпользовать Ñмайлик!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "Ðе удалоÑÑŒ приÑеÑÑ‚ÑŒ!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "Ðе удалоÑÑŒ Ñоздать чат!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¸ÑоединитьÑÑ Ðº группе!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÐºÑ€Ð¸Ñ‡Ð°Ñ‚ÑŒ!" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "У Ð’Ð°Ñ Ð½ÐµÐ´Ð¾Ñтаточный уровень!" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "ÐедоÑтаточно ОЖ!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "ÐедоÑтаточно Маны" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "У Ð’Ð°Ñ Ð½ÐµÑ‚ запиÑей!" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "Ð’Ñ‹ не можете Ñделать Ñто ÑейчаÑ!" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "Похоже, Вам нужно боьше денег... ;-)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñто умение Ñ Ñтим видом оружиÑ!" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "Вам нужен другой краÑный камень!" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "Вам нужен другой Ñиний камень!" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "Ð’Ñ‹ неÑёте Ñлишком много, чтобы Ñделать Ñто!" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "Ð? Что Ñто?" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "Изменение не удалоÑÑŒ..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "Ðе удалоÑÑŒ ничего украÑÑ‚ÑŒ..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "Яд не подейÑтвовал..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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 хочет торговать Ñ Ð’Ð°Ð¼Ð¸, Ð’Ñ‹ принимаете предложение?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°. Партнер по торговле Ñлишком далеко." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°. Такой перÑонаж не ÑущеÑтвует." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð° по неизвеÑтной причине." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "ТорговлÑ: Ð’Ñ‹ и %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ñ %s отменена." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "ÐеизвеÑтный Ñигнал Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñ‚Ð¾Ñ€Ð³Ð¾Ð²Ð»Ð¸." -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "Ðе удалоÑÑŒ добавить предмет. Партнер по торговле перегружен." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "Ðе удалоÑÑŒ добавить предмет. У партнера по торговле кончилоÑÑŒ меÑто." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "Ошибка Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€ÐµÐ´Ð¼ÐµÑ‚Ð°. Ð’Ñ‹ не можете торговать Ñтим предметом." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "Ðе удалоÑÑŒ добавить предмет по неизвеÑтной причине." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Ð¢Ð¾Ñ€Ð³Ð¾Ð²Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Сила (str)" @@ -5146,7 +5173,7 @@ msgstr "Сила (str)" msgid "Strength %+.1f" msgstr "Сила (str) %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "ВыноÑливоÑÑ‚ÑŒ (agi)" @@ -5155,7 +5182,7 @@ msgstr "ВыноÑливоÑÑ‚ÑŒ (agi)" msgid "Agility %+.1f" msgstr "ВыноÑливоÑÑ‚ÑŒ (agi) %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "ЛовкоÑÑ‚ÑŒ (dex)" @@ -5164,7 +5191,7 @@ msgstr "ЛовкоÑÑ‚ÑŒ (dex)" msgid "Dexterity %+.1f" msgstr "ЛовкоÑÑ‚ÑŒ (dex) %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "ЖивучеÑÑ‚ÑŒ (vit)" @@ -5173,7 +5200,7 @@ msgstr "ЖивучеÑÑ‚ÑŒ (vit)" msgid "Vitality %+.1f" msgstr "ЖивучеÑÑ‚ÑŒ (vit) %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Интеллект (int)" @@ -5487,74 +5514,74 @@ msgstr "Ошибка авторизации." msgid "No servers available." msgstr "Ðет доÑтупных Ñерверов." -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "Кто-то еще пытаетÑÑ Ð²Ð¾ÑпользоватьÑÑ Ð´Ð°Ð½Ð½Ñ‹Ð¼ аккаунтом." -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "Ðтот аккаунт уже в Ñети." -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "Обнаружен взлом ÑкороÑти." -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "Ð”Ð²Ð¾Ð¹Ð½Ð°Ñ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ° подключениÑ." -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° подключениÑ." -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Отключено от Ñервера!" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Удача (luk)" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" msgstr "Защита" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "Маг. Ðтака" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "Маг.Защита" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "% ТочноÑти" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "% УклонениÑ" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "% КритичеÑкий удар" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "Задержка атаки" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "Задержка движениÑ" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "Зона атаки" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." msgstr "Урон в Ñек." @@ -5562,11 +5589,11 @@ msgstr "Урон в Ñек." msgid "Empty address given to Network::connect()!" msgstr "ПуÑтой Ð°Ð´Ñ€ÐµÑ Ð±Ñ‹Ð» передан методу Network::connect()!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "Ðе удалоÑÑŒ найти хоÑÑ‚ \"" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "Подключение к Ñерверу прервано." @@ -5575,19 +5602,19 @@ msgstr "Подключение к Ñерверу прервано." msgid "%s is not in your party!" msgstr "%s не в группе!" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "Печатать '...'" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "Мигать именем" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "Плавающий '...' пузырек" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "Плавающий пузырек" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2c7dcc85f..135d763bb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,12 +5,13 @@ # Translators: # Andrei Karas <akaras@inbox.ru>, 2011. # <colorfullife81@gmail.com>, 2011. +# 昕 邹 <sin2624+transifex@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-01 01:22+0300\n" -"PO-Revision-Date: 2011-09-30 14:45+0000\n" +"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"PO-Revision-Date: 2011-10-14 21:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/" "team/zh_CN/)\n" @@ -20,35 +21,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1133 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" msgstr "在地图上å¯è§" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "dodge" msgstr "躲闪" -#: src/being.cpp:547 +#: src/being.cpp:548 msgid "miss" -msgstr "å°å§" +msgstr "æ— æ³•å‡ºå”®æ— æ³•å‡ºå”®çš„ç‰©å“。" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1526 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1531 +#: src/being.cpp:1532 msgid "I" msgstr "I" #: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" -msgstr "设置" +msgstr "é”法攻击" #: src/client.cpp:842 src/gui/setup_perfomance.cpp:48 msgid "Perfomance" -msgstr "Perfomance" +msgstr "性能" #: src/client.cpp:847 src/gui/setup_video.cpp:315 msgid "Video" @@ -56,23 +57,23 @@ msgstr "视频" #: src/client.cpp:852 msgid "Themes" -msgstr "" +msgstr "主题" #: src/client.cpp:934 msgid "Connecting to server" -msgstr "连接到æœåŠ¡å™¨" +msgstr "é”法防御" #: src/client.cpp:965 msgid "Logging in" -msgstr "登录" +msgstr "å°è¯•æ¡èµ·ä¸å˜åœ¨çš„物å“。" #: src/client.cpp:998 msgid "Entering game world" -msgstr "进入游æˆä¸–ç•Œ" +msgstr "æ¡èµ·ç‰©å“å‘生ä¸å˜åœ¨çš„物å“。" #: src/client.cpp:1098 msgid "Requesting characters" -msgstr "请求å—符" +msgstr "请求角色" #: src/client.cpp:1129 msgid "Connecting to the game server" @@ -94,7 +95,7 @@ msgstr "错误" #: src/client.cpp:1198 msgid "Requesting registration details" -msgstr "申请登记的详细信æ¯" +msgstr "请求注册的详细信æ¯" #: src/client.cpp:1224 msgid "Password Change" @@ -102,15 +103,15 @@ msgstr "密ç 更改" #: src/client.cpp:1225 msgid "Password changed successfully!" -msgstr "密ç æˆåŠŸï¼" +msgstr "更改密ç æˆåŠŸï¼" #: src/client.cpp:1244 msgid "Email Change" -msgstr "电å邮件å˜æ›´" +msgstr "更改电å邮件" #: src/client.cpp:1245 msgid "Email changed successfully!" -msgstr "电å邮件已å˜æ›´æˆåŠŸï¼" +msgstr "更改电å邮件æˆåŠŸï¼" #: src/client.cpp:1265 msgid "Unregister Successful" @@ -118,18 +119,18 @@ msgstr "注销æˆåŠŸ" #: src/client.cpp:1266 msgid "Farewell, come back any time..." -msgstr "永别了，任何时候回æ¥... ..." +msgstr "å†è§ï¼Œéšæ—¶æ¬¢è¿Žå›žæ¥... ..." #: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510 #: src/client.cpp:1935 src/client.cpp:1942 #, c-format msgid "%s doesn't exist and can't be created! Exiting." -msgstr "" +msgstr "%s ä¸å˜åœ¨ï¼Œå¹¶ä¸”æ— æ³•åˆ›å»ºï¼é€€å‡ºã€‚" #: src/client.cpp:1641 #, c-format msgid "Invalid update host: %s" -msgstr "" +msgstr "æ— æ•ˆçš„æ›´æ–°ä¸»æœº: %s" #: src/client.cpp:1675 src/client.cpp:1681 msgid "Error creating updates directory!" @@ -138,164 +139,168 @@ msgstr "创建更新目录错误ï¼" #: src/client.cpp:1702 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." -msgstr "" +msgstr "错误：%s ä¸å˜åœ¨å¹¶ä¸”æ— æ³•åˆ›å»ºï¼é€€å‡ºã€‚" -#: src/commandhandler.cpp:196 +#: src/commandhandler.cpp:198 msgid "Unknown command." msgstr "未知命令。" -#: src/commandhandler.cpp:295 +#: src/commandhandler.cpp:297 msgid "Cannot send empty whispers!" msgstr "æ— æ³•å‘é€ç©ºç™½å¯†è¯ï¼" -#: src/commandhandler.cpp:309 +#: src/commandhandler.cpp:311 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "æ— æ³•åŒ \"%s\" 建立一个ç§äººè°ˆè¯æ ‡ç¾é¡µï¼æˆ–者已ç»å˜åœ¨ï¼Œæˆ–者那就是自己。" -#: src/commandhandler.cpp:329 +#: src/commandhandler.cpp:331 #, c-format msgid "Requesting to join channel %s." msgstr "è¯·æ±‚åŠ å…¥é¢‘é“%s。" -#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "帮会å称缺失。" -#: src/commandhandler.cpp:356 +#: src/commandhandler.cpp:358 msgid "Guild name is missing." msgstr "公会å称是缺少的。" -#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 -#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 +#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 +#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 msgid "Please specify a name." msgstr "请指定一个å称。" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:415 +#: src/commandhandler.cpp:417 msgid "Message closes chat." msgstr "讯æ¯å…³é—èŠå¤©ã€‚" -#: src/commandhandler.cpp:426 +#: src/commandhandler.cpp:428 msgid "Return now toggles chat." msgstr "<回车>键现在切æ¢èŠå¤©ã€‚" -#: src/commandhandler.cpp:432 +#: src/commandhandler.cpp:434 msgid "Message now closes chat." msgstr "讯æ¯çŽ°åœ¨å…³é—èŠå¤©ã€‚" -#: src/commandhandler.cpp:460 +#: src/commandhandler.cpp:462 msgid "friend" msgstr "朋å‹" -#: src/commandhandler.cpp:465 +#: src/commandhandler.cpp:467 msgid "disregarded" msgstr "æ— è§†" -#: src/commandhandler.cpp:470 +#: src/commandhandler.cpp:472 msgid "neutral" msgstr "ä¸æ€§" -#: src/commandhandler.cpp:489 +#: src/commandhandler.cpp:491 #, c-format msgid "Player already %s!" msgstr "玩家已ç»%s!" -#: src/commandhandler.cpp:503 +#: src/commandhandler.cpp:505 #, c-format msgid "Player successfully %s!" msgstr "玩家æˆåŠŸ%s!" -#: src/commandhandler.cpp:511 +#: src/commandhandler.cpp:513 #, c-format msgid "Player could not be %s!" -msgstr "" +msgstr "玩家ä¸èƒ½ä¸º %s" -#: src/commandhandler.cpp:533 +#: src/commandhandler.cpp:536 msgid "Player wasn't ignored!" msgstr "是ä¸èƒ½å¿½è§†çš„ï¼" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:543 msgid "Player no longer ignored!" msgstr "玩家ä¸å†è¢«å¿½ç•¥ï¼" -#: src/commandhandler.cpp:542 +#: src/commandhandler.cpp:545 msgid "Player could not be unignored!" msgstr "玩家ä¸èƒ½è¢«å¿½ç•¥!" -#: src/commandhandler.cpp:559 +#: src/commandhandler.cpp:551 +msgid "blacklisted" +msgstr "" + +#: src/commandhandler.cpp:566 msgid "Player already erased!" msgstr "玩家已ç»è¢«åˆ 除!" -#: src/commandhandler.cpp:570 +#: src/commandhandler.cpp:577 msgid "Player successfully erased!" -msgstr "" +msgstr "玩家æˆåŠŸåˆ 除ï¼" -#: src/commandhandler.cpp:572 +#: src/commandhandler.cpp:579 msgid "Player could not be erased!" -msgstr "" +msgstr "çŽ©å®¶æ— æ³•åˆ é™¤ï¼" -#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 +#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:882 +#: src/commandhandler.cpp:889 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:891 +#: src/commandhandler.cpp:898 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:899 +#: src/commandhandler.cpp:906 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:907 +#: src/commandhandler.cpp:914 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:915 +#: src/commandhandler.cpp:922 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:994 +#: src/commandhandler.cpp:1001 msgid "font cache size" -msgstr "" +msgstr "å—体缓å˜å¤§å°" -#: src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:1013 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1010 +#: src/commandhandler.cpp:1017 msgid "Created:" msgstr "创建于：" -#: src/commandhandler.cpp:1012 +#: src/commandhandler.cpp:1019 msgid "Deleted:" msgstr "åˆ é™¤ï¼š" -#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 +#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 +#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 msgid "Resource orphaned images:" msgstr "" @@ -304,11 +309,11 @@ 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:409 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "常规" -#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" msgstr "调试 " @@ -324,23 +329,23 @@ msgstr "ä¿å˜å±å¹•å¿«ç…§å¤±è´¥ï¼" msgid "The connection to the server was lost." msgstr "æœåŠ¡å™¨çš„连接丢失。" -#: src/game.cpp:571 +#: src/game.cpp:572 msgid "Network Error" msgstr "网络错误" -#: src/game.cpp:1321 +#: src/game.cpp:1323 msgid "Ignoring incoming trade requests" msgstr "忽略新进的交易请求" -#: src/game.cpp:1331 +#: src/game.cpp:1333 msgid "Accepting incoming trade requests" msgstr "接å—ä¼ å…¥çš„äº¤æ˜“è¯·æ±‚" -#: src/game.cpp:1731 +#: src/game.cpp:1733 msgid "Could Not Load Map" msgstr "ä¸èƒ½åŠ 载地图" -#: src/game.cpp:1732 +#: src/game.cpp:1734 #, c-format msgid "Error while loading %s" msgstr "åŠ è½½%s时出现错误" @@ -367,26 +372,26 @@ 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" msgstr "姓å" #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596 -#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:265 +#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "攻击" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "说è¯" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244 -#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419 -#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253 +#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437 +#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756 msgid "Move" msgstr "移动" @@ -399,8 +404,8 @@ msgid "Reset" msgstr "é‡ç½®" #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681 msgid "Buy" msgstr "è´ä¹°" @@ -418,7 +423,7 @@ msgstr "" #. 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:974 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977 msgid "+" msgstr "+" @@ -426,7 +431,7 @@ msgstr "+" #. 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:986 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989 msgid "-" msgstr "-" @@ -439,7 +444,7 @@ msgstr "退出" #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 #: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554 -#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004 +#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007 msgid "Max" msgstr "最大" @@ -448,8 +453,8 @@ msgstr "最大" msgid "Shop" msgstr "商店" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 -#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -458,15 +463,15 @@ msgstr "出售" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324 -#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460 -#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510 -#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541 -#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769 -#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722 -#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823 -#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897 -#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478 +#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559 +#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796 +#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861 +#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007 #: 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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 @@ -637,7 +642,7 @@ msgid "Enter password:" msgstr "输入密ç ：" #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298 -#: src/gui/setup_relations.cpp:242 src/gui/shopwindow.cpp:122 +#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "åˆ é™¤" @@ -713,7 +718,7 @@ msgstr "彩虹3" #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 -#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73 +#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73 #: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 @@ -724,12 +729,12 @@ msgstr "？？？" msgid "Chat" msgstr "èŠå¤©" -#: src/gui/chatwindow.cpp:609 +#: src/gui/chatwindow.cpp:610 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:996 +#: src/gui/chatwindow.cpp:997 #, c-format msgid "Whispering to %s: %s" msgstr "对%s密è¯åˆ°ï¼š%s" @@ -743,9 +748,10 @@ msgid "No" msgstr "å¦" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371 -#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608 -#: src/gui/popupmenu.cpp:614 +#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161 +#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387 +#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 msgid "Ignore" msgstr "忽略" @@ -891,7 +897,7 @@ 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:556 src/gui/shopwindow.cpp:113 +#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "å…³é—" @@ -918,8 +924,8 @@ msgstr "装备" #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 -#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748 -#: src/gui/popupmenu.cpp:1793 +#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786 +#: src/gui/popupmenu.cpp:1831 msgid "Unequip" msgstr "å¸ä¸‹è£…备" @@ -961,50 +967,50 @@ msgid "Filter:" msgstr "过滤器：" #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 -#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1658 -#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696 +#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833 msgid "Equip" msgstr "装备" #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 -#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1662 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754 -#: src/gui/popupmenu.cpp:1799 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700 +#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792 +#: src/gui/popupmenu.cpp:1837 msgid "Use" msgstr "使用" #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 -#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759 -#: src/gui/popupmenu.cpp:1804 +#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797 +#: src/gui/popupmenu.cpp:1842 msgid "Drop..." msgstr "掉è½... ..." -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 -#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714 +#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851 msgid "Split" msgstr "分离" #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:519 +#: src/gui/popupmenu.cpp:537 msgid "Outfits" -msgstr "装具" +msgstr "套装" #: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "é‡é‡ï¼š" #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 -#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771 -#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73 +#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809 +#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 msgid "Store" msgstr "å˜å‚¨" -#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1683 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721 msgid "Retrieve" msgstr "å–回" -#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1672 -#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710 +#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "丢弃" @@ -1035,11 +1041,11 @@ 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." @@ -1140,7 +1146,7 @@ msgstr "%s %d?" msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 msgid "You have left the guild." msgstr "ä½ å·²ç»ç¦»å¼€å·¥ä¼š." @@ -1195,7 +1201,7 @@ msgstr "法力æ " #: src/gui/ministatuswindow.cpp:77 msgid "experience bar" -msgstr "" +msgstr "ç»éªŒæ¡" #: src/gui/ministatuswindow.cpp:83 msgid "job bar" @@ -1242,7 +1248,7 @@ msgstr "æ交" msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576 msgid "Clear" msgstr "清除" @@ -1265,12 +1271,12 @@ msgstr "å‘é€ä¿¡ä»¶å¤±è´¥æˆ–è€…ä¿¡ä»¶æ— æ•ˆã€‚" #: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890 #, c-format msgid "Outfit: %d" -msgstr "" +msgstr "套装： %d" #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 #, c-format msgid "Key: %s" -msgstr "" +msgstr "按键：%s" #: src/gui/outfitwindow.cpp:91 msgid "Unequip first" @@ -1280,321 +1286,331 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "交易" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372 msgid "Whisper" msgstr "密è¯" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618 msgid "Heal" msgstr "愈åˆ" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378 +#: src/gui/popupmenu.cpp:624 msgid "Be friend" msgstr "是朋å‹" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370 -#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394 -#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613 -#: src/gui/popupmenu.cpp:631 +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152 +#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178 +#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412 +#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164 -#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378 -#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389 -#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615 -#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626 +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154 +#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388 +#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634 +msgid "Black list" +msgstr "" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168 +#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382 +#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396 +#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635 +#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:653 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163 -#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382 -#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393 -#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:630 +#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177 +#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400 +#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411 +#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646 +#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632 -#: src/playerrelations.cpp:418 +#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659 +#: src/playerrelations.cpp:421 msgid "Completely ignore" msgstr "完全忽略" -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 +#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746 msgid "Follow" msgstr "按照" -#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 -#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422 +#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 -#: src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:705 msgid "Kick from party" msgstr "踢从党" -#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 -#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 +#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229 +#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722 msgid "Kick from guild" msgstr "踢从公会" -#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 -#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 +#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234 +#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 -#: src/gui/popupmenu.cpp:709 +#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463 +#: src/gui/popupmenu.cpp:736 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:241 +#: src/gui/popupmenu.cpp:250 msgid "Kick player" msgstr "踢çƒå‘˜" -#: src/gui/popupmenu.cpp:243 +#: src/gui/popupmenu.cpp:252 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 -#: src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670 +#: src/gui/popupmenu.cpp:759 msgid "Show Items" msgstr "显示项目" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 -#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 +#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277 -#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645 -#: src/gui/popupmenu.cpp:734 +#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286 +#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672 +#: src/gui/popupmenu.cpp:761 msgid "Add comment" msgstr "å‘表评论" -#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471 +#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766 msgid "Buy (?)" msgstr "è´ä¹°(?)" -#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 -#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 +#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472 +#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767 msgid "Sell (?)" msgstr "出售(?)" -#: src/gui/popupmenu.cpp:288 +#: src/gui/popupmenu.cpp:297 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:299 +#: src/gui/popupmenu.cpp:308 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:304 +#: src/gui/popupmenu.cpp:313 msgid "Add to priority attack list" msgstr "优先攻击列表" -#: src/gui/popupmenu.cpp:306 +#: src/gui/popupmenu.cpp:315 msgid "Add to attack list" msgstr "åŠ å…¥æ”»å‡»æ¸…å•" -#: src/gui/popupmenu.cpp:308 +#: src/gui/popupmenu.cpp:317 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 +#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:482 +#: src/gui/popupmenu.cpp:500 msgid "Pick up" msgstr "拾å–" -#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 -#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 +#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730 +#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855 msgid "Add to chat" msgstr "åŠ å…¥èŠå¤©" -#: src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:518 msgid "Map Item" msgstr "地图项" -#: src/gui/popupmenu.cpp:501 +#: src/gui/popupmenu.cpp:519 msgid "Rename" msgstr "é‡å‘½å" -#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 -#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 +#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965 +#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:507 +#: src/gui/popupmenu.cpp:525 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:520 +#: src/gui/popupmenu.cpp:538 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "法术" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:555 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:538 +#: src/gui/popupmenu.cpp:556 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:562 +#: src/gui/popupmenu.cpp:580 msgid "Disable highlight" msgstr "ç¦ç”¨" -#: src/gui/popupmenu.cpp:564 +#: src/gui/popupmenu.cpp:582 msgid "Enable highlight" msgstr "å¯ç”¨çªå‡º" -#: src/gui/popupmenu.cpp:566 +#: src/gui/popupmenu.cpp:584 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:568 +#: src/gui/popupmenu.cpp:586 msgid "Remove name" -msgstr "" +msgstr "移除姓å" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:588 msgid "Enable away" msgstr "å¯ç”¨è¿œ" -#: src/gui/popupmenu.cpp:572 +#: src/gui/popupmenu.cpp:590 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "留下" -#: src/gui/popupmenu.cpp:753 +#: src/gui/popupmenu.cpp:780 msgid "Change guild position" msgstr "更改公会的立场" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1205 +#: src/gui/popupmenu.cpp:1243 msgid "Rename map sign " msgstr "é‡å‘½åçš„åœ°å›¾æ ‡å¿—" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1207 +#: src/gui/popupmenu.cpp:1245 msgid "Name: " msgstr "å称：" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1257 +#: src/gui/popupmenu.cpp:1295 msgid "Player comment " msgstr "玩家评论" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1259 +#: src/gui/popupmenu.cpp:1297 msgid "Comment: " msgstr "评论：" -#: src/gui/popupmenu.cpp:1630 +#: src/gui/popupmenu.cpp:1668 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1634 +#: src/gui/popupmenu.cpp:1672 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1635 +#: src/gui/popupmenu.cpp:1673 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1636 +#: src/gui/popupmenu.cpp:1674 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1646 +#: src/gui/popupmenu.cpp:1684 msgid "Store 10" msgstr "商店10" -#: src/gui/popupmenu.cpp:1647 +#: src/gui/popupmenu.cpp:1685 msgid "Store half" msgstr "商店的一åŠ" -#: src/gui/popupmenu.cpp:1648 +#: src/gui/popupmenu.cpp:1686 msgid "Store all" msgstr "商店所有" -#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 -#: src/gui/popupmenu.cpp:1805 +#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798 +#: src/gui/popupmenu.cpp:1843 msgid "Drop all" msgstr "所有" -#: src/gui/popupmenu.cpp:1687 +#: src/gui/popupmenu.cpp:1725 msgid "Retrieve 10" msgstr "拿出10" -#: src/gui/popupmenu.cpp:1688 +#: src/gui/popupmenu.cpp:1726 msgid "Retrieve half" msgstr "拿出一åŠ" -#: src/gui/popupmenu.cpp:1689 +#: src/gui/popupmenu.cpp:1727 msgid "Retrieve all" msgstr "检索所有" -#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 +#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1821 +#: src/gui/popupmenu.cpp:1859 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 +#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 msgid "Hide" msgstr "éšè—" -#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 +#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 msgid "Show" msgstr "显示" -#: src/gui/popupmenu.cpp:1894 +#: src/gui/popupmenu.cpp:1932 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(默认)" -#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 +#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973 msgid "Move up" msgstr "x" -#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 +#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975 msgid "Move down" msgstr "" @@ -1689,7 +1705,7 @@ msgstr "准备下载" #: src/gui/serverdialog.cpp:573 msgid "Error retreiving server list!" -msgstr "错误retreivingçš„æœåŠ¡å™¨åˆ—表ï¼" +msgstr "æ¢å¤æœåŠ¡å™¨åˆ—表错误ï¼" #: src/gui/serverdialog.cpp:678 msgid "requires a newer version" @@ -1798,7 +1814,7 @@ msgstr "消æ¯" #: src/gui/setup_chat.cpp:90 msgid "Hide shop messages" -msgstr "éšè—商店的消æ¯" +msgstr "éšè—商店消æ¯" #: src/gui/setup_chat.cpp:94 msgid "Tabs" @@ -1848,6 +1864,10 @@ msgstr "其他" msgid "Highlight words (separated by comma)" msgstr "" +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "" + #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" msgstr "这就是该色彩看起æ¥çš„æ ·å" @@ -2081,7 +2101,7 @@ msgstr "接å—出售/è´ä¹°è¯·æ±‚" #: src/gui/setup_other.cpp:147 msgid "Enable shop mode" -msgstr "å¯ç”¨åº—模å¼" +msgstr "å¯ç”¨å•†åº—模å¼" #: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" @@ -2089,11 +2109,11 @@ 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" @@ -2105,7 +2125,7 @@ msgstr "å¯ç”¨æœåŠ¡å™¨ç«¯çš„攻击" #: src/gui/setup_other.cpp:171 msgid "Enable bot checker" -msgstr "å¯ç”¨BOT检查" +msgstr "å¯ç”¨æŒ‚机检查" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" @@ -2245,25 +2265,29 @@ msgstr "忽略" #: src/gui/setup_relations.cpp:74 msgid "Erased" +msgstr "å·²åˆ é™¤" + +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" msgstr "" -#: src/gui/setup_relations.cpp:238 +#: src/gui/setup_relations.cpp:239 msgid "Allow trading" msgstr "å…许交易" -#: src/gui/setup_relations.cpp:240 +#: src/gui/setup_relations.cpp:241 msgid "Allow whispers" msgstr "å…许密è¯" -#: src/gui/setup_relations.cpp:243 +#: src/gui/setup_relations.cpp:244 msgid "Old" msgstr "æ—§" -#: src/gui/setup_relations.cpp:245 +#: src/gui/setup_relations.cpp:246 msgid "Relations" msgstr "关系" -#: src/gui/setup_relations.cpp:270 +#: src/gui/setup_relations.cpp:271 msgid "When ignoring:" msgstr "当忽略时：" @@ -2317,11 +2341,11 @@ msgstr "帮助å—体" #: src/gui/setup_theme.cpp:150 msgid "Secure font" -msgstr "" +msgstr "安全å—体" #: src/gui/setup_theme.cpp:151 msgid "Japanese font" -msgstr "" +msgstr "日文å—体" #: src/gui/setup_theme.cpp:183 msgid "Font size" @@ -2518,9 +2542,9 @@ 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:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" msgstr "请求交易" @@ -2819,182 +2843,186 @@ msgid "(A) moves to target in attack range" msgstr "" #: src/gui/statuspopup.cpp:289 +msgid "(a) archer attack range" +msgstr "" + +#: src/gui/statuspopup.cpp:294 msgid "(?) move to target" msgstr "(?)ç§»åŠ¨åˆ°ç›®æ ‡" -#: src/gui/statuspopup.cpp:297 +#: src/gui/statuspopup.cpp:302 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:301 +#: src/gui/statuspopup.cpp:306 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:305 +#: src/gui/statuspopup.cpp:310 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:309 +#: src/gui/statuspopup.cpp:314 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:313 +#: src/gui/statuspopup.cpp:318 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 +#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:327 +#: src/gui/statuspopup.cpp:332 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:332 +#: src/gui/statuspopup.cpp:337 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 +#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366 msgid "(?) attack" msgstr "(?) 攻击" -#: src/gui/statuspopup.cpp:349 +#: src/gui/statuspopup.cpp:354 msgid "(G) go and attack" msgstr "(G) 去攻击" -#: src/gui/statuspopup.cpp:353 +#: src/gui/statuspopup.cpp:358 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:357 +#: src/gui/statuspopup.cpp:362 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:375 +#: src/gui/statuspopup.cpp:380 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:379 +#: src/gui/statuspopup.cpp:384 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:383 +#: src/gui/statuspopup.cpp:388 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:387 +#: src/gui/statuspopup.cpp:392 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:391 +#: src/gui/statuspopup.cpp:396 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:395 +#: src/gui/statuspopup.cpp:400 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:399 +#: src/gui/statuspopup.cpp:404 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:403 +#: src/gui/statuspopup.cpp:408 msgid "(?) pick up" msgstr "(?)æ‹¿èµ·" -#: src/gui/statuspopup.cpp:412 +#: src/gui/statuspopup.cpp:417 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:416 +#: src/gui/statuspopup.cpp:421 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:420 +#: src/gui/statuspopup.cpp:425 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:424 +#: src/gui/statuspopup.cpp:429 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:428 +#: src/gui/statuspopup.cpp:433 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:432 +#: src/gui/statuspopup.cpp:437 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:436 +#: src/gui/statuspopup.cpp:441 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:444 +#: src/gui/statuspopup.cpp:449 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:449 +#: src/gui/statuspopup.cpp:454 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:454 +#: src/gui/statuspopup.cpp:459 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:459 +#: src/gui/statuspopup.cpp:464 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:464 +#: src/gui/statuspopup.cpp:469 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:468 +#: src/gui/statuspopup.cpp:473 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:477 +#: src/gui/statuspopup.cpp:482 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:481 +#: src/gui/statuspopup.cpp:486 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:485 +#: src/gui/statuspopup.cpp:490 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:494 +#: src/gui/statuspopup.cpp:499 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:497 +#: src/gui/statuspopup.cpp:502 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 +#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:508 +#: src/gui/statuspopup.cpp:513 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:512 +#: src/gui/statuspopup.cpp:517 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:516 +#: src/gui/statuspopup.cpp:521 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:527 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:532 +#: src/gui/statuspopup.cpp:537 msgid "Game modifiers are enabled" msgstr "" @@ -3046,18 +3074,18 @@ msgstr "级别:%d (GM %d)" msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:713 -#: src/gui/statuswindow.cpp:733 src/gui/statuswindow.cpp:749 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:824 -#: src/gui/statuswindow.cpp:847 src/gui/statuswindow.cpp:866 +#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752 +#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869 msgid "(D)" msgstr "(D)" -#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:774 +#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777 msgid "(I)" msgstr "(I)" -#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:771 +#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774 msgid "(c)" msgstr "(c)" @@ -3065,20 +3093,20 @@ msgstr "(c)" msgid "(C)" msgstr "(C)" -#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761 msgid "(d)" msgstr "(d)" #: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677 -#: src/gui/statuswindow.cpp:706 src/gui/statuswindow.cpp:725 -#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:761 -#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:813 -#: src/gui/statuswindow.cpp:839 src/gui/statuswindow.cpp:853 -#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:882 +#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728 +#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764 +#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816 +#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856 +#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885 msgid "(?)" msgstr "(?)" -#: src/gui/statuswindow.cpp:674 +#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706 msgid "(a)" msgstr "(a)" @@ -3094,7 +3122,7 @@ msgstr "(1)" msgid "(2)" msgstr "(2)" -#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804 msgid "(3)" msgstr "(3)" @@ -3106,70 +3134,70 @@ msgstr "(5)" msgid "(7)" msgstr "(7)" -#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:755 -#: src/gui/statuswindow.cpp:810 src/gui/statuswindow.cpp:879 +#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758 +#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882 msgid "(A)" msgstr "(A)" -#: src/gui/statuswindow.cpp:716 +#: src/gui/statuswindow.cpp:719 msgid "(R)" msgstr "(R)" -#: src/gui/statuswindow.cpp:719 +#: src/gui/statuswindow.cpp:722 msgid "(M)" msgstr "(M)" -#: src/gui/statuswindow.cpp:722 +#: src/gui/statuswindow.cpp:725 msgid "(P)" msgstr "(P)" -#: src/gui/statuswindow.cpp:736 +#: src/gui/statuswindow.cpp:739 msgid "(s)" msgstr "(s)" -#: src/gui/statuswindow.cpp:739 src/gui/statuswindow.cpp:792 +#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795 msgid "(S)" msgstr "(S)" -#: src/gui/statuswindow.cpp:752 src/gui/statuswindow.cpp:807 -#: src/gui/statuswindow.cpp:860 +#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810 +#: src/gui/statuswindow.cpp:863 msgid "(G)" msgstr "(G)" -#: src/gui/statuswindow.cpp:768 +#: src/gui/statuswindow.cpp:771 msgid "(f)" msgstr "(f)" -#: src/gui/statuswindow.cpp:777 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:863 +#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801 +#: src/gui/statuswindow.cpp:866 msgid "(F)" msgstr "(F)" -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:830 +#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833 msgid "(U)" msgstr "(U)" -#: src/gui/statuswindow.cpp:804 +#: src/gui/statuswindow.cpp:807 msgid "(g)" msgstr "(g)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:824 msgid "(N)" msgstr "(N)" -#: src/gui/statuswindow.cpp:827 +#: src/gui/statuswindow.cpp:830 msgid "(u)" msgstr "(u)" -#: src/gui/statuswindow.cpp:833 +#: src/gui/statuswindow.cpp:836 msgid "(e)" msgstr "(e)" -#: src/gui/statuswindow.cpp:836 +#: src/gui/statuswindow.cpp:839 msgid "(b)" msgstr "(b)" -#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:876 +#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879 msgid "(O)" msgstr "(O)" @@ -3485,7 +3513,7 @@ msgstr "家居广场边界" msgid "Road Point" msgstr "路点" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:478 +#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479 msgid "Who Is Online - Updating" msgstr "è°åœ¨çº¿ - æ›´æ–°" @@ -3493,15 +3521,15 @@ msgstr "è°åœ¨çº¿ - æ›´æ–°" msgid "Update" msgstr "æ›´æ–°" -#: src/gui/whoisonline.cpp:301 +#: src/gui/whoisonline.cpp:302 msgid "Who Is Online - " msgstr "è°åœ¨çº¿ -" -#: src/gui/whoisonline.cpp:492 +#: src/gui/whoisonline.cpp:493 msgid "Who Is Online - error" msgstr "è°åœ¨çº¿ - 错误" -#: src/gui/whoisonline.cpp:523 +#: src/gui/whoisonline.cpp:525 msgid "Who Is Online - Update" msgstr "è°åœ¨çº¿ - æ›´æ–°" @@ -3674,7 +3702,7 @@ msgstr "æ¤å‘½ä»¤å¿½ç•¥äº†å…¶ä»–，ä¸ç®¡ç›®å‰çš„关系。" #: src/gui/widgets/whispertab.cpp:130 msgid "Command: /unignore <player>" -msgstr "命令: /uninore <>" +msgstr "命令: /unignore <玩家>" #: src/gui/widgets/whispertab.cpp:131 msgid "This command stops ignoring the other player if they are being ignored." @@ -3686,7 +3714,7 @@ msgstr "" #: src/gui/windowmenu.cpp:65 msgid "Bot checker" -msgstr "机器人检查" +msgstr "挂机检查" #: src/gui/windowmenu.cpp:67 msgid "ONL" @@ -3750,15 +3778,15 @@ msgstr "" #: 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" @@ -3782,7 +3810,7 @@ msgstr "" #: src/keyboardconfig.cpp:43 msgid "Basic Keys" -msgstr "" +msgstr "基本按键" #: src/keyboardconfig.cpp:44 msgid "Move Up" @@ -3878,11 +3906,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 @@ -3901,7 +3929,7 @@ msgstr "物å“å¿«æ· %d" #: src/keyboardconfig.cpp:128 msgid "Windows Keys" -msgstr "" +msgstr "窗å£æŒ‰é”®" #: src/keyboardconfig.cpp:129 msgid "Help Window" @@ -3953,7 +3981,7 @@ msgstr "表情快æ·çª—å£" #: src/keyboardconfig.cpp:153 msgid "Outfits Window" -msgstr "装具窗å£" +msgstr "套装窗å£" #: src/keyboardconfig.cpp:155 msgid "Shop Window" @@ -3973,7 +4001,7 @@ msgstr "命令的窗å£" #: src/keyboardconfig.cpp:163 msgid "Bot Checker Window" -msgstr "BOT检查窗å£" +msgstr "挂机检查窗å£" #: src/keyboardconfig.cpp:166 msgid "Who Is Online Window" @@ -3981,7 +4009,7 @@ msgstr "è°æ˜¯åœ¨çº¿çª—å£" #: src/keyboardconfig.cpp:168 msgid "Did you know Window" -msgstr "" +msgstr "ä½ çŸ¥é“å—窗å£" #: src/keyboardconfig.cpp:171 msgid "Previous Social Tab" @@ -3993,7 +4021,7 @@ msgstr "" #: src/keyboardconfig.cpp:175 msgid "Emotes Keys" -msgstr "" +msgstr "表情按键" #: src/keyboardconfig.cpp:176 msgid "Smilie" @@ -4028,11 +4056,11 @@ msgstr "表情快æ·é”®ä¸º %d" #: src/keyboardconfig.cpp:270 msgid "Outfits Keys" -msgstr "" +msgstr "套装按键" #: src/keyboardconfig.cpp:271 msgid "Wear Outfit" -msgstr "" +msgstr "装备套装" #: src/keyboardconfig.cpp:273 msgid "Copy Outfit" @@ -4044,7 +4072,7 @@ msgstr "" #: src/keyboardconfig.cpp:277 msgid "Chat Keys" -msgstr "" +msgstr "èŠå¤©æŒ‰é”®" #: src/keyboardconfig.cpp:278 msgid "Toggle Chat" @@ -4088,7 +4116,7 @@ msgstr "åœç”¨èŠå¤©è¾“å…¥" #: src/keyboardconfig.cpp:299 msgid "Other Keys" -msgstr "" +msgstr "其他按键" #: src/keyboardconfig.cpp:300 msgid "Ignore input 1" @@ -4116,11 +4144,11 @@ 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" @@ -4192,7 +4220,7 @@ msgstr "切æ¢æ¨¡å¼" #: src/keyboardconfig.cpp:348 msgid "Modifier key" -msgstr "" +msgstr "修改按键" #: src/keyboardconfig.cpp:427 #, c-format @@ -4201,159 +4229,159 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:380 +#: src/localplayer.cpp:381 msgid "You were killed by " msgstr "ä½ è¢«æ‰“æ»" -#: src/localplayer.cpp:1427 +#: src/localplayer.cpp:1428 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1429 +#: src/localplayer.cpp:1430 msgid "Item is too heavy." msgstr "项目是太é‡äº†ã€‚" -#: src/localplayer.cpp:1431 +#: src/localplayer.cpp:1432 msgid "Item is too far away." msgstr "物å“太远了。" -#: src/localplayer.cpp:1433 +#: src/localplayer.cpp:1434 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1435 +#: src/localplayer.cpp:1436 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1438 +#: src/localplayer.cpp:1439 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1441 +#: src/localplayer.cpp:1442 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1465 +#: src/localplayer.cpp:1466 #, 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:3179 +#: src/localplayer.cpp:3181 msgid "Away" msgstr "è·ç¦»" -#: src/localplayer.cpp:3507 +#: src/localplayer.cpp:3509 msgid "Follow: " msgstr "è·Ÿéš:" -#: src/localplayer.cpp:3509 src/localplayer.cpp:3524 +#: src/localplayer.cpp:3511 src/localplayer.cpp:3526 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3516 +#: src/localplayer.cpp:3518 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3518 src/localplayer.cpp:3526 +#: src/localplayer.cpp:3520 src/localplayer.cpp:3528 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3871 +#: src/localplayer.cpp:3873 msgid "You see " msgstr "ä½ çœ‹" #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "manaplus [选项] [mana-file]" +msgid "manaplus [options] [manaplus-file]" +msgstr "" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "[mana-file] : The mana is an XML file (.mana)" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr "用于设置自定义å‚æ•°" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" +msgstr "" #: src/main.cpp:50 -msgid " to the manaplus client." +msgid " used to set custom parameters" +msgstr "" + +#: src/main.cpp:51 +msgid " to the manaplus client." msgstr "" -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "选项：" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" msgstr "-l--log-file 日志文件" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" msgstr "" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" msgstr "-v --version: 显示版本" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" msgstr "" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" msgstr "" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" msgstr "" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" msgstr "" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" msgstr "" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" msgstr "" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" msgstr "" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" msgstr "--update-host: 使用æ¤æ›´æ–°ä¸»æœº" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" msgstr "" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" msgstr "" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" msgstr "" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" msgstr "" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" msgstr "" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" msgstr "" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" msgstr "" @@ -4409,7 +4437,7 @@ msgstr "" msgid "Failed to create character. Most likely the name is already taken." msgstr "创建角色失败。很å¯èƒ½å称已被å 用。" -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." msgstr "错误的å称。" @@ -4454,11 +4482,11 @@ msgstr "密è¯æ— 法å‘é€ï¼Œ%s离线。" msgid "Whisper could not be sent, ignored by %s." msgstr "" -#: src/net/ea/chathandler.cpp:355 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." msgstr "MVPçƒå‘˜ã€‚" -#: src/net/ea/chathandler.cpp:359 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " msgstr "MVPçƒå‘˜ï¼š" @@ -4491,81 +4519,81 @@ msgstr "" msgid "Unknown server response." msgstr "未知的æœåŠ¡å™¨çš„å“应。" -#: src/net/ea/guildhandler.cpp:181 +#: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:183 +#: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" msgstr "工会会长: %s" -#: src/net/ea/guildhandler.cpp:185 +#: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" msgstr "工会ç‰çº§: %d" -#: src/net/ea/guildhandler.cpp:187 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" msgstr "在线玩家: %d" -#: src/net/ea/guildhandler.cpp:189 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" msgstr "最大æˆå‘˜: %d" -#: src/net/ea/guildhandler.cpp:191 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" msgstr "å¹³å‡ç‰çº§: %d" -#: src/net/ea/guildhandler.cpp:193 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" msgstr "工会ç»éªŒå€¼: %d" -#: src/net/ea/guildhandler.cpp:195 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" msgstr "工会下一级所需ç»éªŒ: %d" -#: src/net/ea/guildhandler.cpp:197 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:403 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." msgstr "" -#: src/net/ea/guildhandler.cpp:407 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." msgstr "" -#: src/net/ea/guildhandler.cpp:411 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." msgstr "ç”¨æˆ·çŽ°åœ¨æ˜¯ä½ ä»¬çš„å·¥ä¼šæˆå‘˜äº†." -#: src/net/ea/guildhandler.cpp:415 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." msgstr "" -#: src/net/ea/guildhandler.cpp:419 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." msgstr "未知工会邀请å“应." -#: src/net/ea/guildhandler.cpp:453 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." msgstr "%så·²ç»ç¦»å¼€å·¥ä¼š." -#: src/net/ea/guildhandler.cpp:484 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." msgstr "ä½ å·²ç»è¢«å·¥ä¼šå¼€é™¤ï¼." -#: src/net/ea/guildhandler.cpp:497 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." msgstr "%så·²ç»è¢«å·¥ä¼šå¼€é™¤." @@ -4678,11 +4706,11 @@ msgstr "ç»éªŒå…±äº«ä¸å¯èƒ½ã€‚" msgid "Experience sharing unknown." msgstr "" -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." msgstr "使用物å“失败。" -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." msgstr "æ— æ³•è£…å¤‡ã€‚" @@ -4698,39 +4726,39 @@ msgstr "旧密ç ä¸æ£ç¡®ã€‚" msgid "New password too short." msgstr "新密ç 太çŸã€‚" -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: 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:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." msgstr "未注册的ID。" -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." msgstr "错误的密ç 。" -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." msgstr "账户过期失效。" -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." msgstr "" -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." msgstr "您已被永久ç¦æ¢è¿›å…¥æ¸¸æˆã€‚请è”ç³»GM团队。" -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." msgstr "客户端太旧。" -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" @@ -4739,15 +4767,15 @@ msgstr "" "ä½ è¢«æš‚æ—¶ç¦æ¢è¿›å…¥æ¸¸æˆç›´åˆ°%s.\n" "请通过论å›è”ç³»GM组" -#: src/net/ea/loginhandler.cpp:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." msgstr "" -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." msgstr "" -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." msgstr "" @@ -4789,305 +4817,305 @@ msgstr "%sä¸èƒ½åŠ å…¥å›¢é˜Ÿï¼Œå› ä¸ºå›¢é˜Ÿæˆå‘˜å·²æ»¡ã€‚" msgid "QQQ Unknown invite response for %s." msgstr "" -#: src/net/ea/partyhandler.cpp:354 +#: src/net/ea/partyhandler.cpp:357 msgid "You have left the party." msgstr "ä½ ä»¥é€€å‡ºå¸®ä¼š" -#: src/net/ea/partyhandler.cpp:367 +#: src/net/ea/partyhandler.cpp:370 #, c-format msgid "%s has left your party." msgstr "%så·²ç»ç¦»å¼€ä½ 的帮会。" -#: src/net/ea/partyhandler.cpp:446 +#: src/net/ea/partyhandler.cpp:447 #, c-format msgid "An unknown member tried to say: %s" msgstr "一未知æˆå‘˜å°è¯•è¯´ï¼š%s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." msgstr "ä½ å·²çŽ©å®Œäº†ã€‚" -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: 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 "很é—憾的告诉您，您的角色在战斗ä¸æ»äº¡äº†" -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "ä½ å†ä¹Ÿä¸æ˜¯é‚£æ ·çš„生机勃勃了。" -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: 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 "" -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "游æˆç»“æŸï¼" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." msgstr "投入游æˆå¸ç»§ç»ã€‚" -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: 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:104 src/net/manaserv/beinghandler.cpp:323 +#: 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 "" -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." -msgstr "" +msgstr "我猜这进行得并ä¸é¡ºåˆ©ã€‚" -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" msgstr "" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." msgstr "" -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "被消ç了。" -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "" -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: 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 "" -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." msgstr "ä½ è¿˜æ²¡æ»ï¼Œä½ åªæ˜¯åœ¨ä¼‘æ¯" -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." msgstr "" -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." msgstr "" -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." msgstr "" -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." msgstr "" -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." msgstr "" -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." msgstr "" -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." msgstr "" -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." msgstr "" -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." msgstr "" -#: src/net/ea/playerhandler.cpp:129 +#: 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 "" -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." msgstr "" -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." msgstr "" "<ç–ç•¥>å¯ä»¥ä¸ºâ€œ1â€ï¼Œâ€œyesâ€ï¼Œâ€œtrueâ€å…¶ä¸ä¹‹ä¸€ä»¥å¼€å¯ç‰©å“共享，或者 是\"0\",\"no\"," "\"false\"用æ¥ç¦æ¢ç‰©å“共享。" -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:428 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" msgstr "讯æ¯" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" "You are carrying more than half your weight. You are unable to regain health." msgstr "ä½ å·²æºå¸¦è¶…过åŠæ•°è´Ÿé‡ã€‚æ— æ³•å›žå¤å¥åº·ï¼ˆä½“力）" -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" -#: src/net/ea/playerhandler.cpp:454 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." msgstr "ä½ æ¡èµ·äº†%s" -#: src/net/ea/playerhandler.cpp:460 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." msgstr "ä½ èŠ±è´¹ %s." -#: src/net/ea/playerhandler.cpp:506 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" msgstr "ä¸èƒ½æå‡æŠ€èƒ½!" -#: src/net/ea/playerhandler.cpp:624 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." msgstr "请先装备弓ç®ã€‚" -#: src/net/ea/specialhandler.cpp:146 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" msgstr "交易失败ï¼" -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" msgstr "å‘é€è¡¨æƒ…失败ï¼" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" msgstr "原地休æ¯å¤±è´¥ï¼" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" msgstr "èŠå¤©åˆ›å»ºå¤±è´¥ï¼" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" msgstr "ä¸èƒ½åŠ 入工会ï¼" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" msgstr "æ— æ³•å‘¼å–Šï¼" -#: src/net/ea/specialhandler.cpp:174 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" msgstr "ä½ è¿˜æ²¡æœ‰è¾¾åˆ°è¶³å¤Ÿçš„ç‰çº§ï¼" -#: src/net/ea/specialhandler.cpp:178 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" msgstr "HPä¸è¶³ï¼" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" msgstr "SPä¸è¶³ï¼" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" msgstr "没有备忘录" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" msgstr "ä½ æ— æ³•åŠžåˆ°ï¼" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" msgstr "看起æ¥éœ€è¦æ›´å¤šé‡‘å¸â€¦â€¦ ;-)" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" msgstr "æ¤æ¦å™¨æ— 法用æ¥ä½¿ç”¨æ¤é¡¹æŠ€èƒ½ï¼" -#: src/net/ea/specialhandler.cpp:197 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" msgstr "ä½ éœ€è¦å¦ä¸€é¢—红å®çŸ³ï¼" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" msgstr "ä½ éœ€è¦å¦ä¸€é¢—è“å®çŸ³ï¼" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" msgstr "ä½ å·²è´Ÿé‡å¤ªå¤šï¼Œæ— 法办到ï¼" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" msgstr "啊？那是什么？" -#: src/net/ea/specialhandler.cpp:217 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." msgstr "ä¼ é€å¤±è´¥..." -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." msgstr "æ— æ³•å·å–任何物å“..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." msgstr "毒è¯æ— 效..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: 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想和您进行交易，是å¦æŽ¥å—？" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:127 msgid "Trading isn't possible. Trade partner is too far away." msgstr "交易ä¸å¯èƒ½è¿›è¡Œã€‚与交易伙伴太过太过é¥è¿œ" -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:131 msgid "Trading isn't possible. Character doesn't exist." msgstr "交易ä¸å¯èƒ½è¿›è¡Œã€‚角色ä¸å˜åœ¨ã€‚" -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:135 msgid "Trade cancelled due to an unknown reason." msgstr "交易å–æ¶ˆå› ä¸æ˜ŽåŽŸå› 。" -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:141 #, c-format msgid "Trade: You and %s" msgstr "交易：您和%s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:151 #, c-format msgid "Trade with %s cancelled." msgstr "与%s的交易被å–消。" -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:164 msgid "Unhandled trade cancel packet." msgstr "未处ç†çš„交易å–消分组。" -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:229 msgid "Failed adding item. Trade partner is over weighted." msgstr "æ·»åŠ é¡¹ç›®å¤±è´¥ã€‚äº¤æ˜“ä¼™ä¼´å·²ç»è´Ÿé‡å¤ªå¤šã€‚" -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:234 msgid "Failed adding item. Trade partner has no free slot." msgstr "æ·»åŠ é¡¹ç›®å¤±è´¥ã€‚äº¤æ˜“ä¼™ä¼´æ— ç©ºé—²æ§½å˜æ”¾ç‰©å“。" -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:239 msgid "Failed adding item. You can't trade this item." msgstr "æ·»åŠ ç‰©å“失败。您ä¸èƒ½äº¤æ˜“这项物å“." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:243 msgid "Failed adding item for unknown reason." msgstr "æ·»åŠ é¡¹ç›®å¤±è´¥ï¼ŒåŽŸå› æœªçŸ¥ã€‚" -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "交易å–消。" -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "交易完æˆã€‚" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "力é‡" @@ -5096,7 +5124,7 @@ msgstr "力é‡" msgid "Strength %+.1f" msgstr "力é‡%+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "æ•æ·" @@ -5105,7 +5133,7 @@ msgstr "æ•æ·" msgid "Agility %+.1f" msgstr "æ•æ· %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "æ•æ·" @@ -5114,7 +5142,7 @@ msgstr "æ•æ·" msgid "Dexterity %+.1f" msgstr "çµå·§%+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "生命" @@ -5123,7 +5151,7 @@ msgstr "生命" msgid "Vitality %+.1f" msgstr "活力%+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "智慧" @@ -5431,86 +5459,86 @@ msgstr "身份验è¯å¤±è´¥ã€‚" msgid "No servers available." msgstr "没有å¯ç”¨çš„æœåŠ¡å™¨ã€‚" -#: src/net/tmwa/generalhandler.cpp:146 +#: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." msgstr "别人å°è¯•ä½¿ç”¨è¯¥å¸æˆ·ã€‚" -#: src/net/tmwa/generalhandler.cpp:149 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." msgstr "æ¤å¸æˆ·å·²ç™»å½•ã€‚" -#: src/net/tmwa/generalhandler.cpp:152 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." msgstr "检测速度劈。" -#: src/net/tmwa/generalhandler.cpp:155 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." msgstr "é‡å¤ç™»å½•ã€‚" -#: src/net/tmwa/generalhandler.cpp:158 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." msgstr "未知的连接错误。" -#: src/net/tmwa/generalhandler.cpp:231 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "å’ŒæœåŠ¡å™¨å¤±åŽ»è¿žæŽ¥" -#: src/net/tmwa/generalhandler.cpp:263 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "幸è¿" -#: src/net/tmwa/generalhandler.cpp:266 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" -msgstr "国防" +msgstr "防御" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:270 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" msgstr "％精度" -#: src/net/tmwa/generalhandler.cpp:272 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" msgstr "ï¼…é—ªé¿" -#: src/net/tmwa/generalhandler.cpp:274 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" msgstr "ï¼…" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" msgstr "攻击延迟" -#: src/net/tmwa/generalhandler.cpp:277 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" msgstr "æ¥è¡Œå»¶è¿Ÿ" -#: src/net/tmwa/generalhandler.cpp:279 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" msgstr "攻击范围" -#: src/net/tmwa/generalhandler.cpp:281 +#: src/net/tmwa/generalhandler.cpp:285 msgid "Damage per sec." -msgstr "" +msgstr "æ¯ç§’伤害" #: src/net/tmwa/network.cpp:152 msgid "Empty address given to Network::connect()!" msgstr "空的地å€ç»™ç½‘络：连接（）ï¼" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:355 msgid "Unable to resolve host \"" msgstr "æ— æ³•è§£æžä¸»æœºâ€œ" -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:425 msgid "Connection to server terminated. " msgstr "连接到æœåŠ¡å™¨ç»ˆæ¢ã€‚" @@ -5519,19 +5547,19 @@ msgstr "连接到æœåŠ¡å™¨ç»ˆæ¢ã€‚" msgid "%s is not in your party!" msgstr "%sä¸åœ¨ä½ 的帮会ä¸ï¼" -#: src/playerrelations.cpp:432 +#: src/playerrelations.cpp:435 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:452 +#: src/playerrelations.cpp:455 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:496 +#: src/playerrelations.cpp:499 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:499 +#: src/playerrelations.cpp:502 msgid "Floating bubble" msgstr "æµåŠ¨çš„泡沫" @@ -5548,7 +5576,7 @@ msgstr "攻击 %+d" #: src/resources/itemdb.cpp:64 #, c-format msgid "Defense %+d" -msgstr "防护 %+d" +msgstr "防御 %+d" #: src/resources/itemdb.cpp:65 #, c-format diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 827d46f29..cc18cfbee 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -118,7 +118,21 @@ class SortBeingFunctor return w1 < w2; } if (being1->getDistance() != being2->getDistance()) + { + if (specialDistance && being1->getDistance() <= 2 + && being2->getDistance() <= attackRange + && being2->getDistance() > 2) + { + return false; + } + else if (specialDistance && being2->getDistance() <= 2 + && being1->getDistance() <= attackRange + && being1->getDistance() > 2) + { + return true; + } return being1->getDistance() < being2->getDistance(); + } int d1, d2; #ifdef MANASERV_SUPPORT @@ -164,7 +178,8 @@ class SortBeingFunctor int defaultAttackIndex; std::map<std::string, int> *priorityBeings; int defaultPriorityIndex; - + bool specialDistance; + int attackRange; } beingSorter; ActorSpriteManager::ActorSpriteManager() : @@ -764,6 +779,14 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, std::map<std::string, int> priorityMobsMap; int defaultAttackIndex = 10000; int defaultPriorityIndex = 10000; + const int attackRange = player_node->getAttackRange(); + + bool specialDistance = false; + if (player_node->getMoveToTargetType() == 7 + && player_node->getAttackRange() > 2) + { + specialDistance = true; + } maxDist = maxDist * maxDist; @@ -783,6 +806,8 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, priorityMobsMap = mPriorityAttackMobsMap; beingSorter.attackBeings = &attackMobsMap; beingSorter.priorityBeings = &priorityMobsMap; + beingSorter.specialDistance = specialDistance; + beingSorter.attackRange = attackRange; if (ignoreAttackMobs.find("") != ignoreAttackMobs.end()) ignoreDefault = true; std::map<std::string, int>::const_iterator @@ -861,8 +886,15 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, if (player_node->getTarget() == NULL) { - // if no selected being, return first nearest being - return sortedBeings.at(0); + Being *target = sortedBeings.at(0); + + if (specialDistance && target->getType() == Being::MONSTER + && target->getDistance() <= 2) + { + return 0; + } + // if no selected being in vector, return first nearest being + return target; } beingEqualFinder.findBeing = player_node->getTarget(); @@ -928,6 +960,12 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, if (!valid) continue; + if (specialDistance && being->getDistance() <= 2 + && being->getType() == Being::MONSTER) + { + continue; + } + // logger->log("being name:" + being->getName()); // logger->log("index:" + toString(index)); // logger->log("d:" + toString(d)); diff --git a/src/being.cpp b/src/being.cpp index 2ed05449a..5eac242fd 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -229,6 +229,7 @@ Being::Being(int id, Type type, Uint16 subtype, Map *map): mGender(GENDER_UNSPECIFIED), mParty(0), mIsGM(false), + mAttackRange(1), mType(type), mX(0), mY(0), mDamageTaken(0), @@ -1623,7 +1624,9 @@ void Being::updateColors() mNameColor = &userPalette->getColor(UserPalette::FRIEND); } else if (player_relations.getRelation(mName) == - PlayerRelation::DISREGARDED) + PlayerRelation::DISREGARDED + || player_relations.getRelation(mName) == + PlayerRelation::BLACKLISTED) { mNameColor = &userPalette->getColor(UserPalette::DISREGARDED); } @@ -1992,7 +1995,11 @@ bool Being::drawSpriteAt(Graphics *graphics, int x, int y) const if (mHighlightMonsterAttackRange && mType == ActorSprite::MONSTER && isAlive()) { - const int attackRange = 32; + int attackRange; + if (mAttackRange) + attackRange = 32 * mAttackRange; + else + attackRange = 32; graphics->setColor(userPalette->getColorWithAlpha( UserPalette::MONSTER_ATTACK_RANGE)); diff --git a/src/being.h b/src/being.h index 2c37ffeb5..9b38e1479 100644 --- a/src/being.h +++ b/src/being.h @@ -540,7 +540,7 @@ class Being : public ActorSprite, public ConfigListener const Path &getPath() const { return mPath; } - int getDistance() + int getDistance() const { return mDistance; } void setDistance(int n) @@ -755,6 +755,18 @@ class Being : public ActorSprite, public ConfigListener bool isShopEnabled() { return mShop; } + /** + * Sets the attack range. + */ + void setAttackRange(int range) + { mAttackRange = range; } + + void attack(Being *target = NULL, bool keep = false, + bool dontChangeEquipment = false); + + void attack2(Being *target = NULL, bool keep = false, + bool dontChangeEquipment = false); + protected: /** * Sets the new path for this being. @@ -823,6 +835,7 @@ class Being : public ActorSprite, public ConfigListener Party *mParty; bool mIsGM; + int mAttackRange; private: diff --git a/src/client.cpp b/src/client.cpp index 8497d337b..c90d1886f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1145,7 +1145,7 @@ int Client::exec() { logger->log("Memorizing selected character %s", player_node->getName().c_str()); - config.setValue("lastCharacter", + serverConfig.setValue("lastCharacter", player_node->getName()); if (mumbleManager) mumbleManager->setPlayer(player_node->getName()); diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 189485461..f1b7518c5 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -112,6 +112,8 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab) handleDisregard(args, tab); else if (type == "neutral") handleNeutral(args, tab); + else if (type == "blacklist") + handleBlackList(args, tab); else if (type == "erase") handleErase(args, tab); else if (type == "join") @@ -523,9 +525,10 @@ void CommandHandler::handleUnignore(const std::string &args, ChatTab *tab) return; } - if (player_relations.getRelation(args) == PlayerRelation::IGNORED) + if (player_relations.getRelation(args) != PlayerRelation::NEUTRAL + && player_relations.getRelation(args) != PlayerRelation::FRIEND) { - player_relations.removePlayer(args); + player_relations.setRelation(args, PlayerRelation::NEUTRAL); } else { @@ -536,13 +539,17 @@ void CommandHandler::handleUnignore(const std::string &args, ChatTab *tab) if (tab) { - if (player_relations.getRelation(args) != PlayerRelation::IGNORED) + if (player_relations.getRelation(args) == PlayerRelation::NEUTRAL) tab->chatLog(_("Player no longer ignored!"), BY_SERVER); else tab->chatLog(_("Player could not be unignored!"), BY_SERVER); } } +void CommandHandler::handleBlackList(const std::string &args, ChatTab *tab) +{ + changeRelation(args, PlayerRelation::BLACKLISTED, _("blacklisted"), tab); +} void CommandHandler::handleErase(const std::string &args, ChatTab *tab) { diff --git a/src/commandhandler.h b/src/commandhandler.h index 64f0288c3..52080dfcd 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -172,6 +172,11 @@ class CommandHandler void handleNeutral(const std::string &args, ChatTab *tab); /** + * Handle an blacklist command. + */ + void handleBlackList(const std::string &args, ChatTab *tab); + + /** * Handle an erase command. */ void handleErase(const std::string &args, ChatTab *tab); diff --git a/src/defaults.cpp b/src/defaults.cpp index d7fa07a07..c5397a7d5 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -97,7 +97,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "imitationMode", 0); AddDEF(configData, "syncPlayerMove", false); AddDEF(configData, "drawPath", false); - AddDEF(configData, "moveToTargetType", 0); + AddDEF(configData, "moveToTargetType", 6); AddDEF(configData, "crazyMoveProgram", "mumrsonmdmlon"); AddDEF(configData, "disableGameModifiers", false); AddDEF(configData, "targetDeadPlayers", false); @@ -219,6 +219,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "seflMouseHeal", true); AddDEF(configData, "enableLazyScrolling", true); AddDEF(configData, "extMouseTargeting", true); + AddDEF(configData, "showMVP", false); return configData; } diff --git a/src/game.cpp b/src/game.cpp index 0527e8481..6ed2c2239 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -568,6 +568,7 @@ void Game::logic() map->saveExtraLayer(); } Client::closeDialogs(); + Client::setFramerate(config.getIntValue("fpslimit")); disconnectedDialog = new OkDialog(_("Network Error"), errorMessage, false); disconnectedDialog->addActionListener(&errorListener); diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 82d6c2ff5..59bd173bd 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -293,6 +293,7 @@ void ChatWindow::fillCommands() mCommands.push_back("/addpriorityattack "); mCommands.push_back("/removeattack "); mCommands.push_back("/addignoreattack "); + mCommands.push_back("/blacklist "); } void ChatWindow::resetToDefaultSize() diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 16e3d9ec7..d7c7e54df 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -144,12 +144,21 @@ void PopupMenu::showPopup(int x, int y, Being *being) mBrowserBox->addRow("friend", _("Be friend")); mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::FRIEND: mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("erase", _("Erase")); + break; + + case PlayerRelation::BLACKLISTED: + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -369,12 +378,21 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mBrowserBox->addRow("friend", _("Be friend")); mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::FRIEND: mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("erase", _("Erase")); + break; + + case PlayerRelation::BLACKLISTED: + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -606,12 +624,21 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mBrowserBox->addRow("friend", _("Be friend")); mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::FRIEND: mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("erase", _("Erase")); + break; + + case PlayerRelation::BLACKLISTED: + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -857,6 +884,17 @@ void PopupMenu::handleLink(const std::string &link, { player_relations.setRelation(mNick, PlayerRelation::IGNORED); } + + else if (link == "blacklist" && being && + being->getType() == ActorSprite::PLAYER) + { + player_relations.setRelation(being->getName(), + PlayerRelation::BLACKLISTED); + } + else if (link == "blacklist" && !mNick.empty()) + { + player_relations.setRelation(mNick, PlayerRelation::BLACKLISTED); + } else if (link == "erase" && being && being->getType() == ActorSprite::PLAYER) { diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp index 9e75b9c0a..1b8209c8f 100644 --- a/src/gui/setup_chat.cpp +++ b/src/gui/setup_chat.cpp @@ -125,6 +125,9 @@ Setup_Chat::Setup_Chat() new SetupItemTextField(_("Highlight words (separated by comma)"), "", "highlightWords", this, "highlightWordsEvent"); + new SetupItemCheckBox(_("Show MVP messages"), "", + "showMVP", this, "showMVPEvent"); + setDimension(gcn::Rectangle(0, 0, 550, 350)); } diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 57a51e435..6c57d981e 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -71,7 +71,8 @@ static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] = N_("Friend"), N_("Disregarded"), N_("Ignored"), - N_("Erased") + N_("Erased"), + N_("Blacklisted") }; class PlayerRelationListModel : public gcn::ListModel diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 28dbca939..8f45be5d1 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -598,3 +598,11 @@ SkillInfo* SkillDialog::getSkill(int id) { return mSkills[id]; } + +void SkillDialog::widgetResized(const gcn::Event &event) +{ + Window::widgetResized(event); + + if (mTabs) + mTabs->fixSize(); +} diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 55dfafc38..21ee56f5e 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -86,6 +86,8 @@ class SkillDialog : public Window, public gcn::ActionListener bool hasSkills() { return !mSkills.empty(); } + void widgetResized(const gcn::Event &event); + private: typedef std::map<int, SkillInfo*> SkillMap; SkillMap mSkills; diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index ab19e501b..a728d4051 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -1632,3 +1632,11 @@ void SocialWindow::updateAttackFilter() if (mAttackFilter) mAttackFilter->updateList(); } + +void SocialWindow::widgetResized(const gcn::Event &event) +{ + Window::widgetResized(event); + + if (mTabs) + mTabs->fixSize(); +} diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index 04692d843..7dc962316 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -123,6 +123,8 @@ public: void updateAttackFilter(); + void widgetResized(const gcn::Event &event); + protected: friend class SocialTab; diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp index fee6450df..a0c8e06d4 100644 --- a/src/gui/statuspopup.cpp +++ b/src/gui/statuspopup.cpp @@ -284,6 +284,11 @@ void StatusPopup::updateLabels() _("(A) moves to target in attack range"), keyboard.KEY_CHANGE_MOVE_TO_TARGET); break; + case 7: + setLabelText(mMoveToTargetType, + _("(a) archer attack range"), + keyboard.KEY_CHANGE_MOVE_TO_TARGET); + break; default: setLabelText(mMoveToTargetType, _("(?) move to target"), keyboard.KEY_CHANGE_MOVE_TO_TARGET); diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 170fd6ab4..c746eb82d 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -702,6 +702,9 @@ void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED) case 6: str += translateLetter(N_("(A)")); break; + case 7: + str += translateLetter(N_("(a)")); + break; default: str += translateLetter(N_("(?)")); break; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 461dd581d..97a467add 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -195,8 +195,8 @@ void Viewport::draw(gcn::Graphics *gcnGraphics) { if (player_x <= 0 || player_y <= 0) { - if (debugChatTab) - debugChatTab->chatLog("incorrect player position!"); +// if (debugChatTab) +// debugChatTab->chatLog("incorrect player position!"); logger->log("incorrect player position: %d, %d, %d, %d", player_x, player_y, (int)mPixelViewX, (int)mPixelViewY); if (player_node) diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index a14e99afc..3fb63a105 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -278,6 +278,7 @@ void WhoIsOnline::loadList() break; case PlayerRelation::DISREGARDED: + case PlayerRelation::BLACKLISTED: disregard.push_back(prepareNick(nick, level, "8")); break; @@ -492,6 +493,7 @@ void WhoIsOnline::logic() setCaption(_("Who Is Online - error")); mUpdateButton->setEnabled(true); mUpdateTimer = cur_time + 240; + updateSize(); break; case UPDATE_LIST: if (mDownloadComplete == true) diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 485e96e74..9a29ae204 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -281,21 +281,15 @@ void ChatTab::chatLog(std::string line, Own own, { if (getFlash() == 0) { - if (player_node) - { - if (chatWindow && chatWindow->findHighlight(tmp.text)) - setFlash(2); - else - setFlash(1); - } + if (chatWindow && chatWindow->findHighlight(tmp.text)) + setFlash(2); else - { setFlash(1); - } } } - if (getAllowHighlight() && (this != getTabbedArea()->getSelectedTab() + if ((getAllowHighlight() || own == BY_GM) + && (this != getTabbedArea()->getSelectedTab() || (Client::getIsMinimized() || (!Client::getMouseFocused() && !Client::getInputFocused())))) { diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 3ad113b4c..af241d7c5 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -153,6 +153,9 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener bool getFollowDownScroll() { return mFollowDownScroll; } + void fixSize() + { adjustSize(); } + private: typedef std::vector< std::pair<gcn::Tab*, gcn::Widget*> > TabContainer; diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 28ffc4cf5..f33a72bb0 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -98,7 +98,6 @@ extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(int id, int subtype): Being(id, PLAYER, subtype, 0), - mAttackRange(0), mTargetTime(-1), mLastTarget(-1), mTarget(NULL), @@ -130,6 +129,8 @@ LocalPlayer::LocalPlayer(int id, int subtype): { logger->log1("LocalPlayer::LocalPlayer"); + mAttackRange = 0; + listen(Mana::CHANNEL_ATTRIBUTES); mLevel = 1; @@ -1764,6 +1765,7 @@ void LocalPlayer::moveToTarget(unsigned int dist) dist = 7; break; case 6: + case 7: dist = mAttackRange; if (dist == 1) dist = 2; @@ -2946,7 +2948,7 @@ void LocalPlayer::tryMagic(std::string spell, int baseMagic, void LocalPlayer::changeMoveToTargetType() { mMoveToTargetType++; - if (mMoveToTargetType > 6) + if (mMoveToTargetType > 7) mMoveToTargetType = 0; config.setValue("moveToTargetType", mMoveToTargetType); diff --git a/src/localplayer.h b/src/localplayer.h index 447306994..414933e70 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -130,11 +130,6 @@ class LocalPlayer : public Being, public ActorSpriteListener, void actorSpriteDestroyed(const ActorSprite &actorSprite); /** - * Sets the attack range. - */ - void setAttackRange(int range) { mAttackRange = range; } - - /** * Gets the attack range. */ int getAttackRange(); @@ -506,8 +501,6 @@ class LocalPlayer : public Being, public ActorSpriteListener, bool mInStorage; /**< Whether storage is currently accessible */ - int mAttackRange; - int mTargetTime; /** How long the being has been targeted **/ int mLastTarget; /** Time stamp of last targeting action, -1 if none. */ diff --git a/src/main.cpp b/src/main.cpp index 5c13b10ec..5eceee77b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,10 +44,11 @@ static void printHelp() using std::endl; std::cout - << _("manaplus [options] [mana-file]") << endl << endl - << _("[mana-file] : The mana file is an XML file (.mana)") << endl - << _(" used to set custom parameters") << endl - << _(" to the manaplus client.") + << _("manaplus [options] [manaplus-file]") << endl << endl + << _("[manaplus-file] : The manaplus file is an XML file (.manaplus)") + << endl + << _(" used to set custom parameters") << endl + << _(" to the manaplus client.") << endl << endl << _("Options:") << endl << _(" -l --log-file : Log file to use") << endl diff --git a/src/main.h b/src/main.h index 95a1b1698..548c3283f 100644 --- a/src/main.h +++ b/src/main.h @@ -45,12 +45,15 @@ * different interfaces, which have different implementations for each server. */ +#define SMALL_VERSION "1.1.10.16" +#define CHECK_VERSION "01.01.10.16" + #ifdef HAVE_CONFIG_H #include "../config.h" #elif defined WIN32 #include "winver.h" -#elif defined __APPLE__ -#define PACKAGE_VERSION "1.0.0" +#else +#define PACKAGE_VERSION SMALL_VERSION #endif #if defined __APPLE__ @@ -85,10 +88,6 @@ //define DEBUG_ALPHA_CACHE 1 //define DEBUG_OPENGL_LEAKS 1 -#define SMALL_VERSION "1.1.10.2" -#define CHECK_VERSION "01.01.10.02" - - #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ "; %s; 4144 v" SMALL_VERSION ")" #define PACKAGE_VERSION_4144 "ManaPlus 4144-" SMALL_VERSION "" diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h index d063c4eb1..6899f85f4 100644 --- a/src/net/adminhandler.h +++ b/src/net/adminhandler.h @@ -31,7 +31,8 @@ namespace Net class AdminHandler { public: - virtual ~AdminHandler() {} + virtual ~AdminHandler() + { } virtual void announce(const std::string &text) = 0; diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index ad70c2884..c41e918e1 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -38,10 +38,14 @@ class BuySellHandler { } virtual void handleMessage(Net::MessageIn &msg) = 0; + virtual void requestSellList(std::string nick) = 0; + virtual void requestBuyList(std::string nick) = 0; + virtual void sendBuyRequest(std::string nick, ShopItem* item, int amount) = 0; + virtual void sendSellRequest(std::string nick, ShopItem* item, int amount) = 0; }; diff --git a/src/net/charhandler.h b/src/net/charhandler.h index b362a623c..72a81684c 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -91,7 +91,7 @@ class CharHandler virtual unsigned int maxSprite() const = 0; protected: - CharHandler(): + CharHandler() : mSelectedCharacter(0), mCharSelectDialog(0), mCharCreateDialog(0) diff --git a/src/net/chathandler.h b/src/net/chathandler.h index 0553ea0ac..a0e232027 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -64,8 +64,6 @@ class ChatHandler virtual void who() = 0; virtual void sendRaw(const std::string &args) = 0; - -// virtual ~ChatHandler() {} }; } diff --git a/src/net/download.cpp b/src/net/download.cpp index 93417197e..969318b19 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -49,17 +49,17 @@ namespace Net { Download::Download(void *ptr, const std::string &url, - DownloadUpdate updateFunction, bool ignoreError): - mPtr(ptr), - mUrl(url), - mFileName(""), - mWriteFunction(NULL), - mAdler(0), - mUpdateFunction(updateFunction), - mThread(NULL), - mCurl(NULL), - mHeaders(NULL), - mIgnoreError(ignoreError) + DownloadUpdate updateFunction, bool ignoreError) : + mPtr(ptr), + mUrl(url), + mFileName(""), + mWriteFunction(NULL), + mAdler(0), + mUpdateFunction(updateFunction), + mThread(NULL), + mCurl(NULL), + mHeaders(NULL), + mIgnoreError(ignoreError) { mError = static_cast<char*>(calloc(CURL_ERROR_SIZE + 1, 1)); mError[0] = 0; @@ -72,6 +72,7 @@ Download::~Download() if (mHeaders) curl_slist_free_all(mHeaders); + mHeaders = 0; int status; if (mThread && SDL_GetThreadID(mThread)) SDL_WaitThread(mThread, &status); @@ -261,7 +262,7 @@ int Download::downloadThread(void *ptr) case CURLE_COULDNT_CONNECT: default: logger->log("curl error %d: %s host: %s", - res, d->mError, d->mUrl.c_str()); + res, d->mError, d->mUrl.c_str()); break; } diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index fcf1e25b2..2e311881f 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -38,7 +38,8 @@ namespace Ea class AdminHandler : public Net::AdminHandler { public: - virtual ~AdminHandler() { } + virtual ~AdminHandler() + { } virtual void kick(const std::string &name); diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 4a5cfb841..8fca76353 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -58,7 +58,7 @@ namespace Ea { const int EMOTION_TIME = 500; /**< Duration of emotion icon */ -BeingHandler::BeingHandler(bool enableSync): +BeingHandler::BeingHandler(bool enableSync) : mSync(enableSync), mSpawnId(0) { @@ -133,8 +133,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible) speed = msg.readInt16(); stunMode = msg.readInt16(); // opt1 statusEffects = msg.readInt16(); // opt2 - statusEffects |= (static_cast<Uint32>( - msg.readInt16())) << 16; // option + statusEffects |= (static_cast<Uint32>(msg.readInt16())) << 16; // option job = msg.readInt16(); // class dstBeing = actorSpriteManager->findBeing(id); @@ -210,14 +209,22 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible) if (dstBeing->getType() == ActorSprite::MONSTER) { - int hp = msg.readInt32(); - int maxHP = msg.readInt32(); - if (hp && maxHP) + if (serverVersion > 0) { - int oldHP = dstBeing->getHP(); - if (!oldHP || oldHP > hp) - dstBeing->setHP(hp); - dstBeing->setMaxHP(maxHP); + int hp = msg.readInt32(); + int maxHP = msg.readInt32(); + if (hp && maxHP) + { + int oldHP = dstBeing->getHP(); + if (!oldHP || oldHP > hp) + dstBeing->setHP(hp); + dstBeing->setMaxHP(maxHP); + } + } + else + { + msg.readInt32(); + msg.readInt32(); } gloves = 0; } @@ -237,19 +244,26 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible) msg.readInt16(); // manner dstBeing->setStatusEffectBlock(32, msg.readInt16()); // opt3 - msg.readInt8(); // karma + if (serverVersion > 0 && dstBeing->getType() == ActorSprite::MONSTER) + { + int attackRange = msg.readInt8(); // karma + dstBeing->setAttackRange(attackRange); + } + else + { + msg.readInt8(); // karma + } gender = msg.readInt8(); // reserving bits for future usage - gender &= 1; if (dstBeing->getType() == ActorSprite::PLAYER) { - dstBeing->setGender((gender == 0) - ? GENDER_FEMALE : GENDER_MALE); + gender &= 1; + dstBeing->setGender((gender == 0) ? GENDER_FEMALE : GENDER_MALE); // Set these after the gender, as the sprites may be gender-specific setSprite(dstBeing, EA_SPRITE_HAIR, hairStyle * -1, - ColorDB::getHairColor(hairColor)); + ColorDB::getHairColor(hairColor)); setSprite(dstBeing, EA_SPRITE_BOTTOMCLOTHES, headBottom); setSprite(dstBeing, EA_SPRITE_TOPCLOTHES, headMid); setSprite(dstBeing, EA_SPRITE_HAT, headTop); @@ -283,8 +297,6 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible) dstBeing->setAction(Being::STAND); dstBeing->setTileCoords(srcX, srcY); dstBeing->setDestination(dstX, dstY); -// if (player_node && player_node->getTarget() == dstBeing) -// player_node->targetMoved(); } else { @@ -293,7 +305,6 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible) msg.readCoordinates(x, y, dir); dstBeing->setTileCoords(x, y); - if (job == 45 && socialWindow && outfitWindow) { int num = socialWindow->getPortalIndex(x, y); @@ -379,7 +390,7 @@ void BeingHandler::processBeingRemove(Net::MessageIn &msg) return; player_node->followMoveTo(dstBeing, player_node->getNextDestX(), - player_node->getNextDestY()); + player_node->getNextDestY()); // If this is player's current target, clear it. if (dstBeing == player_node->getTarget()) @@ -464,20 +475,15 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) if (!actorSpriteManager) return; - Being *srcBeing; - Being *dstBeing; - int param1; - int type; - - srcBeing = actorSpriteManager->findBeing(msg.readInt32()); - dstBeing = actorSpriteManager->findBeing(msg.readInt32()); + Being *srcBeing = actorSpriteManager->findBeing(msg.readInt32()); + Being *dstBeing = actorSpriteManager->findBeing(msg.readInt32()); msg.readInt32(); // server tick int srcSpeed = msg.readInt32(); // src speed msg.readInt32(); // dst speed - param1 = msg.readInt16(); + int param1 = msg.readInt16(); msg.readInt16(); // param 2 - type = msg.readInt8(); + int type = msg.readInt8(); msg.readInt16(); // param 3 switch (type) @@ -513,10 +519,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) { srcBeing->setMoveTime(); if (player_node) - { - player_node->imitateAction( - srcBeing, Being::SIT); - } + player_node->imitateAction(srcBeing, Being::SIT); } } break; @@ -529,23 +532,18 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) { srcBeing->setMoveTime(); if (player_node) - { - player_node->imitateAction( - srcBeing, Being::STAND); - } + player_node->imitateAction(srcBeing, Being::STAND); } } break; default: - break; -/* logger->log("QQQ1 SMSG_BEING_ACTION:"); if (srcBeing) logger->log("srcBeing:" + toString(srcBeing->getId())); if (dstBeing) logger->log("dstBeing:" + toString(dstBeing->getId())); logger->log("type: " + toString(type)); -*/ + break; } } @@ -584,8 +582,7 @@ void BeingHandler::processBeingEmotion(Net::MessageIn &msg) if (!(dstBeing = actorSpriteManager->findBeing(msg.readInt32()))) return; - if (player_relations.hasPermission(dstBeing, - PlayerRelation::EMOTE)) + if (player_relations.hasPermission(dstBeing, PlayerRelation::EMOTE)) { unsigned char emote = msg.readInt8(); if (emote) @@ -626,8 +623,7 @@ void BeingHandler::processNameResponse(Net::MessageIn &msg) Party *party = player_node->getParty(); if (party && party->isMember(dstBeing->getId())) { - PartyMember *member = party->getMember( - dstBeing->getId()); + PartyMember *member = party->getMember(dstBeing->getId()); if (member) member->setName(dstBeing->getName()); diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 60931ef9b..196626b0d 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -40,9 +40,12 @@ class BuySellHandler : public Net::BuySellHandler BuySellHandler(); virtual void requestSellList(std::string nick); + virtual void requestBuyList(std::string nick); + virtual void sendBuyRequest(std::string nick, ShopItem* item, int amount); + virtual void sendSellRequest(std::string nick, ShopItem* item, int amount); diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index a0e5b392a..08c9a43c8 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -136,7 +136,7 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg) case 0: default: errorMessage = _("Failed to create character. Most " - "likely the name is already taken."); + "likely the name is already taken."); break; case 2: errorMessage = _("Wrong name."); diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index c18b1bb9a..60af645be 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -168,13 +168,11 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) return; } - if (player_relations.hasPermission( - nick, PlayerRelation::WHISPER)) + if (player_relations.hasPermission(nick, PlayerRelation::WHISPER)) { bool tradeBot = config.getBoolValue("tradebot"); bool showMsg = !config.getBoolValue("hideShopMessages"); - if (player_relations.hasPermission( - nick, PlayerRelation::TRADE)) + if (player_relations.hasPermission(nick, PlayerRelation::TRADE)) { if (shopWindow) { //commands to shop from player @@ -184,8 +182,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) { if (showMsg && chatWindow) chatWindow->addWhisper(nick, chatMsg); - shopWindow->giveList(nick, - ShopWindow::SELL); + shopWindow->giveList(nick, ShopWindow::SELL); } } else if (chatMsg.find("!buylist ") == 0) @@ -194,8 +191,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) { if (showMsg && chatWindow) chatWindow->addWhisper(nick, chatMsg); - shopWindow->giveList(nick, - ShopWindow::BUY); + shopWindow->giveList(nick, ShopWindow::BUY); } } else if (chatMsg.find("!buyitem ") == 0) @@ -205,7 +201,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) if (tradeBot) { shopWindow->processRequest(nick, chatMsg, - ShopWindow::BUY); + ShopWindow::BUY); } } else if (chatMsg.find("!sellitem ") == 0) @@ -215,7 +211,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) if (tradeBot) { shopWindow->processRequest(nick, chatMsg, - ShopWindow::SELL); + ShopWindow::SELL); } } else if (chatMsg.length() > 3 @@ -224,11 +220,8 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) chatMsg = chatMsg.erase(0, 2); if (showMsg && chatWindow) chatWindow->addWhisper(nick, chatMsg); - if (chatMsg.find("B1") == 0 - || chatMsg.find("S1") == 0) - { + if (chatMsg.find("B1") == 0 || chatMsg.find("S1") == 0) shopWindow->showList(nick, chatMsg); - } } else if (chatWindow) { @@ -242,9 +235,8 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) } else { - if (chatWindow && (showMsg - || (chatMsg.find("!selllist") - != 0 && chatMsg.find("!buylist") != 0))) + if (chatWindow && (showMsg || (chatMsg.find("!selllist") != 0 + && chatMsg.find("!buylist") != 0))) { chatWindow->addWhisper(nick, chatMsg); } @@ -277,8 +269,7 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg) std::string sender_name = ((pos == std::string::npos) ? "" : chatMsg.substr(0, pos)); - if (sender_name != being->getName() - && being->getType() == Being::PLAYER) + if (sender_name != being->getName() && being->getType() == Being::PLAYER) { if (!being->getName().empty()) sender_name = being->getName(); @@ -296,8 +287,8 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg) if (player_relations.checkPermissionSilently(sender_name, PlayerRelation::SPEECH_LOG) && chatWindow) { - chatWindow->resortChatLog(removeColors(sender_name) + " : " - + chatMsg, BY_OTHER); + chatWindow->resortChatLog(removeColors(sender_name) + + " : " + chatMsg, BY_OTHER); } if (player_relations.hasPermission(sender_name, @@ -347,7 +338,7 @@ void ChatHandler::processMVP(Net::MessageIn &msg) { // Display MVP player int id = msg.readInt32(); // id - if (localChatTab && actorSpriteManager) + if (localChatTab && actorSpriteManager && config.getBoolValue("showMVP")) { Being *being = actorSpriteManager->findBeing(id); if (!being) @@ -363,4 +354,3 @@ void ChatHandler::processMVP(Net::MessageIn &msg) } } // namespace Ea - diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index f4b87f8a2..2aad4a564 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -44,7 +44,8 @@ class GuildTab : public ChatTab void saveToLogFile(std::string &msg); - int getType() const { return ChatTab::TAB_GUILD; } + int getType() const + { return ChatTab::TAB_GUILD; } protected: void handleInput(const std::string &msg); diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index f34d51370..3a544d8db 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -35,13 +35,15 @@ class PartyTab : public ChatTab { public: PartyTab(); + ~PartyTab(); void showHelp(); bool handleCommand(const std::string &type, const std::string &args); - int getType() const { return ChatTab::TAB_PARTY; } + int getType() const + { return ChatTab::TAB_PARTY; } void saveToLogFile(std::string &msg); diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 2accb1f1d..66488d5fb 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -177,24 +177,22 @@ void GuildHandler::processGuildBasicInfo(Net::MessageIn &msg) if (guildTab && showBasicInfo) { showBasicInfo = false; - guildTab->chatLog(strprintf( - _("Guild name: %s"), name.c_str()), BY_SERVER); - guildTab->chatLog(strprintf( - _("Guild master: %s"), master.c_str()), BY_SERVER); - guildTab->chatLog(strprintf( - _("Guild level: %d"), level), BY_SERVER); - guildTab->chatLog(strprintf( - _("Online members: %d"), members), BY_SERVER); - guildTab->chatLog(strprintf( - _("Max members: %d"), maxMembers), BY_SERVER); - guildTab->chatLog(strprintf( - _("Average level: %d"), avgLevel), BY_SERVER); - guildTab->chatLog(strprintf( - _("Guild exp: %d"), exp), BY_SERVER); - guildTab->chatLog(strprintf( - _("Guild next exp: %d"), nextExp), BY_SERVER); - guildTab->chatLog(strprintf( - _("Guild castle: %s"), castle.c_str()), BY_SERVER); + guildTab->chatLog(strprintf(_("Guild name: %s"), + name.c_str()), BY_SERVER); + guildTab->chatLog(strprintf(_("Guild master: %s"), + master.c_str()), BY_SERVER); + guildTab->chatLog(strprintf(_("Guild level: %d"), level), BY_SERVER); + guildTab->chatLog(strprintf(_("Online members: %d"), + members), BY_SERVER); + guildTab->chatLog(strprintf(_("Max members: %d"), + maxMembers), BY_SERVER); + guildTab->chatLog(strprintf(_("Average level: %d"), + avgLevel), BY_SERVER); + guildTab->chatLog(strprintf(_("Guild exp: %d"), exp), BY_SERVER); + guildTab->chatLog(strprintf(_("Guild next exp: %d"), + nextExp), BY_SERVER); + guildTab->chatLog(strprintf(_("Guild castle: %s"), + castle.c_str()), BY_SERVER); } Guild *g = Guild::getGuild(static_cast<short int>(guildId)); @@ -206,6 +204,8 @@ void GuildHandler::processGuildBasicInfo(Net::MessageIn &msg) void GuildHandler::processGuildAlianceInfo(Net::MessageIn &msg) { int length = msg.readInt16(); + if (length < 4) + return; int count = (length - 4) / 32; for (int i = 0; i < count; i++) @@ -219,6 +219,8 @@ void GuildHandler::processGuildAlianceInfo(Net::MessageIn &msg) void GuildHandler::processGuildMemberList(Net::MessageIn &msg) { int length = msg.readInt16(); + if (length < 4) + return; int count = (length - 4) / 104; if (!taGuild) { @@ -260,7 +262,6 @@ void GuildHandler::processGuildMemberList(Net::MessageIn &msg) m->setExp(exp); m->setPos(pos); m->setRace(race); -// m->setDisplayBold(!pos); if (actorSpriteManager) { Being *being = actorSpriteManager->findBeingByName( @@ -294,6 +295,8 @@ void GuildHandler::processGuildPosNameList(Net::MessageIn &msg) } int length = msg.readInt16(); + if (length < 4) + return; int count = (length - 4) / 28; for (int i = 0; i < count; i++) @@ -307,6 +310,8 @@ void GuildHandler::processGuildPosNameList(Net::MessageIn &msg) void GuildHandler::processGuildPosInfoList(Net::MessageIn &msg) { int length = msg.readInt16(); + if (length < 4) + return; int count = (length - 4) / 16; for (int i = 0; i < count; i++) @@ -348,6 +353,8 @@ void GuildHandler::processGuildEmblem(Net::MessageIn &msg) msg.readInt32(); // Guild ID msg.readInt32(); // Emblem ID + if (length < 12) + return; msg.skip(length - 12); // Emblem data (unknown format) } @@ -358,6 +365,8 @@ void GuildHandler::processGuildSkillInfo(Net::MessageIn &msg) msg.readInt16(); // 'Skill point' + if (length < 6) + return; for (int i = 0; i < count; i++) { msg.readInt16(); // ID @@ -429,7 +438,10 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) if (taGuild) taGuild->removeMember(nick); - if (player_node && nick == player_node->getName()) + if (!player_node) + return; + + if (nick == player_node->getName()) { if (taGuild) { @@ -449,8 +461,7 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) { if (guildTab) { - guildTab->chatLog(strprintf( - _("%s has left your guild."), + guildTab->chatLog(strprintf(_("%s has left your guild."), nick.c_str()), BY_SERVER); } if (actorSpriteManager) @@ -474,7 +485,10 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) if (taGuild) taGuild->removeMember(nick); - if (player_node && nick == player_node->getName()) + if (!player_node) + return; + + if (nick == player_node->getName()) { if (taGuild) { @@ -514,6 +528,9 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) void GuildHandler::processGuildExpulsionList(Net::MessageIn &msg) { int length = msg.readInt16(); + if (length < 4) + return; + int count = (length - 4) / 88; for (int i = 0; i < count; i++) @@ -540,7 +557,7 @@ void GuildHandler::processGuildMessage(Net::MessageIn &msg) std::string sender_name = ((pos == std::string::npos) ? "" : chatMsg.substr(0, pos)); - chatMsg.erase(0, pos + 3); + chatMsg.erase(0, pos + 3); trim(chatMsg); guildTab->chatLog(sender_name, chatMsg); diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 1de681007..788b7f0fc 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -316,10 +316,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) if (err) { if (player_node) - { - player_node->pickedUp(itemInfo, 0, identified, - floorId, err); - } + player_node->pickedUp(itemInfo, 0, identified, floorId, err); } else { @@ -334,13 +331,13 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg) Item *item = inventory->getItem(index); if (item && item->getId() == itemId) - amount += inventory->getItem(index)->getQuantity(); + amount += item->getQuantity(); if (serverVersion < 1 && identified > 1) identified = 1; inventory->setItem(index, itemId, amount, refine, - identified, equipType != 0); + identified, equipType != 0); } } } @@ -451,7 +448,6 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg) { int index, amount, itemId, refine; unsigned char identified; -// int cards[4]; // Move an item into storage index = msg.readInt16() - STORAGE_OFFSET; @@ -475,8 +471,8 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg) if (serverVersion < 1 && identified > 1) identified = 1; - mStorage->setItem(index, itemId, amount, refine, - identified, false); + mStorage->setItem(index, itemId, amount, + refine, identified, false); } } } @@ -502,7 +498,6 @@ void InventoryHandler::processPlayerStorageRemove(Net::MessageIn &msg) void InventoryHandler::processPlayerStorageClose(Net::MessageIn &msg A_UNUSED) { // Storage access has been closed - // Storage window deletes itself mStorageWindow = 0; @@ -569,12 +564,9 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) void InventoryHandler::processPlayerEquip(Net::MessageIn &msg) { - int index, equipType; - int flag; - - index = msg.readInt16() - INVENTORY_OFFSET; - equipType = msg.readInt16(); - flag = msg.readInt8(); + int index = msg.readInt16() - INVENTORY_OFFSET; + int equipType = msg.readInt16(); + int flag = msg.readInt8(); if (!flag) SERVER_NOTICE(_("Unable to equip.")) @@ -584,12 +576,9 @@ void InventoryHandler::processPlayerEquip(Net::MessageIn &msg) void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg) { - int equipType; - int flag; - msg.readInt16(); // inder val - INVENTORY_OFFSET; - equipType = msg.readInt16(); - flag = msg.readInt8(); + int equipType = msg.readInt16(); + int flag = msg.readInt8(); if (flag) mEquips.setEquipment(getSlot(equipType), -1); diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index cb1e84673..3a99bc47f 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -60,16 +60,22 @@ class EquipBackend : public Equipment::Backend if (invyIndex == -1) return NULL; - return PlayerInfo::getInventory()->getItem(invyIndex); + if (PlayerInfo::getInventory()) + return PlayerInfo::getInventory()->getItem(invyIndex); + else + return 0; } void clear() { + Inventory *inv = PlayerInfo::getInventory(); + if (!inv) + return; for (int i = 0; i < EQUIPMENT_SIZE; i++) { if (mEquipment[i] != -1) { - Item* item = PlayerInfo::getInventory()->getItem(i); + Item* item = inv->getItem(i); if (item) item->setEquipped(false); } @@ -80,16 +86,19 @@ class EquipBackend : public Equipment::Backend void setEquipment(int index, int inventoryIndex) { + Inventory *inv = PlayerInfo::getInventory(); + if (!inv) + return; + // Unequip existing item - Item* item = PlayerInfo::getInventory() - ->getItem(mEquipment[index]); + Item* item = inv->getItem(mEquipment[index]); if (item) item->setEquipped(false); mEquipment[index] = inventoryIndex; - item = PlayerInfo::getInventory()->getItem(inventoryIndex); + item = inv->getItem(inventoryIndex); if (item) item->setEquipped(true); @@ -115,14 +124,14 @@ class InventoryItem bool equip; InventoryItem(int slot0, int id0, int quantity0, int refine0, - unsigned char color0, bool equip0) + unsigned char color0, bool equip0) : + slot(slot0), + id(id0), + quantity(quantity0), + color(color0), + refine(refine0), + equip(equip0) { - slot = slot0; - id = id0; - quantity = quantity0; - refine = refine0; - color = color0; - equip = equip0; } }; diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 9f7a5f07d..b11e60d4d 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -34,7 +34,7 @@ namespace Ea { -LoginHandler::LoginHandler(): +LoginHandler::LoginHandler() : mVersionResponse(false), mRegistrationEnabled(true) { @@ -184,10 +184,8 @@ void LoginHandler::processLoginData(Net::MessageIn &msg) world->updateHost = mUpdateHost; msg.skip(2); // unknown - logger->log("Network: Server: %s (%s:%d)", - world->name.c_str(), - ipToString(world->address), - world->port); + logger->log("Network: Server: %s (%s:%d)", world->name.c_str(), + ipToString(world->address), world->port); mWorlds.push_back(world); } diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 36e192ce8..35cc77fbf 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -40,7 +40,7 @@ namespace Ea PartyTab *partyTab = 0; Party *taParty = 0; -PartyHandler::PartyHandler(): +PartyHandler::PartyHandler() : mShareExp(PARTY_SHARE_UNKNOWN), mShareItems(PARTY_SHARE_UNKNOWN) { @@ -344,7 +344,10 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) int id = msg.readInt32(); std::string nick = msg.readString(24); msg.readInt8(); // fail - if (player_node && id == player_node->getId()) + if (!player_node) + return; + + if (id == player_node->getId()) { if (Ea::taParty) { @@ -431,21 +434,18 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) int id = msg.readInt32(); std::string chatMsg = msg.readString(msgLength); - if (Ea::taParty) + if (Ea::taParty && Ea::partyTab) { PartyMember *member = Ea::taParty->getMember(id); - if (Ea::partyTab) + if (member) { - if (member) - { - Ea::partyTab->chatLog(member->getName(), chatMsg); - } - else - { - Ea::partyTab->chatLog(strprintf( - _("An unknown member tried to say: %s"), - chatMsg.c_str()), BY_SERVER); - } + Ea::partyTab->chatLog(member->getName(), chatMsg); + } + else + { + Ea::partyTab->chatLog(strprintf( + _("An unknown member tried to say: %s"), + chatMsg.c_str()), BY_SERVER); } } } diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 3af237b5b..81e520415 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -70,7 +70,8 @@ namespace { void action(const gcn::ActionEvent &event A_UNUSED) { - Net::getPlayerHandler()->respawn(); + if (Net::getPlayerHandler()) + Net::getPlayerHandler()->respawn(); deathNotice = NULL; Client::closeDialogs(); @@ -326,13 +327,11 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) case 0x0018: if (!weightNotice) { - const int max - = PlayerInfo::getAttribute(MAX_WEIGHT) / 2; - const int total - = PlayerInfo::getAttribute(TOTAL_WEIGHT); + const int max = PlayerInfo::getAttribute(MAX_WEIGHT) / 2; + const int total = PlayerInfo::getAttribute(TOTAL_WEIGHT); if (value >= max && total < max) { - weightNoticeTime = cur_time + 10; + weightNoticeTime = cur_time + 5; weightNotice = new OkDialog(_("Message"), _("You are carrying more than " "half your weight. You are " @@ -342,7 +341,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) } else if (value < max && total >= max) { - weightNoticeTime = cur_time + 10; + weightNoticeTime = cur_time + 5; weightNotice = new OkDialog(_("Message"), _("You are carrying less than " "half your weight. You " diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp index b78531434..fe56db52a 100644 --- a/src/net/ea/specialhandler.cpp +++ b/src/net/ea/specialhandler.cpp @@ -134,11 +134,8 @@ void SpecialHandler::processSkillFailed(Net::MessageIn &msg) std::string txt; if (success == SKILL_FAILED && skillId == SKILL_BASIC) { - if (player_node && bskill == BSKILL_EMOTE - && reason == RFAIL_SKILLDEP) - { + if (player_node && bskill == BSKILL_EMOTE && reason == RFAIL_SKILLDEP) player_node->stopAdvert(); - } switch (bskill) { @@ -171,8 +168,7 @@ void SpecialHandler::processSkillFailed(Net::MessageIn &msg) switch (reason) { case RFAIL_SKILLDEP: - txt += _("You have not yet reached a high enough " - "lvl!"); + txt += _("You have not yet reached a high enough lvl!"); break; case RFAIL_INSUFHP: txt += _("Insufficient HP!"); diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index a03782db2..bdbba9715 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -84,7 +84,7 @@ void TradeHandler::processTradeRequest(Net::MessageIn &msg) // special message about the player being occupied. std::string tradePartnerNameTemp = msg.readString(24); - if (player_relations.hasPermission(tradePartnerName, + if (player_relations.hasPermission(tradePartnerNameTemp, PlayerRelation::TRADE)) { if (PlayerInfo::isTrading() || confirmDlg) @@ -97,16 +97,13 @@ void TradeHandler::processTradeRequest(Net::MessageIn &msg) PlayerInfo::setTrading(true); if (tradeWindow) { - if (tradePartnerName.empty() - || tradeWindow->getAutoTradeNick() + if (tradePartnerName.empty() || tradeWindow->getAutoTradeNick() != tradePartnerName) { tradeWindow->clear(); - confirmDlg = new ConfirmDialog( - _("Request for Trade"), + confirmDlg = new ConfirmDialog(_("Request for Trade"), strprintf(_("%s wants to trade with you, do" - " you accept?"), tradePartnerName.c_str()), - true); + " you accept?"), tradePartnerName.c_str()), true); confirmDlg->addActionListener(&listener); } else @@ -128,22 +125,20 @@ void TradeHandler::processTradeResponse(Net::MessageIn &msg) { case 0: // Too far away SERVER_NOTICE(_("Trading isn't possible. Trade " - "partner is too far away.")) + "partner is too far away.")) break; case 1: // Character doesn't exist SERVER_NOTICE(_("Trading isn't possible. Character " - "doesn't exist.")) + "doesn't exist.")) break; case 2: // Invite request check failed... - SERVER_NOTICE(_("Trade cancelled due to an unknown " - "reason.")) + SERVER_NOTICE(_("Trade cancelled due to an unknown reason.")) break; case 3: // Trade accepted if (tradeWindow) { tradeWindow->reset(); - tradeWindow->setCaption(strprintf( - _("Trade: You and %s"), + tradeWindow->setCaption(strprintf(_("Trade: You and %s"), tradePartnerName.c_str())); tradeWindow->initTrade(tradePartnerName); tradeWindow->setVisible(true); @@ -201,7 +196,10 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg) { // Trade: New Item add response (was 0x00ea, now 01b1) const int index = msg.readInt16() - INVENTORY_OFFSET; - Item *item = PlayerInfo::getInventory()->getItem(index); + Item *item = 0; + if (PlayerInfo::getInventory()) + item = PlayerInfo::getInventory()->getItem(index); + if (!item) { if (tradeWindow) diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h index 4d68faffc..1a15e6929 100644 --- a/src/net/generalhandler.h +++ b/src/net/generalhandler.h @@ -44,6 +44,7 @@ class GeneralHandler virtual void flushNetwork() = 0; virtual void clearHandlers() = 0; + virtual void reloadPartially() = 0; }; diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 06c73d288..360f141fa 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -64,8 +64,6 @@ class InventoryHandler virtual size_t getSize(int type) const = 0; virtual int convertFromServerSlot(int eAthenaSlot) const = 0; - -// virtual ~InventoryHandler() {} }; } // namespace Net diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 8f177f906..0fbf7162b 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -77,6 +77,7 @@ void MessageIn::readCoordinates(Uint16 &x, Uint16 &y) void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) { + Uint8 serverDir = 0; if (mPos + 3 <= mLength) { const char *data = mData + mPos; @@ -87,10 +88,10 @@ void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) temp = MAKEWORD(data[2] & 0x00f0, data[1] & 0x003f); y = static_cast<unsigned short>(temp >> 4); - direction = data[2] & 0x000f; + serverDir = data[2] & 0x000f; // Translate from eAthena format - switch (direction) + switch (serverDir) { case 0: direction = 1; @@ -134,7 +135,8 @@ void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) mPos += 3; PacketCounters::incInBytes(3); DEBUGLOG("readCoordinates: " + toString(static_cast<int>(x)) - + "," + toString(static_cast<int>(y))); + + "," + toString(static_cast<int>(y)) + "," + toString( + static_cast<int>(serverDir))); } void MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY, @@ -227,7 +229,7 @@ std::string MessageIn::readRawString(int length) char const *stringEnd2 = static_cast<char const *>(memchr(stringBeg2, '\0', len2)); std::string hiddenPart = std::string(stringBeg2, - stringEnd2 ? stringEnd2 - stringBeg2 : len2); + stringEnd2 ? stringEnd2 - stringBeg2 : len2); if (hiddenPart.length() > 0) { DEBUGLOG("readString2: " + hiddenPart); diff --git a/src/net/messagein.h b/src/net/messagein.h index eea298f4d..6d7038d4a 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -54,10 +54,12 @@ class MessageIn * Returns the length of unread data. */ unsigned int getUnreadLength() const - { return mLength - mPos; } + { return mLength > mPos ? mLength - mPos : 0; } virtual unsigned char readInt8(); /**< Reads a byte. */ + virtual Sint16 readInt16() = 0; /**< Reads a short. */ + virtual int readInt32() = 0; /**< Reads a long. */ /** diff --git a/src/net/messageout.h b/src/net/messageout.h index 3da92ab28..39a2e68bd 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -45,7 +45,9 @@ class MessageOut { public: virtual void writeInt8(Sint8 value); /**< Writes a byte. */ + virtual void writeInt16(Sint16 value) = 0; /**< Writes a short. */ + virtual void writeInt32(Sint32 value) = 0; /**< Writes a long. */ /** diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h index 1af928be8..35d5d64bc 100644 --- a/src/net/packetcounters.h +++ b/src/net/packetcounters.h @@ -26,15 +26,22 @@ class PacketCounters { public: -// PacketCounters(); static void incInBytes(int cnt); + static void incInPackets(); + static int getInBytes(); + static int getInPackets(); + static void incOutBytes(int cnt); + static void incOutPackets(); + static int getOutBytes(); + static int getOutPackets(); + static void update(); static int mInCurrentSec; diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index 246987eb1..14f06060d 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -74,10 +74,6 @@ class PartyHandler virtual void setShareItems(PartyShare share) = 0; virtual void clear() = 0; - - // virtual void options() = 0; - - // virtual void message() = 0; }; } // namespace Net diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 845c30f19..02267e20e 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -132,20 +132,16 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) break; case SMSG_SKILL_DAMAGE: - { processSkillDamage(msg); break; - } + case SMSG_BEING_ACTION: - { processBeingAction(msg); break; - } + case SMSG_BEING_SELFEFFECT: - { processBeingSelfEffect(msg); break; - } case SMSG_BEING_EMOTION: processBeingEmotion(msg); @@ -509,13 +505,9 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) if (!guildManager || !GuildManager::getEnableGuildBot()) { if (guild == 0) - { dstBeing->clearGuilds(); - } else - { dstBeing->setGuild(Guild::getGuild(static_cast<short>(guild))); - } } msg.readInt16(); // emblem @@ -659,6 +651,4 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) dstBeing->setMoveTime(); } - - } // namespace TmwAthena diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 7aa68e617..03b63aa16 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -157,7 +157,7 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg) break; default: - break; + break; } } @@ -165,8 +165,11 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, Net::Character *character, bool withColors) { + if (!character) + return; + const Token &token = - static_cast<LoginHandler*>(Net::getLoginHandler())->getToken(); + static_cast<LoginHandler*>(Net::getLoginHandler())->getToken(); LocalPlayer *tempPlayer = new LocalPlayer(msg.readInt32(), 0); tempPlayer->setGender(token.sex); @@ -264,6 +267,9 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, void CharServerHandler::chooseCharacter(Net::Character *character) { + if (!character) + return; + mSelectedCharacter = character; mCharSelectDialog = 0; @@ -338,10 +344,8 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) msg.skip(2); // Length word int slots = msg.readInt16(); if (slots > 0 && slots < 30) - { - loginData.characterSlots - = static_cast<short unsigned int>(slots); - } + loginData.characterSlots = static_cast<short unsigned int>(slots); + bool version = msg.readInt8() == 1 && serverVersion > 0; msg.skip(17); // Unused diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 90acf0f90..4e4318595 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -107,7 +107,6 @@ void ChatHandler::talk(const std::string &text) return; std::string mes = player_node->getName() + " : " + text; -// std::string mes = player_node->getName() + "zzzz : " + text; MessageOut outMsg(CMSG_CHAT_MESSAGE); // Added + 1 in order to let eAthena parse admin commands correctly @@ -227,7 +226,7 @@ void ChatHandler::processRaw(MessageOut &outMsg, std::string &line) if (pos != std::string::npos) { unsigned short x = static_cast<unsigned short>( - atoi(data.substr(0, pos).c_str())); + atoi(data.substr(0, pos).c_str())); data = data.substr(pos + 1); pos = line.find(","); if (pos == std::string::npos) diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index 242e9f9de..adaaa067b 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -107,9 +107,16 @@ void GameHandler::connect() if (Client::getState() == STATE_CONNECT_GAME) { - mCharID = player_node->getId(); // Change the player's ID to the account ID to match what eAthena uses - player_node->setId(token.account_ID); + if (player_node) + { + mCharID = player_node->getId(); + player_node->setId(token.account_ID); + } + else + { + mCharID = 0; + } } // Send login infos diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index c6ebc000c..0a9541477 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -143,10 +143,14 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg) break; case 2: if (Client::getState() == STATE_GAME) + { errorMessage = _("Someone else is trying to use this " "account."); + } else + { errorMessage = _("This account is already logged in."); + } break; case 3: errorMessage = _("Speed hack detected."); diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 5e6c9f18f..9ab8d64b4 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -40,7 +40,7 @@ namespace TmwAthena { class GeneralHandler : public MessageHandler, public Net::GeneralHandler, - public Mana::Listener + public Mana::Listener { public: GeneralHandler(); diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 640a6fd78..7ea97eb49 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -79,8 +79,6 @@ GuildHandler::~GuildHandler() void GuildHandler::handleMessage(Net::MessageIn &msg) { - DEBUGLOG("guild message"); - switch (msg.getId()) { case SMSG_GUILD_CREATE_RESPONSE: @@ -92,10 +90,8 @@ void GuildHandler::handleMessage(Net::MessageIn &msg) break; case SMSG_GUILD_MEMBER_LOGIN: - { processGuildMemberLogin(msg); break; - } case SMSG_GUILD_MASTER_OR_MEMBER: processGuildMasterOrMember(msg); diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 9a0978bd0..989ced27a 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -59,8 +59,7 @@ class InventoryHandler : public MessageHandler, public Ea::InventoryHandler void closeStorage(int type); - void moveItem(int source, int slot, int amount, - int destination); + void moveItem(int source, int slot, int amount, int destination); }; } // namespace TmwAthena diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 029c379a0..cac8df623 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -146,12 +146,10 @@ ServerInfo *LoginHandler::getCharServer() void LoginHandler::processServerVersion(Net::MessageIn &msg) { - // TODO: verify these! - char b1 = msg.readInt8(); // -1 - char b2 = msg.readInt8(); // T - char b3 = msg.readInt8(); // M - char b4 = msg.readInt8(); // W + char b2 = msg.readInt8(); // E + char b3 = msg.readInt8(); // V + char b4 = msg.readInt8(); // L if (b1 == -1 && b2 == 'E' && b3 == 'V' && b4 == 'L') { unsigned int options = msg.readInt8(); diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index 6071e0ab6..d5d9d82f9 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -46,6 +46,7 @@ MessageOut::MessageOut(short id): { mNetwork = TmwAthena::Network::instance(); mData = mNetwork->mOutBuffer + mNetwork->mOutSize; + writeInt16(id); } diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index 32cb803e2..da86f06f6 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -47,6 +47,7 @@ class MessageOut : public Net::MessageOut MessageOut(short id); void writeInt16(Sint16 value); /**< Writes a short. */ + void writeInt32(Sint32 value); /**< Writes a long. */ /** diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 8ecf04d36..0af74c295 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -42,49 +42,49 @@ short packet_lengths[] = { - 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // #0x0040 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 50, 3, -1, 55, 17, 3, 37, 46, -1, 23, -1, 3, 108, 3, 2, - 3, 28, 19, 11, 3, -1, 9, 5, 54, 53, 58, 60, 41, 2, 6, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 50, 3, -1, 55, 17, 3, 37, 46, -1, 23, -1, 3, 108, 3, 2, + 3, 28, 19, 11, 3, -1, 9, 5, 54, 53, 58, 60, 41, 2, 6, 6, // #0x0080 - 7, 3, 2, 2, 2, 5, 16, 12, 10, 7, 29, 23, -1, -1, -1, 0, - 7, 22, 28, 2, 6, 30, -1, -1, 3, -1, -1, 5, 9, 17, 17, 6, - 23, 6, 6, -1, -1, -1, -1, 8, 7, 6, 7, 4, 7, 0, -1, 6, - 8, 8, 3, 3, -1, 6, 6, -1, 7, 6, 2, 5, 6, 44, 5, 3, + 7, 3, 2, 2, 2, 5, 16, 12, 10, 7, 29, 23, -1, -1, -1, 0, + 7, 22, 28, 2, 6, 30, -1, -1, 3, -1, -1, 5, 9, 17, 17, 6, + 23, 6, 6, -1, -1, -1, -1, 8, 7, 6, 7, 4, 7, 0, -1, 6, + 8, 8, 3, 3, -1, 6, 6, -1, 7, 6, 2, 5, 6, 44, 5, 3, // #0x00C0 - 7, 2, 6, 8, 6, 7, -1, -1, -1, -1, 3, 3, 6, 6, 2, 27, - 3, 4, 4, 2, -1, -1, 3, -1, 6, 14, 3, -1, 28, 29, -1, -1, - 30, 30, 26, 2, 6, 26, 3, 3, 8, 19, 5, 2, 3, 2, 2, 2, - 3, 2, 6, 8, 21, 8, 8, 2, 2, 26, 3, -1, 6, 27, 30, 10, + 7, 2, 6, 8, 6, 7, -1, -1, -1, -1, 3, 3, 6, 6, 2, 27, + 3, 4, 4, 2, -1, -1, 3, -1, 6, 14, 3, -1, 28, 29, -1, -1, + 30, 30, 26, 2, 6, 26, 3, 3, 8, 19, 5, 2, 3, 2, 2, 2, + 3, 2, 6, 8, 21, 8, 8, 2, 2, 26, 3, -1, 6, 27, 30, 10, // #0x0100 - 2, 6, 6, 30, 79, 31, 10, 10, -1, -1, 4, 6, 6, 2, 11, -1, - 10, 39, 4, 10, 31, 35, 10, 18, 2, 13, 15, 20, 68, 2, 3, 16, - 6, 14, -1, -1, 21, 8, 8, 8, 8, 8, 2, 2, 3, 4, 2, -1, - 6, 86, 6, -1, -1, 7, -1, 6, 3, 16, 4, 4, 4, 6, 24, 26, + 2, 6, 6, 30, 79, 31, 10, 10, -1, -1, 4, 6, 6, 2, 11, -1, + 10, 39, 4, 10, 31, 35, 10, 18, 2, 13, 15, 20, 68, 2, 3, 16, + 6, 14, -1, -1, 21, 8, 8, 8, 8, 8, 2, 2, 3, 4, 2, -1, + 6, 86, 6, -1, -1, 7, -1, 6, 3, 16, 4, 4, 4, 6, 24, 26, // #0x0140 - 22, 14, 6, 10, 23, 19, 6, 39, 8, 9, 6, 27, -1, 2, 6, 6, - 110, 6, -1, -1, -1, -1, -1, 6, -1, 54, 66, 54, 90, 42, 6, 42, - -1, -1, -1, -1, -1, 30, -1, 3, 14, 3, 30, 10, 43, 14, 186, 182, - 14, 30, 10, 3, -1, 6, 106, -1, 4, 5, 4, -1, 6, 7, -1, -1, + 22, 14, 6, 10, 23, 19, 6, 39, 8, 9, 6, 27, -1, 2, 6, 6, +110, 6, -1, -1, -1, -1, -1, 6, -1, 54, 66, 54, 90, 42, 6, 42, + -1, -1, -1, -1, -1, 30, -1, 3, 14, 3, 30, 10, 43, 14, 186, 182, + 14, 30, 10, 3, -1, 6, 106, -1, 4, 5, 4, -1, 6, 7, -1, -1, // #0x0180 - 6, 3, 106, 10, 10, 34, 0, 6, 8, 4, 4, 4, 29, -1, 10, 6, - 90, 86, 24, 6, 30, 102, 9, 4, 8, 4, 14, 10, 4, 6, 2, 6, - 3, 3, 35, 5, 11, 26, -1, 4, 4, 6, 10, 12, 6, -1, 4, 4, - 11, 7, -1, 67, 12, 18, 114, 6, 3, 6, 26, 26, 26, 26, 2, 3, + 6, 3, 106, 10, 10, 34, 0, 6, 8, 4, 4, 4, 29, -1, 10, 6, + 90, 86, 24, 6, 30, 102, 9, 4, 8, 4, 14, 10, 4, 6, 2, 6, + 3, 3, 35, 5, 11, 26, -1, 4, 4, 6, 10, 12, 6, -1, 4, 4, + 11, 7, -1, 67, 12, 18, 114, 6, 3, 6, 26, 26, 26, 26, 2, 3, // #0x01C0 - 2, 14, 10, -1, 22, 22, 4, 2, 13, 97, 0, 9, 9, 29, 6, 28, - 8, 14, 10, 35, 6, 8, 4, 11, 54, 53, 60, 2, -1, 47, 33, 6, - 30, 8, 34, 14, 2, 6, 26, 2, 28, 81, 6, 10, 26, 2, -1, -1, - -1, -1, 20, 10, 32, 9, 34, 14, 2, 6, 48, 56, -1, 4, 5, 10, + 2, 14, 10, -1, 22, 22, 4, 2, 13, 97, 0, 9, 9, 29, 6, 28, + 8, 14, 10, 35, 6, 8, 4, 11, 54, 53, 60, 2, -1, 47, 33, 6, + 30, 8, 34, 14, 2, 6, 26, 2, 28, 81, 6, 10, 26, 2, -1, -1, + -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, - 0, 0, 0, 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, + 26, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, + 0, 0, 0, 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, }; const unsigned int BUFFER_SIZE = 655360; @@ -106,7 +106,7 @@ int networkThread(void *data) Network *Network::mInstance = 0; -Network::Network(): +Network::Network() : mSocket(0), mInBuffer(new char[BUFFER_SIZE]), mOutBuffer(new char[BUFFER_SIZE]), @@ -153,8 +153,8 @@ bool Network::connect(ServerInfo server) return false; } - logger->log("Network::Connecting to %s:%i", server.hostname.c_str(), - server.port); + logger->log("Network::Connecting to %s:%i", + server.hostname.c_str(), server.port); mServer.hostname = server.hostname; mServer.port = server.port; @@ -263,7 +263,7 @@ void Network::flush() if (ret < static_cast<int>(mOutSize)) { setError("Error in SDLNet_TCP_Send(): " + - std::string(SDLNet_GetError())); + std::string(SDLNet_GetError())); } mOutSize = 0; SDL_mutexV(mMutex); @@ -308,7 +308,6 @@ bool Network::messageReady() if (len == -1 && mInSize > 4) len = readWord(2); - } bool ret = (mInSize >= static_cast<unsigned int>(len)); @@ -354,7 +353,7 @@ bool Network::realConnect() mServer.port) == -1) { std::string errorMessage = _("Unable to resolve host \"") + - mServer.hostname + "\""; + mServer.hostname + "\""; setError(errorMessage); logger->log("SDLNet_ResolveHost: %s", errorMessage.c_str()); return false; @@ -371,7 +370,7 @@ bool Network::realConnect() } logger->log("Network::Started session with %s:%i", - ipToString(ipAddress.host), ipAddress.port); + ipToString(ipAddress.host), ipAddress.port); mState = CONNECTED; @@ -385,14 +384,14 @@ void Network::receive() if (!(set = SDLNet_AllocSocketSet(1))) { setError("Error in SDLNet_AllocSocketSet(): " + - std::string(SDLNet_GetError())); + std::string(SDLNet_GetError())); return; } if (SDLNet_TCP_AddSocket(set, mSocket) == -1) { setError("Error in SDLNet_AddSocket(): " + - std::string(SDLNet_GetError())); + std::string(SDLNet_GetError())); } while (mState == CONNECTED) diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index 509c5ecd1..c75d954dc 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -53,10 +53,9 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_PLAYER_SKILLS: - { processPlayerSkills(msg); break; - } + case SMSG_PLAYER_SKILL_UP: processPlayerSkillUp(msg); break; diff --git a/src/particle.h b/src/particle.h index c360a5e94..7220ad258 100644 --- a/src/particle.h +++ b/src/particle.h @@ -111,7 +111,7 @@ class Particle : public Actor * Necessary for sorting with the other sprites. */ virtual int getPixelY() const - { return static_cast<int>(mPos.y) - 64; } + { return static_cast<int>(mPos.y) - 16; } /** * Creates a blank particle as a child of the current particle diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 00a9d1cad..d7532b884 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -103,11 +103,12 @@ class PlayerConfSerialiser : static PlayerConfSerialiser player_conf_serialiser; // stateless singleton const unsigned int PlayerRelation::RELATION_PERMISSIONS[RELATIONS_NR] = { - /* NEUTRAL */ 0, // we always fall back to the defaults anyway - /* FRIEND */ EMOTE | SPEECH_FLOAT | SPEECH_LOG | WHISPER | TRADE, - /* DISREGARDED*/ EMOTE | SPEECH_FLOAT, - /* IGNORED */ 0, - /* ERASED */ INVISIBLE + /* NEUTRAL */ 0, // we always fall back to the defaults anyway + /* FRIEND */ EMOTE | SPEECH_FLOAT | SPEECH_LOG | WHISPER | TRADE, + /* DISREGARDED*/ EMOTE | SPEECH_FLOAT, + /* IGNORED */ 0, + /* ERASED */ INVISIBLE, + /* BLACKLISTED */ SPEECH_LOG | WHISPER }; PlayerRelation::PlayerRelation(Relation relation) @@ -278,6 +279,7 @@ unsigned int PlayerRelationsManager::checkPermissionSilently( case PlayerRelation::DISREGARDED: case PlayerRelation::IGNORED: case PlayerRelation::ERASED: + case PlayerRelation::BLACKLISTED: default: permissions &= mDefaultPermissions; // narrow } @@ -395,13 +397,14 @@ void PlayerRelationsManager::ignoreTrade(std::string name) if (relation == PlayerRelation::IGNORED || relation == PlayerRelation::DISREGARDED + || relation == PlayerRelation::BLACKLISTED || relation == PlayerRelation::ERASED) { return; } else { - player_relations.setRelation(name, PlayerRelation::DISREGARDED); + player_relations.setRelation(name, PlayerRelation::BLACKLISTED); } } diff --git a/src/playerrelations.h b/src/playerrelations.h index bb483a793..41ca14b40 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -44,8 +44,9 @@ struct PlayerRelation static const unsigned int WHISPER = (1 << 3); static const unsigned int TRADE = (1 << 4); static const unsigned int INVISIBLE = (1 << 5); + static const unsigned int BLACKLIST = (1 << 6); - static const unsigned int RELATIONS_NR = 5; + static const unsigned int RELATIONS_NR = 6; static const unsigned int RELATION_PERMISSIONS[RELATIONS_NR]; static const unsigned int DEFAULT = EMOTE @@ -59,7 +60,8 @@ struct PlayerRelation FRIEND = 1, DISREGARDED = 2, IGNORED = 3, - ERASED = 4 + ERASED = 4, + BLACKLISTED = 5 }; PlayerRelation(Relation relation); |