diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-18 17:49:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-18 17:49:18 +0300 |
| commit | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (patch) | |
| tree | 152c7519b0d9b8fb424af2373ec48db823a85575 | |
| parent | 62ec17f6e489ec50f17219444468aeb8969dc961 (diff) | |
| parent | 3b999f51c740d0541c53d223518e5e4bb482d996 (diff) | |
| download | manaverse-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.gz manaverse-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.bz2 manaverse-70b520b1e876f9698bb95baa2d274ea289a0c6bd.tar.xz manaverse-70b520b1e876f9698bb95baa2d274ea289a0c6bd.zip | |
Merge branch 'master' into strippedstripped1.1.9.18
Conflicts:
src/guichan/cliprectangle.cpp
src/guichan/focushandler.cpp
src/guichan/gui.cpp
src/guichan/include/guichan/cliprectangle.hpp
src/guichan/include/guichan/inputevent.hpp
src/guichan/include/guichan/keyevent.hpp
src/guichan/include/guichan/mouseevent.hpp
src/guichan/include/guichan/widgets/button.hpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/include/guichan/widgets/radiobutton.hpp
src/guichan/include/guichan/widgets/slider.hpp
src/guichan/include/guichan/widgets/tab.hpp
src/guichan/include/guichan/widgets/tabbedarea.hpp
src/guichan/include/guichan/widgets/textfield.hpp
src/guichan/include/guichan/widgets/window.hpp
src/guichan/inputevent.cpp
src/guichan/keyevent.cpp
src/guichan/mouseevent.cpp
src/guichan/widget.cpp
src/guichan/widgets/button.cpp
src/guichan/widgets/checkbox.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/radiobutton.cpp
src/guichan/widgets/slider.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textfield.cpp
src/guichan/widgets/window.cpp
278 files changed, 11537 insertions, 10075 deletions
@@ -23,8 +23,10 @@ alastrim GonzoDark == Art or images contributors == -Aline Ferraz de Souza (Freya) <freya.df gmail com> -Nina O'Reilly (Reid) <reidyaro gmail com> +Aline Ferraz de Souza (Freya) <freya.df gmail com> Themes +Felix Jely (Lien) Black & wood theme +Max Isele (DerLoisl) <der.loisl theavoraproject org> Alien emote +Nina O'Reilly (Reid) <reidyaro gmail com> Emotes, icons @@ -1,3 +1,29 @@ +2011-09-18 New release 1.1.9.18 +Manaplus: +fix: restore windows visible state after restart. +fix: players sorting in relation and party tab. +fix: configuration settings in first start. +fix: animation moving animation with mouse and some other. +fix: reorder sprites if disabled in settings. +fix: disable config copy from ancient tmw versions. +fix: chat autocomplete case. +fix: change player state from sit to stay if under attack. +fix: whisper errors detection. +add: options to configure lazy scrolling. +add: move by minimaps clicks. +add: copy text to clipboard by CTRL+C. +add: additional sorting to inventory: by wight, by amount, by type. +add: inventory filter by item name. +add: per window visual configuration in themes. +add: add item move to context menu for party members. +add: configuration buttons in initial game window. +add: theme unity (by Freya). +add: Czech (cs) translation (by Pitriss). +add: improve game speed. + +Mana: +fix: draw overlay in opengl mode. + 2011-09-04 New release 1.1.9.4 ManaPlus: fix: compilation with different flags. @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.9.4 Date: 2011-09-04 + Version: 1.1.9.18 Date: 2011-09-18 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 47e9ffa4e..1585d5e0f 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT
===============
- Version: 1.1.9.4 Date: 2011-09-04
+ Version: 1.1.9.18 Date: 2011-09-18
Development team:
- See AUTHORS file for a list
@@ -1,7 +1,7 @@ #!/bin/sh #may be -#-Wshadow -Waggregate-return -Winline +#-Waggregate-return -Winline #for feature #-Wstrict-overflow=4 -Wfloat-equal @@ -33,7 +33,7 @@ export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \ -Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ -Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ -Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ --Wpacked" +-Wpacked -Wshadow -D_FORTIFY_SOURCE=2" autoreconf -i ./configure --prefix=$dir/run \ @@ -32,7 +32,8 @@ export CXXFLAGS="-Wmissing-field-initializers \ -Wunused-parameter -Wlogical-op \ -Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \ -Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \ --Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe" +-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ +-Wpacked -Wshadow -D_FORTIFY_SOURCE=2" autoreconf -i ./configure --prefix=$dir/run \ @@ -44,7 +44,7 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ -Wcast-align -Wcast-qual -Wpointer-arith -Wundef \ -Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ -Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ --Wstack-protector" +-Wstack-protector -Wshadow -D_FORTIFY_SOURCE=2" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/configure.ac b/configure.ac index 03d5cfd9e..12fc8097f 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.9.4], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.9.18], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS @@ -237,6 +237,7 @@ data/themes/enchilado/Makefile data/themes/mana/Makefile data/themes/pink/Makefile data/themes/redandblack/Makefile +data/themes/unity/Makefile data/themes/wood/Makefile data/help/Makefile data/help/es/Makefile diff --git a/data/help/es/team.txt b/data/help/es/team.txt index 2310f7023..bb43341ee 100644 --- a/data/help/es/team.txt +++ b/data/help/es/team.txt @@ -27,6 +27,8 @@ ##3== Colaboradores con Artes o Imágenes == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> diff --git a/data/help/fr/team.txt b/data/help/fr/team.txt index 83af8d5c8..6222f48bb 100644 --- a/data/help/fr/team.txt +++ b/data/help/fr/team.txt @@ -27,6 +27,8 @@ ##3== Contribution art ou images == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> diff --git a/data/help/ru/team.txt b/data/help/ru/team.txt index 6faec02f7..0c8470fd1 100644 --- a/data/help/ru/team.txt +++ b/data/help/ru/team.txt @@ -25,6 +25,8 @@ ##3== Художники == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> diff --git a/data/help/team.txt b/data/help/team.txt index 805aaf33f..d940a1694 100644 --- a/data/help/team.txt +++ b/data/help/team.txt @@ -27,6 +27,8 @@ ##3== Art or images contributors == ##9Aline Ferraz de Souza (Freya) <freya.df gmail com> +##9Felix Jely (Lien) +##9Max Isele (DerLoisl) <der.loisl theavoraproject org> ##9Nina O'Reilly (Reid) <reidyaro gmail com> diff --git a/data/themes/CMakeLists.txt b/data/themes/CMakeLists.txt index b6a7282df..9a0fef1b2 100644 --- a/data/themes/CMakeLists.txt +++ b/data/themes/CMakeLists.txt @@ -4,4 +4,5 @@ ADD_SUBDIRECTORY(enchilado) ADD_SUBDIRECTORY(mana) ADD_SUBDIRECTORY(pink) ADD_SUBDIRECTORY(redandblack) +ADD_SUBDIRECTORY(unity) ADD_SUBDIRECTORY(wood) diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 947d83df2..d0ec767d4 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = blackwood classic enchilado mana pink redandblack wood +SUBDIRS = blackwood classic enchilado mana pink redandblack unity wood EXTRA_DIST = CMakeLists.txt diff --git a/data/themes/unity/CMakeLists.txt b/data/themes/unity/CMakeLists.txt new file mode 100644 index 000000000..06d4f2920 --- /dev/null +++ b/data/themes/unity/CMakeLists.txt @@ -0,0 +1,47 @@ +SET (FILES + beingpopup.xml + button.png + button_disabled.png + buttonhi.png + buttonpress.png + char.xml + checkbox.png + close_button.png + colors.xml + deepbox.png + hscroll_left_default.png + hscroll_left_highlight.png + hscroll_left_pressed.png + hscroll_right_default.png + hscroll_right_highlight.png + hscroll_right_pressed.png + item_shortcut_bgr.png + itempopup.xml + popup.xml + progress.png + radioin.png + radioin_highlight.png + radioout.png + radioout_highlight.png + resize.png + selection.png + slider.png + slider_hilight.png + sticky_button.png + tab.png + tab_hilight.png + tabselected.png + textpopup.xml + vscroll_down_default.png + vscroll_down_highlight.png + vscroll_down_pressed.png + vscroll_grey.png + vscroll_highlight.png + vscroll_up_default.png + vscroll_up_highlight.png + vscroll_up_pressed.png + window.png + window.xml + ) + +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/themes/unity) diff --git a/data/themes/unity/Makefile.am b/data/themes/unity/Makefile.am new file mode 100644 index 000000000..fb91baa5f --- /dev/null +++ b/data/themes/unity/Makefile.am @@ -0,0 +1,51 @@ + +guidir = $(pkgdatadir)/data/themes/unity + +gui_DATA = \ + beingpopup.xml \ + button.png \ + button_disabled.png \ + buttonhi.png \ + buttonpress.png \ + char.xml \ + checkbox.png \ + close_button.png \ + colors.xml \ + deepbox.png \ + window.xml \ + hscroll_left_default.png \ + hscroll_left_highlight.png \ + hscroll_left_pressed.png \ + hscroll_right_default.png \ + hscroll_right_highlight.png \ + hscroll_right_pressed.png \ + item_shortcut_bgr.png \ + itempopup.xml \ + popup.xml \ + progress.png \ + radioin.png \ + radioin_highlight.png \ + radioout.png \ + radioout_highlight.png \ + resize.png \ + selection.png \ + slider.png \ + slider_hilight.png \ + sticky_button.png \ + tab.png \ + tab_hilight.png \ + tabselected.png \ + textpopup.xml \ + vscroll_down_default.png \ + vscroll_down_highlight.png \ + vscroll_down_pressed.png \ + vscroll_grey.png \ + vscroll_highlight.png \ + vscroll_up_default.png \ + vscroll_up_highlight.png \ + vscroll_up_pressed.png \ + window.png + +EXTRA_DIST = \ + $(gui_DATA) \ + CMakeLists.txt diff --git a/data/themes/unity/beingpopup.xml b/data/themes/unity/beingpopup.xml new file mode 100644 index 000000000..215d4528e --- /dev/null +++ b/data/themes/unity/beingpopup.xml @@ -0,0 +1,19 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <!-- <option name="padding" value="5" /> --> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" /> + <part type="top-edge" xpos="11" ypos="0" width="127" height="10" /> + <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="11" width="10" height="81" /> + <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" /> + <part type="right-edge" xpos="139" ypos="11" width="12" height="81" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" /> + <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" /> + <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" /> + </widget> +</skinset> diff --git a/data/themes/unity/button.png b/data/themes/unity/button.png Binary files differnew file mode 100644 index 000000000..5e2bfbfc4 --- /dev/null +++ b/data/themes/unity/button.png diff --git a/data/themes/unity/button_disabled.png b/data/themes/unity/button_disabled.png Binary files differnew file mode 100644 index 000000000..b709473ae --- /dev/null +++ b/data/themes/unity/button_disabled.png diff --git a/data/themes/unity/buttonhi.png b/data/themes/unity/buttonhi.png Binary files differnew file mode 100644 index 000000000..83318d19a --- /dev/null +++ b/data/themes/unity/buttonhi.png diff --git a/data/themes/unity/buttonpress.png b/data/themes/unity/buttonpress.png Binary files differnew file mode 100644 index 000000000..5e2bfbfc4 --- /dev/null +++ b/data/themes/unity/buttonpress.png diff --git a/data/themes/unity/char.xml b/data/themes/unity/char.xml new file mode 100644 index 000000000..215d4528e --- /dev/null +++ b/data/themes/unity/char.xml @@ -0,0 +1,19 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <!-- <option name="padding" value="5" /> --> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" /> + <part type="top-edge" xpos="11" ypos="0" width="127" height="10" /> + <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="11" width="10" height="81" /> + <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" /> + <part type="right-edge" xpos="139" ypos="11" width="12" height="81" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" /> + <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" /> + <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" /> + </widget> +</skinset> diff --git a/data/themes/unity/checkbox.png b/data/themes/unity/checkbox.png Binary files differnew file mode 100644 index 000000000..2b1a1b5ec --- /dev/null +++ b/data/themes/unity/checkbox.png diff --git a/data/themes/unity/close_button.png b/data/themes/unity/close_button.png Binary files differnew file mode 100644 index 000000000..3eb0866be --- /dev/null +++ b/data/themes/unity/close_button.png diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml new file mode 100644 index 000000000..c1bca3d8c --- /dev/null +++ b/data/themes/unity/colors.xml @@ -0,0 +1,69 @@ +<colors> + <color id="TEXT" color="#E0E0E0" /> + <color id="SHADOW" color="#000000" /> + <color id="OUTLINE" color="#000000" /> + <color id="PROGRESS_BAR" color="#ffffff" /> + <color id="BUTTON" color="#FE9750" /> + <color id="BUTTON_DISABLED" color="#FC6400" /> + <color id="TAB" color="#F0F0F0" /> + <color id="PARTY_CHAT_TAB" color="#E0E0E0" /> + <color id="PARTY_SOCIAL_TAB" color="#E0E0E0" /> + <color id="GUILD_CHAT_TAB" color="#E0E0E0" /> + <color id="GUILD_SOCIAL_TAB" color="#E0E0E0" /> + <color id="BACKGROUND" color="#4D4D4D" /> + <color id="BACKGROUND_GRAY" color="#404040" /> + <color id="SCROLLBAR_GRAY" color="#4D4D4D" /> + <color id="DROPDOWN_SHADOW" color="#4D4D4D" /> + <color id="HIGHLIGHT" color="#FE9750" /> + <color id="TAB_FLASH" color="#FC6400" effect="pulse" /> + <color id="TAB_PLAYER_FLASH" color="#FC6400" effect="pulse" /> + <color id="SHOP_WARNING" color="#E0E0E0" /> + <color id="ITEM_EQUIPPED" color="#FFFFFF" /> + <color id="CHAT" color="#E0E0E0" /> + <color id="GM" color="#FFFFFF" /> + <color id="PLAYER" color="#66CCCC" /> + <color id="WHISPER" color="#E0E0E0" /> + <color id="WHISPER_OFFLINE" color="#A8A8A8" /> + <color id="IS" color="#70C600" /> + <color id="SERVER" color="#9966FF" /> + <color id="LOGGER" color="#9966FF" /> + <color id="HYPERLINK" color="#E0E0E0" /> + <color id="UNKNOWN_ITEM" color="#F0F0F0" /> + <color id="CHARM" color="#FFFFFF" /> + <color id="GENERIC" color="#21a5b1" /> + <color id="HEAD" color="#527fa4" /> + <color id="USABLE" color="#268d24" /> + <color id="TORSO" color="#d12aa4" /> + <color id="ONEHAND" color="#f42a2a" /> + <color id="LEGS" color="#699900" /> + <color id="FEET" color="#aa1d48" /> + <color id="TWOHAND" color="#f46d0e" /> + <color id="SHIELD" color="#9c2424" /> + <color id="RING" color="#F0F0F0" /> + <color id="NECKLACE" color="#ff00ff" /> + <color id="ARMS" color="#9c24e8" /> + <color id="AMMO" color="#8b6311" /> + <color id="SERVER_VERSION_NOT_SUPPORTED" color="#DC0000" /> + <color id="WARNING" color="#FC6400" /> + <color id="PLAYER_ADVANCED" color="#FC6400" /> + <color id="ITEM_NOT_EQUIPPED" color="#E0E0E0" /> + + <color id="RED" color="#FFA8A8" /> + <color id="GREEN" color="#59FF6C" /> + <color id="BLUE" color="#00FFFF" /> + <color id="ORANGE" color="#4CFF1C" /> + <color id="YELLOW" color="#f1dc27" /> + <color id="PINK" color="#FF00BF" /> + <color id="PURPLE" color="#8480E2" /> + <color id="GRAY" color="#C1C1C1" /> + <color id="BROWN" color="#05FF2E" /> + + <progressbar id="DEFAULT" color="#969696" /> + <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> + <progressbar id="MP" color="#1a66e6" /> + <progressbar id="NO_MP" color="#646464" /> + <progressbar id="EXP" color="#8fc0d3" /> + <progressbar id="INVY_SLOTS" color="#e1c819" /> + <progressbar id="WEIGHT" color="#0000ff,ffff00,ff0000" /> + <progressbar id="JOB" color="#e187cb" /> +</colors>
\ No newline at end of file diff --git a/data/themes/unity/deepbox.png b/data/themes/unity/deepbox.png Binary files differnew file mode 100644 index 000000000..e6dae6a45 --- /dev/null +++ b/data/themes/unity/deepbox.png diff --git a/data/themes/unity/hscroll_left_default.png b/data/themes/unity/hscroll_left_default.png Binary files differnew file mode 100644 index 000000000..a5e588041 --- /dev/null +++ b/data/themes/unity/hscroll_left_default.png diff --git a/data/themes/unity/hscroll_left_highlight.png b/data/themes/unity/hscroll_left_highlight.png Binary files differnew file mode 100644 index 000000000..38da69a96 --- /dev/null +++ b/data/themes/unity/hscroll_left_highlight.png diff --git a/data/themes/unity/hscroll_left_pressed.png b/data/themes/unity/hscroll_left_pressed.png Binary files differnew file mode 100644 index 000000000..38da69a96 --- /dev/null +++ b/data/themes/unity/hscroll_left_pressed.png diff --git a/data/themes/unity/hscroll_right_default.png b/data/themes/unity/hscroll_right_default.png Binary files differnew file mode 100644 index 000000000..3346f8c95 --- /dev/null +++ b/data/themes/unity/hscroll_right_default.png diff --git a/data/themes/unity/hscroll_right_highlight.png b/data/themes/unity/hscroll_right_highlight.png Binary files differnew file mode 100644 index 000000000..76b62aeba --- /dev/null +++ b/data/themes/unity/hscroll_right_highlight.png diff --git a/data/themes/unity/hscroll_right_pressed.png b/data/themes/unity/hscroll_right_pressed.png Binary files differnew file mode 100644 index 000000000..76b62aeba --- /dev/null +++ b/data/themes/unity/hscroll_right_pressed.png diff --git a/data/themes/unity/item_shortcut_bgr.png b/data/themes/unity/item_shortcut_bgr.png Binary files differnew file mode 100644 index 000000000..03b9b9a79 --- /dev/null +++ b/data/themes/unity/item_shortcut_bgr.png diff --git a/data/themes/unity/itempopup.xml b/data/themes/unity/itempopup.xml new file mode 100644 index 000000000..215d4528e --- /dev/null +++ b/data/themes/unity/itempopup.xml @@ -0,0 +1,19 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <!-- <option name="padding" value="5" /> --> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" /> + <part type="top-edge" xpos="11" ypos="0" width="127" height="10" /> + <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="11" width="10" height="81" /> + <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" /> + <part type="right-edge" xpos="139" ypos="11" width="12" height="81" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" /> + <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" /> + <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" /> + </widget> +</skinset> diff --git a/data/themes/unity/popup.xml b/data/themes/unity/popup.xml new file mode 100644 index 000000000..215d4528e --- /dev/null +++ b/data/themes/unity/popup.xml @@ -0,0 +1,19 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <!-- <option name="padding" value="5" /> --> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" /> + <part type="top-edge" xpos="11" ypos="0" width="127" height="10" /> + <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="11" width="10" height="81" /> + <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" /> + <part type="right-edge" xpos="139" ypos="11" width="12" height="81" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" /> + <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" /> + <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" /> + </widget> +</skinset> diff --git a/data/themes/unity/progress.png b/data/themes/unity/progress.png Binary files differnew file mode 100644 index 000000000..47c0724d4 --- /dev/null +++ b/data/themes/unity/progress.png diff --git a/data/themes/unity/radioin.png b/data/themes/unity/radioin.png Binary files differnew file mode 100644 index 000000000..7c82fe0e0 --- /dev/null +++ b/data/themes/unity/radioin.png diff --git a/data/themes/unity/radioin_highlight.png b/data/themes/unity/radioin_highlight.png Binary files differnew file mode 100644 index 000000000..bdc5decd3 --- /dev/null +++ b/data/themes/unity/radioin_highlight.png diff --git a/data/themes/unity/radioout.png b/data/themes/unity/radioout.png Binary files differnew file mode 100644 index 000000000..7fa4f97c4 --- /dev/null +++ b/data/themes/unity/radioout.png diff --git a/data/themes/unity/radioout_highlight.png b/data/themes/unity/radioout_highlight.png Binary files differnew file mode 100644 index 000000000..c43d19b9a --- /dev/null +++ b/data/themes/unity/radioout_highlight.png diff --git a/data/themes/unity/resize.png b/data/themes/unity/resize.png Binary files differnew file mode 100644 index 000000000..15f3fb9dd --- /dev/null +++ b/data/themes/unity/resize.png diff --git a/data/themes/unity/selection.png b/data/themes/unity/selection.png Binary files differnew file mode 100644 index 000000000..0dfceb7c5 --- /dev/null +++ b/data/themes/unity/selection.png diff --git a/data/themes/unity/slider.png b/data/themes/unity/slider.png Binary files differnew file mode 100644 index 000000000..1762289b6 --- /dev/null +++ b/data/themes/unity/slider.png diff --git a/data/themes/unity/slider_hilight.png b/data/themes/unity/slider_hilight.png Binary files differnew file mode 100644 index 000000000..99cda32d8 --- /dev/null +++ b/data/themes/unity/slider_hilight.png diff --git a/data/themes/unity/sticky_button.png b/data/themes/unity/sticky_button.png Binary files differnew file mode 100644 index 000000000..bed1b0a91 --- /dev/null +++ b/data/themes/unity/sticky_button.png diff --git a/data/themes/unity/tab.png b/data/themes/unity/tab.png Binary files differnew file mode 100644 index 000000000..8b473466d --- /dev/null +++ b/data/themes/unity/tab.png diff --git a/data/themes/unity/tab_hilight.png b/data/themes/unity/tab_hilight.png Binary files differnew file mode 100644 index 000000000..2c2f84ed0 --- /dev/null +++ b/data/themes/unity/tab_hilight.png diff --git a/data/themes/unity/tabselected.png b/data/themes/unity/tabselected.png Binary files differnew file mode 100644 index 000000000..b2ad6ed13 --- /dev/null +++ b/data/themes/unity/tabselected.png diff --git a/data/themes/unity/textpopup.xml b/data/themes/unity/textpopup.xml new file mode 100644 index 000000000..215d4528e --- /dev/null +++ b/data/themes/unity/textpopup.xml @@ -0,0 +1,19 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <!-- <option name="padding" value="5" /> --> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" /> + <part type="top-edge" xpos="11" ypos="0" width="127" height="10" /> + <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="11" width="10" height="81" /> + <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" /> + <part type="right-edge" xpos="139" ypos="11" width="12" height="81" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" /> + <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" /> + <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" /> + </widget> +</skinset> diff --git a/data/themes/unity/vscroll_down_default.png b/data/themes/unity/vscroll_down_default.png Binary files differnew file mode 100644 index 000000000..d7e6b61ac --- /dev/null +++ b/data/themes/unity/vscroll_down_default.png diff --git a/data/themes/unity/vscroll_down_highlight.png b/data/themes/unity/vscroll_down_highlight.png Binary files differnew file mode 100644 index 000000000..e3e5dbf3b --- /dev/null +++ b/data/themes/unity/vscroll_down_highlight.png diff --git a/data/themes/unity/vscroll_down_pressed.png b/data/themes/unity/vscroll_down_pressed.png Binary files differnew file mode 100644 index 000000000..e3e5dbf3b --- /dev/null +++ b/data/themes/unity/vscroll_down_pressed.png diff --git a/data/themes/unity/vscroll_grey.png b/data/themes/unity/vscroll_grey.png Binary files differnew file mode 100644 index 000000000..f18e7058d --- /dev/null +++ b/data/themes/unity/vscroll_grey.png diff --git a/data/themes/unity/vscroll_highlight.png b/data/themes/unity/vscroll_highlight.png Binary files differnew file mode 100644 index 000000000..157502dbc --- /dev/null +++ b/data/themes/unity/vscroll_highlight.png diff --git a/data/themes/unity/vscroll_up_default.png b/data/themes/unity/vscroll_up_default.png Binary files differnew file mode 100644 index 000000000..2b559dfda --- /dev/null +++ b/data/themes/unity/vscroll_up_default.png diff --git a/data/themes/unity/vscroll_up_highlight.png b/data/themes/unity/vscroll_up_highlight.png Binary files differnew file mode 100644 index 000000000..f2b171d83 --- /dev/null +++ b/data/themes/unity/vscroll_up_highlight.png diff --git a/data/themes/unity/vscroll_up_pressed.png b/data/themes/unity/vscroll_up_pressed.png Binary files differnew file mode 100644 index 000000000..f2b171d83 --- /dev/null +++ b/data/themes/unity/vscroll_up_pressed.png diff --git a/data/themes/unity/window.png b/data/themes/unity/window.png Binary files differnew file mode 100644 index 000000000..c325c1f2e --- /dev/null +++ b/data/themes/unity/window.png diff --git a/data/themes/unity/window.xml b/data/themes/unity/window.xml new file mode 100644 index 000000000..410d07b4c --- /dev/null +++ b/data/themes/unity/window.xml @@ -0,0 +1,19 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <option name="padding" value="10" /> + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" /> + <part type="top-edge" xpos="11" ypos="0" width="127" height="10" /> + <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="11" width="10" height="81" /> + <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" /> + <part type="right-edge" xpos="139" ypos="11" width="12" height="81" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" /> + <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" /> + <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" /> + </widget> +</skinset> diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 7e9a45a62..baa7930a4 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -238,6 +238,7 @@ Section "Core files (required)" SecCore CreateDirectory "$INSTDIR\data\themes\mana" CreateDirectory "$INSTDIR\data\themes\pink" CreateDirectory "$INSTDIR\data\themes\redandblack" + CreateDirectory "$INSTDIR\data\themes\unity" CreateDirectory "$INSTDIR\data\themes\wood" CreateDirectory "$INSTDIR\docs" @@ -293,6 +294,9 @@ Section "Core files (required)" SecCore SetOutPath "$INSTDIR\data\themes\redandblack" File "${SRCDIR}\data\themes\redandblack\*.png" File "${SRCDIR}\data\themes\redandblack\*.xml" + SetOutPath "$INSTDIR\data\themes\unity" + File "${SRCDIR}\data\themes\unity\*.png" + File "${SRCDIR}\data\themes\unity\*.xml" SetOutPath "$INSTDIR\data\themes\wood" File "${SRCDIR}\data\themes\wood\*.png" File "${SRCDIR}\data\themes\wood\*.xml" @@ -5,7 +5,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.9.4" \ + -DPRODUCT_VERSION="1.1.9.18" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/po/LINGUAS b/po/LINGUAS index 66da28559..44b6e67b7 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -2,7 +2,7 @@ #ar # Disabled because of current client limitations (shaping, RTL) #bg # Not enough translations #ca # Not enough translations -#cs # Not enough translations +cs #da # Not enough translations de #en_GB # Not enough translations @@ -1,236 +1,254 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. -# +# +# Translators: # Andrei Karas <akaras@inbox.ru>, 2011. +# Pitriss <chytrex@wjake.com>, 2011. +# Pitriss V <chytrex_fsude@centrum.cz>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-08-10 01:11+0300\n" -"PO-Revision-Date: 2011-08-09 22:16+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-17 13:43+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/" +"cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" -msgstr "" +msgstr "Viditelný na mapě" -#: src/being.cpp:542 +#: src/being.cpp:548 msgid "dodge" -msgstr "" +msgstr "úskočil" -#: src/being.cpp:542 +#: src/being.cpp:548 msgid "miss" -msgstr "" +msgstr "minul" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1514 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1519 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Nastavení" -#: src/client.cpp:908 -msgid "Connecting to server" +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "Výkon" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Video" + +#: src/client.cpp:851 +msgid "Themes" msgstr "" -#: src/client.cpp:939 +#: src/client.cpp:932 +msgid "Connecting to server" +msgstr "Připojuji se k serveru" + +#: src/client.cpp:963 msgid "Logging in" -msgstr "" +msgstr "Přihlašuji se" -#: src/client.cpp:972 +#: src/client.cpp:996 msgid "Entering game world" -msgstr "" +msgstr "Vstupuji do herního světa" -#: src/client.cpp:1072 +#: src/client.cpp:1096 msgid "Requesting characters" -msgstr "" +msgstr "Požaduji postavy" -#: src/client.cpp:1103 +#: src/client.cpp:1127 msgid "Connecting to the game server" -msgstr "" +msgstr "Připojuji se k hernímu serveru" -#: src/client.cpp:1113 +#: src/client.cpp:1137 msgid "Changing game servers" -msgstr "" +msgstr "Zaměňuji herní servery" -#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254 -#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392 +#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253 +#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Chyba" -#: src/client.cpp:1166 +#: src/client.cpp:1196 msgid "Requesting registration details" -msgstr "" +msgstr "Požaduji registrační detaily" -#: src/client.cpp:1193 +#: src/client.cpp:1222 msgid "Password Change" -msgstr "" +msgstr "Změna hesla" -#: src/client.cpp:1194 +#: src/client.cpp:1223 msgid "Password changed successfully!" -msgstr "" +msgstr "Heslo úspěšně změněno!" -#: src/client.cpp:1213 +#: src/client.cpp:1242 msgid "Email Change" -msgstr "" +msgstr "Změna emailu" -#: src/client.cpp:1214 +#: src/client.cpp:1243 msgid "Email changed successfully!" -msgstr "" +msgstr "Email úspěšně změněn!" -#: src/client.cpp:1234 +#: src/client.cpp:1263 msgid "Unregister Successful" -msgstr "" +msgstr "Zrušení registrace úspěšné" -#: src/client.cpp:1235 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." -msgstr "" +msgstr "Nashledanou, vraťte se kdykoli..." -#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498 -#: src/client.cpp:1919 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1629 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" -msgstr "" +msgstr "Neplatný host updatů: %s" -#: src/client.cpp:1663 src/client.cpp:1669 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" -msgstr "" +msgstr "Chyba při vytváření adresáře s updaty!" -#: src/client.cpp:1690 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." -msgstr "" +msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji." -#: src/commandhandler.cpp:301 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Neznámý příkaz." -#: src/commandhandler.cpp:401 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" -msgstr "" +msgstr "Nelze zaslat prázdné šeptání!" -#: src/commandhandler.cpp:409 +#: src/commandhandler.cpp:309 #, c-format msgid "" -"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is" -" you." +"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " +"you." 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:429 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." -msgstr "" +msgstr "Chybí jméno party." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." -msgstr "" +msgstr "Chybí jméno guildy." -#: src/commandhandler.cpp:469 src/commandhandler.cpp:576 -#: src/commandhandler.cpp:617 src/commandhandler.cpp:647 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." -msgstr "" +msgstr "Prosím zadej jméno." -#: src/commandhandler.cpp:510 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." -msgstr "" +msgstr "Enter přepíná chat." -#: src/commandhandler.cpp:510 +#: src/commandhandler.cpp:415 msgid "Message closes chat." -msgstr "" +msgstr "Zpráva zavírá chat." -#: src/commandhandler.cpp:521 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." -msgstr "" +msgstr "Enter nyní přepíná chat." -#: src/commandhandler.cpp:527 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." -msgstr "" +msgstr "Zpráva nyní ukončuje chat." -#: src/commandhandler.cpp:555 +#: src/commandhandler.cpp:460 msgid "friend" -msgstr "" +msgstr "přítel" -#: src/commandhandler.cpp:560 +#: src/commandhandler.cpp:465 msgid "disregarded" -msgstr "" +msgstr "přehlížený" -#: src/commandhandler.cpp:565 +#: src/commandhandler.cpp:470 msgid "neutral" -msgstr "" +msgstr "neutrální" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" -msgstr "" +msgstr "Hráč je již %s!" -#: src/commandhandler.cpp:598 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" -msgstr "" +msgstr "Hráč byl úspěšně zařazen jako %s!" -#: src/commandhandler.cpp:606 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" -msgstr "" +msgstr "Hráč nemůže být zařazen jako %s!" -#: src/commandhandler.cpp:628 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" -msgstr "" +msgstr "Hráč nebyl ignorován!" -#: src/commandhandler.cpp:635 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" -msgstr "" +msgstr "Hráč již není ignorován!" -#: src/commandhandler.cpp:637 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" -msgstr "" +msgstr "Hráč nemůže být odignorován!" -#: src/commandhandler.cpp:654 +#: src/commandhandler.cpp:559 msgid "Player already erased!" -msgstr "" +msgstr "Hráč již byl vymazán!" -#: src/commandhandler.cpp:665 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" -msgstr "" +msgstr "Hráč byl úspěšně vymazán!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" -msgstr "" +msgstr "Hráč nemůže být vymazán!" -#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" -msgstr "" +msgstr "Doba běhu klienta: %s" -#: src/commandhandler.cpp:970 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -238,7 +256,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:979 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" @@ -246,7 +264,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:987 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -254,7 +272,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:995 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -262,7 +280,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1003 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -270,27 +288,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1082 +#: src/commandhandler.cpp:994 msgid "font cache size" -msgstr "" +msgstr "velikost chache fontů" -#: src/commandhandler.cpp:1094 +#: src/commandhandler.cpp:1006 msgid "Cache size:" -msgstr "" +msgstr "Velikost cache:" -#: src/commandhandler.cpp:1098 +#: src/commandhandler.cpp:1010 msgid "Created:" -msgstr "" +msgstr "Vytvořeno:" -#: src/commandhandler.cpp:1100 +#: src/commandhandler.cpp:1012 msgid "Deleted:" -msgstr "" +msgstr "Odstraněno:" -#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -299,168 +317,169 @@ msgstr "" msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "" -#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409 msgid "General" msgstr "" -#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411 msgid "Debug" msgstr "" -#: src/game.cpp:475 +#: src/game.cpp:513 msgid "Screenshot saved as " -msgstr "" +msgstr "Snímky obrazovky ukládat jako " -#: src/game.cpp:483 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Ukládání snímku obrazovky selhalo!" -#: src/game.cpp:523 +#: src/game.cpp:560 msgid "The connection to the server was lost." -msgstr "" +msgstr "Spojení se serverem bylo ztraceno." -#: src/game.cpp:537 +#: src/game.cpp:571 msgid "Network Error" msgstr "Chyba sítě" -#: src/game.cpp:1184 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Ignorovat příchozí žádosti o obchodování" -#: src/game.cpp:1191 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Akceptovat příchozí žádosti o obchodování" -#: src/game.cpp:1576 +#: src/game.cpp:1729 msgid "Could Not Load Map" -msgstr "" +msgstr "Nelze načíst mapu" -#: src/game.cpp:1577 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Chyba při načítání %s" -#: src/gui/beingpopup.cpp:118 +#: src/gui/beingpopup.cpp:124 #, c-format msgid "Party: %s" -msgstr "" +msgstr "Parta: %s" -#: src/gui/beingpopup.cpp:132 +#: src/gui/beingpopup.cpp:138 #, c-format msgid "Guild: %s" -msgstr "" +msgstr "Guilda: %s" -#: src/gui/beingpopup.cpp:145 +#: src/gui/beingpopup.cpp:151 #, c-format msgid "Pvp rank: %d" -msgstr "" +msgstr "Pvp hodnost: %d" -#: src/gui/beingpopup.cpp:156 +#: src/gui/beingpopup.cpp:162 #, c-format msgid "Comment: %s" -msgstr "" +msgstr "Komentář: %s" #: src/gui/botcheckerwindow.cpp:266 msgid "Bot Checker" -msgstr "" +msgstr "Ověřovač botů" #: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Jméno" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130 -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604 -#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266 +#: 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 msgid "Attack" msgstr "Útok" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" -msgstr "" +msgstr "Mluvit" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241 -#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661 +#: 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 msgid "Move" msgstr "" #: src/gui/botcheckerwindow.cpp:300 msgid "Result" -msgstr "" +msgstr "Výsledek" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" -msgstr "Reset" +msgstr "Vynulovat" -#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97 +#: 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:277 src/gui/popupmenu.cpp:675 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Nákup" -#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302 -#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324 +#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303 +#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325 #, c-format msgid "Price: %s / Total: %s" -msgstr "" +msgstr "Cena: %s / Celkem %s" #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. -#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113 -#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940 +#: src/gui/buydialog.cpp:94 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 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:96 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952 +#: src/gui/buydialog.cpp:97 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 msgid "-" msgstr "" -#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49 -#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55 -#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285 +#: src/gui/buydialog.cpp:99 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 msgid "Quit" msgstr "Ukončit" -#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94 -#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539 -#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970 +#: 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 msgid "Max" msgstr "Vše" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Obchod" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258 -#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 -#: src/gui/selldialog.cpp:92 +#: src/gui/selldialog.cpp:93 msgid "Sell" msgstr "Prodej" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 -#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93 +#: 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:330 -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499 -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760 -#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675 -#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774 -#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849 -#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935 -#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70 -#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updatewindow.cpp:157 +#: src/gui/updaterwindow.cpp:161 msgid "Cancel" msgstr "Zrušit" @@ -475,24 +494,24 @@ msgstr "Účet: %s" #: src/gui/changeemaildialog.cpp:54 msgid "Type new email address twice:" -msgstr "" +msgstr "Zadej novou emailovou adresu dvakrát:" #: src/gui/changeemaildialog.cpp:132 #, c-format msgid "The new email address needs to be at least %d characters long." -msgstr "" +msgstr "Nová emailová adresa musí být nejméně %d znaků dlouhá." #: src/gui/changeemaildialog.cpp:139 #, c-format msgid "The new email address needs to be less than %d characters long." -msgstr "" +msgstr "Nová emailová adresa musí být méně než %d znaků dlouhá." #: src/gui/changeemaildialog.cpp:146 msgid "The email address entries mismatch." -msgstr "" +msgstr "Emailové adresy nesouhlasí." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:140 +#: src/gui/charselectdialog.cpp:139 msgid "Change Password" msgstr "Změnit heslo" @@ -503,209 +522,210 @@ msgstr "Heslo:" #: src/gui/changepassworddialog.cpp:66 msgid "Type new password twice:" -msgstr "" +msgstr "Zadej nové heslo dvakrát:" #: src/gui/changepassworddialog.cpp:114 msgid "Enter the old password first." -msgstr "" +msgstr "Nejdřív zadej původní heslo." #: src/gui/changepassworddialog.cpp:120 #, c-format msgid "The new password needs to be at least %d characters long." -msgstr "" +msgstr "Nové heslo musí být nejméně %d znaků dlouhé." #: src/gui/changepassworddialog.cpp:127 #, c-format msgid "The new password needs to be less than %d characters long." -msgstr "" +msgstr "Nové heslo musí být méně než.%d znaků dlouhé." #: src/gui/changepassworddialog.cpp:134 msgid "The new password entries mismatch." -msgstr "" +msgstr "Nová hesla nesouhlasí." #: src/gui/charcreatedialog.cpp:58 msgid "Create Character" msgstr "Vytvořit postavu" -#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94 +#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94 #: src/gui/register.cpp:75 msgid "Name:" msgstr "Jméno:" #. TRANSLATORS: This is a narrow symbol used to denote 'next'. #. You may change this symbol if your language uses another. -#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81 -#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81 +#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84 +#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85 msgid ">" msgstr "" #. TRANSLATORS: This is a narrow symbol used to denote 'previous'. #. You may change this symbol if your language uses another. -#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82 -#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80 +#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85 +#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84 msgid "<" msgstr "" -#: src/gui/charcreatedialog.cpp:80 +#: src/gui/charcreatedialog.cpp:83 msgid "Hair color:" -msgstr "" +msgstr "Barva vlasů:" -#: src/gui/charcreatedialog.cpp:83 +#: src/gui/charcreatedialog.cpp:86 msgid "Hair style:" -msgstr "" +msgstr "Účes:" -#: src/gui/charcreatedialog.cpp:89 +#: src/gui/charcreatedialog.cpp:92 msgid "Race:" -msgstr "" +msgstr "Rasa:" -#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479 -#: src/gui/socialwindow.cpp:1033 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 +#: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Vytvořit" -#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98 +#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98 msgid "Male" msgstr "Muž" -#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99 +#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99 msgid "Female" msgstr "Žena" -#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300 +#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303 #, c-format msgid "Please distribute %d points" msgstr "Rozdělte prosím %d bodů" -#: src/gui/charcreatedialog.cpp:219 +#: src/gui/charcreatedialog.cpp:222 msgid "Your name needs to be at least 4 characters." msgstr "Vaše jméno musí mít nejméně 4 znaky." -#: src/gui/charcreatedialog.cpp:291 +#: src/gui/charcreatedialog.cpp:294 msgid "Character stats OK" -msgstr "" +msgstr "Stav postavy je OK" -#: src/gui/charcreatedialog.cpp:305 +#: src/gui/charcreatedialog.cpp:308 #, c-format msgid "Please remove %d points" -msgstr "Odstraňte prosím %d bodů." +msgstr "Odstraňte prosím %d bodů" -#: src/gui/charselectdialog.cpp:77 +#: src/gui/charselectdialog.cpp:76 msgid "Confirm Character Delete" msgstr "Potvrďte smazání postavy" -#: src/gui/charselectdialog.cpp:78 +#: src/gui/charselectdialog.cpp:77 msgid "Are you sure you want to delete this character?" msgstr "Jste si jistí, že chcete smazat tuto postavu?" -#: src/gui/charselectdialog.cpp:126 +#: src/gui/charselectdialog.cpp:125 msgid "Account and Character Management" msgstr "Správa účtu a postavy" -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:138 msgid "Switch Login" -msgstr "" +msgstr "Přepnout přihlášení" -#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Zrušit registraci" -#: src/gui/charselectdialog.cpp:162 +#: src/gui/charselectdialog.cpp:161 msgid "Change Email" -msgstr "" +msgstr "Změnit email" -#: src/gui/charselectdialog.cpp:254 +#: src/gui/charselectdialog.cpp:253 msgid "Incorrect password" -msgstr "" +msgstr "Špatné heslo" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:286 msgid "Enter password for deleting character" -msgstr "" +msgstr "Zadej heslo pro smazání postavy" -#: src/gui/charselectdialog.cpp:287 +#: src/gui/charselectdialog.cpp:286 msgid "Enter password:" -msgstr "" +msgstr "Zadej heslo:" -#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289 -#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120 -#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241 +#: 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 msgid "Delete" msgstr "Smazat" -#: src/gui/charselectdialog.cpp:467 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" -msgstr "" +msgstr "Vybrat" -#: src/gui/charselectdialog.cpp:470 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "" -#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" -msgstr "" +msgstr "výchozí" #: src/gui/chatwindow.cpp:113 msgid "black" -msgstr "" +msgstr "černá" #: src/gui/chatwindow.cpp:114 msgid "red" -msgstr "" +msgstr "červená" #: src/gui/chatwindow.cpp:115 msgid "green" -msgstr "" +msgstr "zelená" #: src/gui/chatwindow.cpp:116 msgid "blue" -msgstr "" +msgstr "modrá" #: src/gui/chatwindow.cpp:117 msgid "gold" -msgstr "" +msgstr "zlatá" #: src/gui/chatwindow.cpp:118 msgid "yellow" -msgstr "" +msgstr "žlutá" #: src/gui/chatwindow.cpp:119 msgid "pink" -msgstr "" +msgstr "růžová" #: src/gui/chatwindow.cpp:120 msgid "purple" -msgstr "" +msgstr "fialová" #: src/gui/chatwindow.cpp:121 msgid "grey" -msgstr "" +msgstr "šedá" #: src/gui/chatwindow.cpp:122 msgid "brown" -msgstr "" +msgstr "hnědá" #: src/gui/chatwindow.cpp:123 msgid "rainbow 1" -msgstr "" +msgstr "duhová 1" #: src/gui/chatwindow.cpp:124 msgid "rainbow 2" -msgstr "" +msgstr "duhová 2" #: src/gui/chatwindow.cpp:125 msgid "rainbow 3" -msgstr "" - -#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93 -#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220 -#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -713,15 +733,15 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:605 +#: src/gui/chatwindow.cpp:609 #, c-format msgid "Present: %s; %d players are present." -msgstr "" +msgstr "Přítomno: %s; %d hráčů je přítomno." -#: src/gui/chatwindow.cpp:988 +#: src/gui/chatwindow.cpp:996 #, c-format msgid "Whispering to %s: %s" -msgstr "" +msgstr "Šeptání pro %s: %s" #: src/gui/confirmdialog.cpp:47 msgid "Yes" @@ -732,183 +752,183 @@ msgid "No" msgstr "Ne" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619 -#: src/gui/popupmenu.cpp:627 +#: 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 msgid "Ignore" -msgstr "" +msgstr "Ignorovat" -#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96 -#: src/gui/setup_other.cpp:65 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 +#: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Mapa" -#: src/gui/debugwindow.cpp:71 +#: src/gui/debugwindow.cpp:73 msgid "Target" -msgstr "" +msgstr "Cíl" -#: src/gui/debugwindow.cpp:72 +#: src/gui/debugwindow.cpp:74 msgid "Net" -msgstr "" +msgstr "Síť" -#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220 -#: src/gui/debugwindow.cpp:249 +#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222 +#: src/gui/debugwindow.cpp:251 msgid "Music:" -msgstr "" +msgstr "Hudba:" -#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224 -#: src/gui/debugwindow.cpp:251 +#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226 +#: src/gui/debugwindow.cpp:253 msgid "Map:" -msgstr "" +msgstr "Mapa:" -#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222 -#: src/gui/debugwindow.cpp:250 +#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224 +#: src/gui/debugwindow.cpp:252 msgid "Minimap:" -msgstr "" +msgstr "Minimapa:" -#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218 -#: src/gui/debugwindow.cpp:247 +#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220 +#: src/gui/debugwindow.cpp:249 msgid "Cursor:" -msgstr "" +msgstr "Kurzor:" -#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201 -#: src/gui/debugwindow.cpp:206 +#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203 +#: src/gui/debugwindow.cpp:208 msgid "Player Position:" -msgstr "" +msgstr "Pozice hráče:" -#: src/gui/debugwindow.cpp:152 +#: src/gui/debugwindow.cpp:154 msgid "Particle count:" -msgstr "" +msgstr "Počet částic:" -#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235 -#: src/gui/debugwindow.cpp:254 +#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237 +#: src/gui/debugwindow.cpp:256 msgid "Map actors count:" msgstr "" -#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173 +#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175 #, c-format msgid "%d FPS (Software)" msgstr "" -#: src/gui/debugwindow.cpp:166 +#: src/gui/debugwindow.cpp:168 #, c-format msgid "%d FPS (fast OpenGL)" msgstr "" -#: src/gui/debugwindow.cpp:169 +#: src/gui/debugwindow.cpp:171 #, c-format msgid "%d FPS (old OpenGL)" msgstr "" -#: src/gui/debugwindow.cpp:176 +#: src/gui/debugwindow.cpp:178 #, c-format msgid "%d FPS" msgstr "" -#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240 +#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242 msgid "Textures count:" -msgstr "" +msgstr "Počet textur:" -#: src/gui/debugwindow.cpp:231 +#: src/gui/debugwindow.cpp:233 #, c-format msgid "Particle count: %d" -msgstr "" +msgstr "poet částic: %d" -#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299 -#: src/gui/debugwindow.cpp:343 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 +#: src/gui/debugwindow.cpp:345 msgid "Target:" -msgstr "" +msgstr "Cíl:" -#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304 -#: src/gui/debugwindow.cpp:344 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 +#: src/gui/debugwindow.cpp:346 msgid "Target Id:" -msgstr "" +msgstr "Id cíle:" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308 -#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 +#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 msgid "Target Level:" -msgstr "" +msgstr "Úroveň cíle:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 +#: src/gui/debugwindow.cpp:348 msgid "Target Party:" -msgstr "" +msgstr "Parta cíle:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319 -#: src/gui/debugwindow.cpp:347 +#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 +#: src/gui/debugwindow.cpp:349 msgid "Target Guild:" -msgstr "" +msgstr "Gilda cíle:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333 -#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348 +#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 +#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 msgid "Attack delay:" -msgstr "" +msgstr "Prodleva útoku:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323 -#: src/gui/debugwindow.cpp:349 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 +#: src/gui/debugwindow.cpp:351 msgid "Minimal hit:" -msgstr "" +msgstr "Minimální zásah:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 +#: src/gui/debugwindow.cpp:352 msgid "Maximum hit:" -msgstr "" +msgstr "Maximální zásah:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 +#: src/gui/debugwindow.cpp:353 msgid "Critical hit:" -msgstr "" +msgstr "Kritický zásah:" -#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390 +#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 #, c-format msgid "Ping: %s ms" -msgstr "" +msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:393 +#: src/gui/debugwindow.cpp:395 #, c-format msgid "In: %d bytes/s" -msgstr "" +msgstr "Příchozí: %d bytes/s" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:397 #, c-format msgid "Out: %d bytes/s" -msgstr "" +msgstr "Odchozí: %d bytes/s" #: src/gui/didyouknowwindow.cpp:47 msgid "Did You Know?" -msgstr "" +msgstr "Víte že ... ?" -#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57 -#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111 +#: 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 msgid "Close" -msgstr "" +msgstr "Zavřít" -#: src/gui/didyouknowwindow.cpp:62 +#: src/gui/didyouknowwindow.cpp:64 msgid "< Previous" -msgstr "" +msgstr "< Předchozí" -#: src/gui/didyouknowwindow.cpp:63 +#: src/gui/didyouknowwindow.cpp:65 msgid "Next >" -msgstr "" +msgstr "Další >" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:66 msgid "Auto open this window" -msgstr "" +msgstr "Automaticky otevírat toto okno" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" -#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74 +#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74 msgid "Equipment" msgstr "Vybavení" -#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130 -#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520 -#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701 -#: src/gui/popupmenu.cpp:1746 +#: 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 msgid "Unequip" msgstr "Odstranit z vybavení" @@ -916,80 +936,88 @@ msgstr "Odstranit z vybavení" msgid "Help" msgstr "Pomoc" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 -#: src/inventory.cpp:246 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "dle jména" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "dle id" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "dle váhy" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "dle množství" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "dle typu" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 +#: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventář" -#: src/gui/inventorywindow.cpp:104 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Sloty:" -#: src/gui/inventorywindow.cpp:115 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" -msgstr "" +msgstr "Filtr:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" -msgstr "" - -#: src/gui/inventorywindow.cpp:122 -msgid "na" -msgstr "" - -#: src/gui/inventorywindow.cpp:123 -msgid "az" -msgstr "" - -#: src/gui/inventorywindow.cpp:124 -msgid "id" -msgstr "" +msgstr "Třídit:" -#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513 -#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608 -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748 +#: 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 msgid "Equip" msgstr "Vybavit" -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611 -#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1751 +#: 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 msgid "Use" msgstr "Použít" -#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619 -#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712 -#: src/gui/popupmenu.cpp:1755 +#: 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 msgid "Drop..." -msgstr "" +msgstr "Upustit..." -#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624 -#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Rozdělit" -#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59 -#: src/gui/popupmenu.cpp:508 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" -msgstr "" +msgstr "Výstroje" -#: src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Hmotnost:" -#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610 -#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724 -#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71 +#: 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 msgid "Store" -msgstr "" +msgstr "Uložit" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" -msgstr "" +msgstr "Vzít" -#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Upustit" @@ -1008,86 +1036,86 @@ msgstr "Vyberte množství předmětů, které chcete upustit." #: src/gui/itemamountwindow.cpp:267 msgid "Select amount of items to store." -msgstr "" +msgstr "Vyberte množství předmětů, které chcete uskladnit." #: src/gui/itemamountwindow.cpp:270 msgid "Select amount of items to retrieve." -msgstr "" +msgstr "Vyberte množství předmětů, které chcete obdržet." #: src/gui/itemamountwindow.cpp:273 msgid "Select amount of items to split." -msgstr "" +msgstr "Vyberte množství předmětů, které chcete rozdělit." #: src/gui/itemamountwindow.cpp:276 msgid "Add to buy shop." -msgstr "" +msgstr "Přidat k nákupu." #: src/gui/itemamountwindow.cpp:279 msgid "Add to sell shop." -msgstr "" +msgstr "Přidat k prodeji." #: src/gui/itemamountwindow.cpp:282 msgid "Unknown." -msgstr "" +msgstr "Neznámý." -#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182 +#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183 msgid ", " msgstr "" -#: src/gui/itempopup.cpp:192 +#: src/gui/itempopup.cpp:193 #, c-format msgid "Weight: %s" -msgstr "" +msgstr "Váha: %s" #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69 msgid "Kill stats" -msgstr "" +msgstr "Statistiky zabíjení" -#: src/gui/killstats.cpp:64 +#: src/gui/killstats.cpp:67 msgid "Reset stats" -msgstr "" +msgstr "Resetovat statistiky" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:68 msgid "Reset timer" -msgstr "" +msgstr "Reset časomíry" -#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" -msgstr "" +msgstr "Úroveň: %d při %f%%" -#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" -msgstr "" +msgstr "Exp: %d/%d Zbývá: %d" -#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216 -#: src/gui/killstats.cpp:225 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" -msgstr "" +msgstr "1%% = %d exp, prům. mobů na 1%%: %s" -#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142 -#: src/gui/killstats.cpp:234 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" -msgstr "" +msgstr "Zabitých: %s, celkem exp %s" -#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144 -#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" -msgstr "" +msgstr "Prům exp: %s, Počet prům mobů na další úroveň: %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162 -#: src/gui/killstats.cpp:237 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" -msgstr "" +msgstr "Zabitých/Min: %s, Exp/Min: %s" -#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 -#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305 -#: src/gui/killstats.cpp:323 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" @@ -1095,7 +1123,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" @@ -1103,31 +1131,35 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" -msgstr "" +msgstr "Exp za poslední zabití:" -#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355 -#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367 -#: src/gui/killstats.cpp:372 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" -msgstr "" +msgstr "Čas do zrození Jack O:" -#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301 -#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318 -#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" -msgstr "" +msgstr "Čas do další úrovně: %s" -#: src/gui/killstats.cpp:361 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:367 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" -msgstr "" +msgstr "Jack O se rodí" + +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 +msgid "You have left the guild." +msgstr "Opustil jsi gildu." #: src/gui/logindialog.cpp:59 msgid "Normal" @@ -1135,32 +1167,32 @@ msgstr "" #: src/gui/logindialog.cpp:60 msgid "Auto Close" -msgstr "" +msgstr "Automaticky zavírat" #: src/gui/logindialog.cpp:61 msgid "Skip" -msgstr "" +msgstr "Přeskočit" #: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123 msgid "Login" msgstr "Přihlášení" -#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243 +#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252 #: src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Server:" #: src/gui/logindialog.cpp:96 msgid "Custom update host" -msgstr "" +msgstr "Vlastní host updatů" #: src/gui/logindialog.cpp:110 msgid "Remember username" -msgstr "" +msgstr "Pamatovat přihlášení" #: src/gui/logindialog.cpp:111 msgid "Update:" -msgstr "" +msgstr "Updaty:" #: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" @@ -1168,47 +1200,47 @@ msgstr "Registrace" #: src/gui/logindialog.cpp:122 msgid "Change Server" -msgstr "" +msgstr "Změnit server" -#: src/gui/ministatus.cpp:59 +#: src/gui/ministatuswindow.cpp:59 msgid "health bar" -msgstr "" +msgstr "pruh zdraví" -#: src/gui/ministatus.cpp:65 +#: src/gui/ministatuswindow.cpp:65 msgid "mana bar" -msgstr "" +msgstr "pruh many" -#: src/gui/ministatus.cpp:77 +#: src/gui/ministatuswindow.cpp:77 msgid "experience bar" -msgstr "" +msgstr "pruh zkušeností" -#: src/gui/ministatus.cpp:83 +#: src/gui/ministatuswindow.cpp:83 msgid "job bar" -msgstr "" +msgstr "pruh práce" -#: src/gui/ministatus.cpp:92 +#: src/gui/ministatuswindow.cpp:92 msgid "weight bar" -msgstr "" +msgstr "pruh váhy" -#: src/gui/ministatus.cpp:95 +#: src/gui/ministatuswindow.cpp:95 msgid "inventory slots bar" -msgstr "" +msgstr "pruh slotů inventáře" -#: src/gui/ministatus.cpp:98 +#: src/gui/ministatuswindow.cpp:98 msgid "money bar" -msgstr "" +msgstr "pruh peněz" -#: src/gui/ministatus.cpp:101 +#: src/gui/ministatuswindow.cpp:101 msgid "arrows bar" -msgstr "" +msgstr "pruh šípů" -#: src/gui/ministatus.cpp:104 +#: src/gui/ministatuswindow.cpp:104 msgid "status bar" -msgstr "" +msgstr "stavový řádek" -#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336 +#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336 msgid "Need" -msgstr "" +msgstr "Potřebuješ" #: src/gui/npcdialog.cpp:51 msgid "Waiting for server" @@ -1220,24 +1252,24 @@ msgstr "Další" #: src/gui/npcdialog.cpp:54 msgid "Submit" -msgstr "" +msgstr "Odeslat" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:143 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" -msgstr "" +msgstr "Vyprázdnit" -#: src/gui/npcdialog.cpp:222 +#: src/gui/npcdialog.cpp:223 msgid "> Next" -msgstr "" +msgstr "> Další" #: src/gui/npcpostdialog.cpp:48 msgid "To:" -msgstr "" +msgstr "Komu:" #: src/gui/npcpostdialog.cpp:55 msgid "Send" @@ -1245,349 +1277,351 @@ msgstr "Odeslat" #: src/gui/npcpostdialog.cpp:99 msgid "Failed to send as sender or letter invalid." -msgstr "" +msgstr "Odeslání se nezdařilo. odesílatel nebo dopis není platný." -#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886 +#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890 #, c-format msgid "Outfit: %d" -msgstr "" +msgstr "Výstroj: %d" -#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888 +#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 #, c-format msgid "Key: %s" -msgstr "" +msgstr "Klávesa: %s" -#: src/gui/outfitwindow.cpp:87 +#: src/gui/outfitwindow.cpp:91 msgid "Unequip first" -msgstr "" +msgstr "Nejdřív odstrojit" -#: src/gui/outfitwindow.cpp:90 +#: src/gui/outfitwindow.cpp:94 msgid "Away outfit" -msgstr "" +msgstr "Výstroj pro \"Away\"" -#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Obchod" -#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" -msgstr "" +msgstr "Šeptat" -#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" -msgstr "" +msgstr "Vyléčit" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374 -#: src/gui/popupmenu.cpp:615 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" -msgstr "" +msgstr "Být přátelé" -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376 -#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:649 +#: 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 msgid "Disregard" -msgstr "" - -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384 -#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628 -#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642 +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 msgid "Erase" -msgstr "" +msgstr "Vymazat" -#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171 -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388 -#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400 -#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 -#: src/gui/popupmenu.cpp:647 +#: 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 msgid "Unignore" -msgstr "" +msgstr "Odignorovat" -#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182 -#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" -msgstr "" +msgstr "Kompletně ignorovat" -#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:659 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" -msgstr "" +msgstr "Následovat" -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:660 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" -msgstr "" +msgstr "imitovat" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" -msgstr "" +msgstr "Pozvat do party" -#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" -msgstr "" +msgstr "Vykopnout z party" -#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" -msgstr "" +msgstr "Vykopnout z gildy" -#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434 -#: src/gui/popupmenu.cpp:718 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" -msgstr "" +msgstr "Změnit pozici v gildě" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" -msgstr "" +msgstr "Pozvat do gildy" -#: src/gui/popupmenu.cpp:238 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" -msgstr "" +msgstr "Vykopnout hráče" -#: src/gui/popupmenu.cpp:240 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" -msgstr "" +msgstr "Zobrazit věci" -#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663 -#: src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" -msgstr "" +msgstr "Svléct" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732 +#: 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 msgid "Add comment" -msgstr "" +msgstr "Přidat komentář" -#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" -msgstr "" +msgstr "Koupit (?)" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447 -#: src/gui/popupmenu.cpp:684 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" -msgstr "" +msgstr "Prodat (?)" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:288 msgid "Kick" -msgstr "" +msgstr "Vykopnout" -#: src/gui/popupmenu.cpp:303 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:309 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:311 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:314 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" -msgstr "" +msgstr "Vložit do seznamu ignorovaných" -#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" -msgstr "" +msgstr "Vložit jméno do chatu" -#: src/gui/popupmenu.cpp:476 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" -msgstr "" +msgstr "Sebrat" -#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645 -#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" -msgstr "" +msgstr "Vložit do chatu" -#: src/gui/popupmenu.cpp:494 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" -msgstr "" +msgstr "Označit na mapě" -#: src/gui/popupmenu.cpp:495 +#: src/gui/popupmenu.cpp:501 msgid "Rename" -msgstr "" +msgstr "Přejmenovat" -#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885 -#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" +msgstr "Odebrat" + +#: src/gui/popupmenu.cpp:507 +msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:510 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" -msgstr "" +msgstr "Načíst staré výstroje" -#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" -msgstr "" +msgstr "Kouzla" -#: src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" -msgstr "" +msgstr "Načíst stará kouzla" -#: src/gui/popupmenu.cpp:529 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" -msgstr "" +msgstr "Upravit kouzlo" -#: src/gui/popupmenu.cpp:555 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" -msgstr "" +msgstr "vypnout zvýrazǒvání" -#: src/gui/popupmenu.cpp:560 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" -msgstr "" +msgstr "Zapnout zvýrazňování" -#: src/gui/popupmenu.cpp:565 -msgid "Dont remove name" -msgstr "" +#: src/gui/popupmenu.cpp:566 +msgid "Don't remove name" +msgstr "Neodebírat jméno" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" -msgstr "" +msgstr "Odebrat jméno" -#: src/gui/popupmenu.cpp:575 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" -msgstr "" +msgstr "Zapnout \"away\"" -#: src/gui/popupmenu.cpp:580 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" -msgstr "" +msgstr "Vypnout \"away\"" -#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" -msgstr "" +msgstr "Odejít" -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1166 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " -msgstr "" +msgstr "Přejmenovat značku an mapě" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1168 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " -msgstr "" +msgstr "Jméno: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1218 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " -msgstr "" +msgstr "Hráčův komentář" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1220 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " -msgstr "" +msgstr "Komentář: " -#: src/gui/popupmenu.cpp:1570 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" -msgstr "" +msgstr "Přidat do transakce" -#: src/gui/popupmenu.cpp:1576 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" -msgstr "" +msgstr "Přidat 10 do transakce" -#: src/gui/popupmenu.cpp:1579 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" -msgstr "" +msgstr "Přidat polovinu do transakce" -#: src/gui/popupmenu.cpp:1581 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" -msgstr "" +msgstr "Přidat vše do transakce" -#: src/gui/popupmenu.cpp:1593 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" -msgstr "" +msgstr "Uschovat 10" -#: src/gui/popupmenu.cpp:1596 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" -msgstr "" +msgstr "Uschovat polovinu" -#: src/gui/popupmenu.cpp:1598 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" -msgstr "" +msgstr "Uschovat všechny" -#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713 -#: src/gui/popupmenu.cpp:1756 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" -msgstr "" +msgstr "Upustit vše" -#: src/gui/popupmenu.cpp:1637 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" -msgstr "" +msgstr "Vzít 10" -#: src/gui/popupmenu.cpp:1640 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" -msgstr "" +msgstr "Vzít polovinu" -#: src/gui/popupmenu.cpp:1642 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" -msgstr "" +msgstr "Vzít všechny" -#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" -msgstr "" +msgstr "Načíst staré zkratky věcí" -#: src/gui/popupmenu.cpp:1772 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" -msgstr "" +msgstr "Načíst staré zkratky upuštění" -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" -msgstr "" +msgstr "Skrýt" -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" -msgstr "" +msgstr "Zobrazit" -#: src/gui/popupmenu.cpp:1846 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" -msgstr "" +msgstr "Resetovat žlutý pruh" -#: src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" -msgstr "" +msgstr "Zkopírovat do chatu" -#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854 -#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 +#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" -msgstr "" +msgstr "Posunout nahoru" -#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" -msgstr "" - -#: src/gui/quitdialog.cpp:56 -msgid "Save state" -msgstr "" +msgstr "Posunout dolů" -#: src/gui/quitdialog.cpp:57 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" -msgstr "" +msgstr "Přepnout server" -#: src/gui/quitdialog.cpp:58 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" -msgstr "Přepněte postavu" +msgstr "Přepnout postavu" #: src/gui/register.cpp:77 msgid "Confirm:" @@ -1621,91 +1655,91 @@ msgstr "Heslo musí být kratší než %d znaků." msgid "Passwords do not match." msgstr "Hesla se neshodují." -#: src/gui/serverdialog.cpp:228 +#: src/gui/serverdialog.cpp:237 msgid "Choose Your Server" -msgstr "" +msgstr "Zvolte server" -#: src/gui/serverdialog.cpp:239 +#: src/gui/serverdialog.cpp:248 msgid "Choose Your Server *** SAFE MODE ***" -msgstr "" +msgstr "Zvolte server *** BEZPEČNÝ MÓD ***" -#: src/gui/serverdialog.cpp:244 +#: src/gui/serverdialog.cpp:253 msgid "Port:" msgstr "Port:" -#: src/gui/serverdialog.cpp:248 +#: src/gui/serverdialog.cpp:257 msgid "Use same ip for game sub servers" -msgstr "" +msgstr "Použít stejnou IP pro herní sub servery" -#: src/gui/serverdialog.cpp:262 +#: src/gui/serverdialog.cpp:271 msgid "Server type:" -msgstr "" +msgstr "Typ serveru:" -#: src/gui/serverdialog.cpp:286 +#: src/gui/serverdialog.cpp:295 msgid "Load" -msgstr "" +msgstr "Načíst" -#: src/gui/serverdialog.cpp:287 +#: src/gui/serverdialog.cpp:296 msgid "Connect" -msgstr "" +msgstr "Připojit" -#: src/gui/serverdialog.cpp:288 +#: src/gui/serverdialog.cpp:297 msgid "Custom Server" -msgstr "" +msgstr "Vlastní server" -#: src/gui/serverdialog.cpp:393 +#: src/gui/serverdialog.cpp:402 msgid "Please type both the address and the port of a server." msgstr "Prosím zadejte adresu a port serveru." -#: src/gui/serverdialog.cpp:551 +#: src/gui/serverdialog.cpp:560 #, c-format msgid "Downloading server list...%2.2f%%" -msgstr "" +msgstr "Stahuji seznam serverů...%2.2f%%" -#: src/gui/serverdialog.cpp:556 +#: src/gui/serverdialog.cpp:565 msgid "Waiting for server..." -msgstr "" +msgstr "Čekám na odezvu serveru..." -#: src/gui/serverdialog.cpp:560 +#: src/gui/serverdialog.cpp:569 msgid "Preparing download" -msgstr "" +msgstr "Připravuji stažení" -#: src/gui/serverdialog.cpp:564 +#: src/gui/serverdialog.cpp:573 msgid "Error retreiving server list!" -msgstr "" +msgstr "Chyba při získávání seznamu serverů!" -#: src/gui/serverdialog.cpp:662 +#: src/gui/serverdialog.cpp:678 msgid "requires a newer version" -msgstr "" +msgstr "potřebuje novější verzi" -#: src/gui/serverdialog.cpp:664 +#: src/gui/serverdialog.cpp:680 #, c-format msgid "requires v%s" -msgstr "" +msgstr "potřebuje v%s" #: src/gui/setup_audio.cpp:50 msgid "Enable Audio" -msgstr "" +msgstr "Zapnout audio" #: src/gui/setup_audio.cpp:51 msgid "Enable game sfx" -msgstr "" +msgstr "Zapnout zvukové efekty hry" #: src/gui/setup_audio.cpp:52 msgid "Enable gui sfx" -msgstr "" +msgstr "Zapnout zvukové efekty gui" #: src/gui/setup_audio.cpp:53 msgid "Enable music" -msgstr "" +msgstr "Zapnout hudbu" #: src/gui/setup_audio.cpp:54 msgid "Enable mumble voice chat" -msgstr "" +msgstr "Povolit mumble hlasový chat" #: src/gui/setup_audio.cpp:56 msgid "Download music" -msgstr "" +msgstr "Stahovat hudbu" #: src/gui/setup_audio.cpp:61 msgid "Audio" @@ -1721,15 +1755,16 @@ msgstr "Hlasitost hudby" #: src/gui/setup_audio.cpp:120 msgid "Notice" -msgstr "" +msgstr "Upozornění" #: src/gui/setup_audio.cpp:120 msgid "You may have to restart your client if you want to download new music" msgstr "" +"Možná budete muset restartovat váš klient, pokud chcete stáhnout novou hudbu" #: src/gui/setup_audio.cpp:133 msgid "Sound Engine" -msgstr "" +msgstr "Zvukový systém" #: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54 msgid "Colors" @@ -1737,113 +1772,121 @@ msgstr "Barvy" #: src/gui/setup_chat.cpp:57 msgid "Remove colors from received chat messages" -msgstr "" +msgstr "Odstranit barvy z příchozích zpráv" #: src/gui/setup_chat.cpp:60 msgid "Show chat colors list" -msgstr "" +msgstr "Zobrazit seznam barev" #: src/gui/setup_chat.cpp:64 msgid "Commands" -msgstr "" +msgstr "Příkazy" #: src/gui/setup_chat.cpp:66 msgid "Allow magic and GM commands in all chat tabs" -msgstr "" +msgstr "Povolit magii a GM příkazy ve všech záložkách" #: src/gui/setup_chat.cpp:70 msgid "Limits" -msgstr "" +msgstr "Omezení" #: src/gui/setup_chat.cpp:72 msgid "Limit max chars in chat line" -msgstr "" +msgstr "Omezit maximum znaků na řádek" #: src/gui/setup_chat.cpp:75 msgid "Limit max lines in chat" -msgstr "" +msgstr "Omezit počet řádků chatu" #: src/gui/setup_chat.cpp:79 msgid "Logs" -msgstr "" +msgstr "Záznamy" #: src/gui/setup_chat.cpp:81 msgid "Enable chat Log" -msgstr "" +msgstr "Zapnout zaznamenávání konverzace" #: src/gui/setup_chat.cpp:84 msgid "Show chat history" -msgstr "" +msgstr "Zobrazovat historii chatu" #: src/gui/setup_chat.cpp:88 msgid "Messages" -msgstr "" +msgstr "Zprávy" #: src/gui/setup_chat.cpp:90 msgid "Hide shop messages" -msgstr "" +msgstr "Skrýt obchodní zprávy" #: src/gui/setup_chat.cpp:94 msgid "Tabs" -msgstr "" +msgstr "Záložky" #: src/gui/setup_chat.cpp:96 msgid "Put all whispers in tabs" -msgstr "" +msgstr "Všechy šeptání jako záložky" #: src/gui/setup_chat.cpp:99 msgid "Log magic messages in debug tab" -msgstr "" +msgstr "Zaznamenávat zprávy o magii v debug záložce" #: src/gui/setup_chat.cpp:102 msgid "Show server messages in debug tab" -msgstr "" +msgstr "Zobrazovat serverové zprávy v debug záložce" #: src/gui/setup_chat.cpp:105 msgid "Enable trade tab" -msgstr "" +msgstr "Zapnout obchodní záložku" #: src/gui/setup_chat.cpp:108 msgid "Enable battle tab" -msgstr "" +msgstr "Zapnout bitevní záložku" #: src/gui/setup_chat.cpp:111 msgid "Show battle events" -msgstr "" +msgstr "Zobrazovat bitevní události" #: src/gui/setup_chat.cpp:114 msgid "Resize chat tabs if need" -msgstr "" +msgstr "Změnit velikost záložek pokud nutno" #: src/gui/setup_chat.cpp:118 msgid "Time" -msgstr "" +msgstr "Čas" #: src/gui/setup_chat.cpp:120 msgid "Use local time" -msgstr "" +msgstr "Použít místní čas" + +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 +msgid "Other" +msgstr "Ostatní" + +#: src/gui/setup_chat.cpp:125 +msgid "Highlight words (separated by comma)" +msgstr "Zvýrazňovaná slova (oddělená čárkou)" #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" -msgstr "" +msgstr "Takhle to bude vypadat" #: src/gui/setup_colors.cpp:75 msgid "Type:" -msgstr "" +msgstr "Typ:" #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407 msgid "Static" -msgstr "" +msgstr "Statický" #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89 #: src/gui/setup_colors.cpp:408 msgid "Pulse" -msgstr "Puls" +msgstr "Pulzní" #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91 #: src/gui/setup_colors.cpp:409 msgid "Rainbow" -msgstr "Duha" +msgstr "Duhový" #: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93 #: src/gui/setup_colors.cpp:409 @@ -1852,35 +1895,31 @@ msgstr "Spektrum" #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319 msgid "Delay:" -msgstr "" +msgstr "Prodleva:" #: src/gui/setup_colors.cpp:112 msgid "Red:" -msgstr "" +msgstr "Červená:" #: src/gui/setup_colors.cpp:127 msgid "Green:" -msgstr "" +msgstr "Zelená:" #: src/gui/setup_colors.cpp:142 msgid "Blue:" -msgstr "" +msgstr "Modrá:" #: src/gui/setup_colors.cpp:314 msgid "Alpha:" -msgstr "" +msgstr "Průhlednost:" -#: src/gui/setup.cpp:69 +#: src/gui/setup.cpp:71 msgid "Apply" msgstr "Použít" -#: src/gui/setup.cpp:72 +#: src/gui/setup.cpp:74 msgid "Reset Windows" -msgstr "" - -#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394 -msgid "Edit" -msgstr "" +msgstr "Resetovat okna" #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79 msgid "Press the button to start calibration" @@ -1912,11 +1951,11 @@ msgstr "Klávesnice" #: src/gui/setup_keyboard.cpp:89 msgid "Assign" -msgstr "" +msgstr "Přiřadit" #: src/gui/setup_keyboard.cpp:93 msgid "Unassign" -msgstr "" +msgstr "Odebrat" #: src/gui/setup_keyboard.cpp:97 msgid "Default" @@ -1924,211 +1963,227 @@ msgstr "Výchozí" #: src/gui/setup_keyboard.cpp:133 msgid "Key Conflict(s) Detected." -msgstr "" +msgstr "Kolize kláves detekovány." -#: src/gui/setup_other.cpp:40 +#: src/gui/setup_other.cpp:39 msgid "Misc" -msgstr "" +msgstr "Ostatní" -#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125 +#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125 msgid "Monsters" msgstr "Monstra" -#: src/gui/setup_other.cpp:48 +#: src/gui/setup_other.cpp:47 msgid "Show damage inflicted to monsters" -msgstr "" +msgstr "Zobrazit poškození způsobené monstrům" -#: src/gui/setup_other.cpp:51 +#: src/gui/setup_other.cpp:50 msgid "Auto target only reachable monsters" -msgstr "" +msgstr "Automaticky zaměřovat pouze dosažitelná monstra" -#: src/gui/setup_other.cpp:54 +#: src/gui/setup_other.cpp:53 msgid "Highlight monster attack range" -msgstr "" +msgstr "Zvýraznit útočný dosah monster" -#: src/gui/setup_other.cpp:58 +#: src/gui/setup_other.cpp:57 msgid "Show monster hp bar" -msgstr "" +msgstr "Zobrazit u monster pruh s životy" -#: src/gui/setup_other.cpp:61 +#: src/gui/setup_other.cpp:60 msgid "Cycle monster targets" -msgstr "" +msgstr "Cyklovat zamířená monstra" -#: src/gui/setup_other.cpp:67 +#: src/gui/setup_other.cpp:66 msgid "Show warps particles" msgstr "" -#: src/gui/setup_other.cpp:70 +#: src/gui/setup_other.cpp:69 msgid "Highlight map portals" -msgstr "" +msgstr "Zvýraznit portály na mapách" -#: src/gui/setup_other.cpp:73 +#: src/gui/setup_other.cpp:72 msgid "Highlight floor items" -msgstr "" +msgstr "Zvýraznit věci na zemi" -#: src/gui/setup_other.cpp:76 +#: src/gui/setup_other.cpp:75 msgid "Highlight player attack range" -msgstr "" +msgstr "Zvýraznit hráčův útočný dosah" -#: src/gui/setup_other.cpp:79 +#: src/gui/setup_other.cpp:78 msgid "Show extended minimaps" -msgstr "" +msgstr "Zobrazit rozšířené minimapy" -#: src/gui/setup_other.cpp:82 +#: src/gui/setup_other.cpp:81 msgid "Draw path" -msgstr "" +msgstr "Vykreslovat cestu" -#: src/gui/setup_other.cpp:85 +#: src/gui/setup_other.cpp:84 msgid "Draw hotkeys on map" -msgstr "" +msgstr "Vykreslovat zkratky na mapě" + +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "Zapnout líné rolování" -#: src/gui/setup_other.cpp:89 +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "Lenost rolování" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "Radius rolování" + +#: src/gui/setup_other.cpp:97 msgid "Moving" -msgstr "" +msgstr "Pohyb" -#: src/gui/setup_other.cpp:91 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" -msgstr "" +msgstr "Automaticky opravovat pozici" -#: src/gui/setup_other.cpp:94 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" -msgstr "" +msgstr "Útočit během pohybu" -#: src/gui/setup_other.cpp:97 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" -msgstr "" +msgstr "Synchronizovat hráčův pohyb" -#: src/gui/setup_other.cpp:100 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" -msgstr "" +msgstr "Program A šílených pohybů" -#: src/gui/setup_other.cpp:104 +#: src/gui/setup_other.cpp:112 msgid "Player" -msgstr "" +msgstr "hráč" -#: src/gui/setup_other.cpp:106 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" -msgstr "" +msgstr "Zobrazit vlastní pruh životů" -#: src/gui/setup_other.cpp:109 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" -msgstr "" +msgstr "Zapnout rychlé statistiky" -#: src/gui/setup_other.cpp:112 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" -msgstr "" +msgstr "Cyklovat zamířené hráče" -#: src/gui/setup_other.cpp:115 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" -msgstr "" +msgstr "Zobrazovat zprávy o pracovních exp" -#: src/gui/setup_other.cpp:118 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" -msgstr "" +msgstr "Zobrazovat popupy o hráčích" -#: src/gui/setup_other.cpp:121 +#: src/gui/setup_other.cpp:129 msgid "Afk message" -msgstr "" +msgstr "Away zpráva" -#: src/gui/setup_other.cpp:124 +#: src/gui/setup_other.cpp:132 msgid "Show job" -msgstr "" +msgstr "Zobrazit práci" -#: src/gui/setup_other.cpp:127 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:130 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:136 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" -msgstr "" +msgstr "Akceptovat požadavky na koupi/prodej" -#: src/gui/setup_other.cpp:139 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" -msgstr "" +msgstr "Zapnout mód obchodu" -#: src/gui/setup_other.cpp:145 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" -msgstr "" +msgstr "Zaznamenávat dialogy s NPC" -#: src/gui/setup_other.cpp:149 -msgid "Other" -msgstr "" +#: src/gui/setup_other.cpp:157 +msgid "Bots support" +msgstr "Podpora botů" -#: src/gui/setup_other.cpp:151 +#: src/gui/setup_other.cpp:159 +msgid "Enable auction bot support" +msgstr "Zapnout podporu AuctionBot-a" + +#: src/gui/setup_other.cpp:162 +msgid "Enable guild bot support and disable native guild support" +msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild" + +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:154 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" -msgstr "" +msgstr "Zapnout ověřovač botů" -#: src/gui/setup_other.cpp:157 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" -msgstr "" +msgstr "Zapnout ochranu proti vadným serverům" -#: src/gui/setup_other.cpp:160 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" -msgstr "" +msgstr "Zapnout debug záznam" -#: src/gui/setup_other.cpp:163 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" -msgstr "" +msgstr "Mód nízké síťvé náročnosti" -#: src/gui/setup_other.cpp:166 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" -msgstr "" +msgstr "Skrýt zobrazení štítu" -#: src/gui/setup_other.cpp:169 +#: src/gui/setup_other.cpp:186 msgid "Show background" -msgstr "" - -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" +msgstr "Zobrazit pozadí" #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" -msgstr "" +msgstr "Lepčí výkon (zapněte pro lepší výkon)" #: src/gui/setup_perfomance.cpp:58 msgid "Auto adjust perfomance" -msgstr "" +msgstr "Automatické nastavování výkonu" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" -msgstr "" +msgstr "HW akcelerace" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" -msgstr "" +msgstr "Lepší kvalita (vypněte pro lepší výkon)" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "Zobrazit objekty průhledné" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "" #: src/gui/setup_perfomance.cpp:83 msgid "Small memory (enable for lower memory usage)" -msgstr "" +msgstr "Málo paměti (zapněte pro nízké využití paměti)" #: src/gui/setup_perfomance.cpp:86 msgid "Disable advanced beings caching (Software)" @@ -2144,39 +2199,47 @@ msgstr "Hráči" #: src/gui/setup_players.cpp:54 msgid "Show gender" -msgstr "" +msgstr "Zobrazit pohlaví" #: src/gui/setup_players.cpp:57 msgid "Show level" -msgstr "" +msgstr "Zobrazit úroveň" #: src/gui/setup_players.cpp:60 msgid "Show own name" -msgstr "" +msgstr "Zobrazit vlastní jméno" #: src/gui/setup_players.cpp:63 msgid "Target dead players" -msgstr "" +msgstr "Zaměřovat mrtvé hráče" #: src/gui/setup_players.cpp:66 msgid "Visible names" -msgstr "" +msgstr "Viditelná jména" #: src/gui/setup_players.cpp:69 msgid "Secure trades" -msgstr "" +msgstr "Bezpečné obchody" #: src/gui/setup_players.cpp:72 msgid "Unsecure chars in names" -msgstr "" +msgstr "Nebezpečné znaky ve jménech" #: src/gui/setup_players.cpp:75 msgid "Show statuses" -msgstr "" +msgstr "Zobrazovat statusy" + +#: src/gui/setup_players.cpp:78 +msgid "Show ip addresses on screenshots" +msgstr "Zobrazovat IP adresy ve snímcích obrazovky" + +#: src/gui/setup_players.cpp:81 +msgid "Allow self heal with mouse click" +msgstr "Povolit léčení sebe sama kliknutím myši" #: src/gui/setup_relations.cpp:65 msgid "Relation" -msgstr "" +msgstr "Vztahy" #: src/gui/setup_relations.cpp:70 msgid "Neutral" @@ -2184,19 +2247,19 @@ msgstr "Neutrální" #: src/gui/setup_relations.cpp:71 msgid "Friend" -msgstr "" +msgstr "Přítel" #: src/gui/setup_relations.cpp:72 msgid "Disregarded" -msgstr "" +msgstr "Přehlížený" #: src/gui/setup_relations.cpp:73 msgid "Ignored" -msgstr "" +msgstr "Ignorovaný" #: src/gui/setup_relations.cpp:74 msgid "Erased" -msgstr "" +msgstr "Vymazán" #: src/gui/setup_relations.cpp:239 msgid "Allow trading" @@ -2204,96 +2267,100 @@ msgstr "Povolit obchodování" #: src/gui/setup_relations.cpp:241 msgid "Allow whispers" -msgstr "" +msgstr "Povolit šeptání" #: src/gui/setup_relations.cpp:244 msgid "Old" -msgstr "" +msgstr "Starý" #: src/gui/setup_relations.cpp:246 msgid "Relations" -msgstr "" +msgstr "Vztahy" #: src/gui/setup_relations.cpp:271 msgid "When ignoring:" -msgstr "" +msgstr "Když ignoruji:" -#: src/gui/setup_theme.cpp:106 +#: src/gui/setup_theme.cpp:107 msgid "Tiny (10)" -msgstr "" +msgstr "Mrňavý (10)" -#: src/gui/setup_theme.cpp:107 +#: src/gui/setup_theme.cpp:108 msgid "Small (11)" -msgstr "" +msgstr "Malý (11)" -#: src/gui/setup_theme.cpp:108 +#: src/gui/setup_theme.cpp:109 msgid "Medium (12)" -msgstr "" +msgstr "Střední (12)" -#: src/gui/setup_theme.cpp:109 +#: src/gui/setup_theme.cpp:110 msgid "Large (13)" -msgstr "" +msgstr "Velký (13)" -#: src/gui/setup_theme.cpp:110 +#: src/gui/setup_theme.cpp:111 msgid "Big (14)" -msgstr "" +msgstr "Větší (14)" -#: src/gui/setup_theme.cpp:111 +#: src/gui/setup_theme.cpp:112 msgid "Huge (15)" -msgstr "" +msgstr "Obrovský (15)" -#: src/gui/setup_theme.cpp:141 +#: src/gui/setup_theme.cpp:143 msgid "Theme" -msgstr "" +msgstr "Téma" -#: src/gui/setup_theme.cpp:143 +#: src/gui/setup_theme.cpp:145 msgid "Gui theme" -msgstr "" +msgstr "Téma GUI" -#: src/gui/setup_theme.cpp:144 +#: src/gui/setup_theme.cpp:146 msgid "Main Font" -msgstr "" +msgstr "Hlavní font" -#: src/gui/setup_theme.cpp:145 +#: src/gui/setup_theme.cpp:147 msgid "Bold font" -msgstr "" +msgstr "Tučný font" -#: src/gui/setup_theme.cpp:146 +#: src/gui/setup_theme.cpp:148 msgid "Particle font" -msgstr "" +msgstr "Font částic" -#: src/gui/setup_theme.cpp:147 +#: src/gui/setup_theme.cpp:149 msgid "Help font" -msgstr "" +msgstr "Pomocný font" -#: src/gui/setup_theme.cpp:148 +#: src/gui/setup_theme.cpp:150 msgid "Secure font" -msgstr "" +msgstr "Bezpečný font" -#: src/gui/setup_theme.cpp:176 +#: src/gui/setup_theme.cpp:151 +msgid "Japanese font" +msgstr "Japonský font" + +#: src/gui/setup_theme.cpp:183 msgid "Font size" msgstr "Velikost písma" -#: src/gui/setup_theme.cpp:282 +#: src/gui/setup_theme.cpp:299 msgid "Theme Changed" -msgstr "" +msgstr "Téma změněno" -#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." -msgstr "" +msgstr "Restartujte klient pro aplikováni změn." #: src/gui/setup_video.cpp:194 msgid "Software" -msgstr "" +msgstr "Softwarový" #: src/gui/setup_video.cpp:195 msgid "Fast OpenGL" -msgstr "" +msgstr "Rychlé OpenGL" #: src/gui/setup_video.cpp:196 msgid "Safe OpenGL" -msgstr "" +msgstr "Bezpečné OpenGL" #: src/gui/setup_video.cpp:223 msgid "No text" @@ -2305,11 +2372,11 @@ msgstr "Text" #: src/gui/setup_video.cpp:227 msgid "Bubbles, no names" -msgstr "" +msgstr "Bubliny, beze jmen" #: src/gui/setup_video.cpp:229 msgid "Bubbles with names" -msgstr "" +msgstr "Bubliny se jmény" #: src/gui/setup_video.cpp:242 msgid "off" @@ -2341,34 +2408,30 @@ msgstr "Vlastní kurzor" #: src/gui/setup_video.cpp:291 msgid "Particle effects" -msgstr "" +msgstr "Částicové efekty" #: src/gui/setup_video.cpp:293 msgid "Show pickup notification" -msgstr "" +msgstr "Zobrazit informaci o sebrání předmětu" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:295 msgid "in chat" -msgstr "" +msgstr "v chatu" #. TRANSLATORS: Refers to "Show own name" #: src/gui/setup_video.cpp:297 msgid "as particle" -msgstr "" +msgstr "jako částici" #: src/gui/setup_video.cpp:302 msgid "FPS limit:" -msgstr "" +msgstr "Omezení FPS:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " -msgstr "" - -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Video" +msgstr "Altern. FPS omezení:" #: src/gui/setup_video.cpp:321 msgid "Overhead text" @@ -2376,7 +2439,7 @@ msgstr "" #: src/gui/setup_video.cpp:322 msgid "Gui opacity" -msgstr "" +msgstr "Neprůhlednost GUI" #: src/gui/setup_video.cpp:323 msgid "Ambient FX" @@ -2384,27 +2447,30 @@ msgstr "" #: src/gui/setup_video.cpp:324 msgid "Particle detail" -msgstr "" +msgstr "Detaily částic" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" -msgstr "" +msgstr "Žádné" #: src/gui/setup_video.cpp:484 msgid "" "Failed to switch to windowed mode and restoration of old mode also failed!" msgstr "" +"Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!" #: src/gui/setup_video.cpp:490 msgid "" "Failed to switch to fullscreen mode and restoration of old mode also failed!" msgstr "" +"Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž " +"selhalo!" #: src/gui/setup_video.cpp:501 msgid "Switching to Full Screen" -msgstr "" +msgstr "Přepínám na celou obrazovku" #: src/gui/setup_video.cpp:502 msgid "Restart needed for changes to take effect." @@ -2412,7 +2478,7 @@ msgstr "Pro uplatnění změn je potřeba restart." #: src/gui/setup_video.cpp:514 msgid "Changing to OpenGL" -msgstr "" +msgstr "Měním na OpenGL" #: src/gui/setup_video.cpp:515 msgid "Applying change to OpenGL requires restart." @@ -2420,285 +2486,290 @@ msgstr "Změny v OpenGL vyžadují restart." #: src/gui/setup_video.cpp:602 msgid "Custom resolution (example: 1024x768)" -msgstr "" +msgstr "Vlastní rozlišení (příklad: 1024x768)" #: src/gui/setup_video.cpp:603 msgid "Enter new resolution: " -msgstr "" +msgstr "Zadej nové rozlišení:" #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623 msgid "Screen Resolution Changed" -msgstr "" +msgstr "Rozlišení obrazovky změněno" #: src/gui/setup_video.cpp:621 msgid "Some windows may be moved to fit the lowered resolution." -msgstr "" +msgstr "Některá okna mohou být přesunuta aby se vešly do menšího okna." #: src/gui/setup_video.cpp:654 msgid "Particle Effect Settings Changed." -msgstr "" +msgstr "Nastavení částicových efektů bylo změněno." #: src/gui/setup_video.cpp:655 msgid "Changes will take effect on map change." msgstr "Změny se projeví až po změně mapy." -#: src/gui/shopwindow.cpp:74 +#: src/gui/shopwindow.cpp:75 msgid "Personal Shop" -msgstr "" +msgstr "Osobní obchod" -#: src/gui/shopwindow.cpp:116 +#: src/gui/shopwindow.cpp:118 msgid "Buy items" -msgstr "" +msgstr "Koupit věci" -#: src/gui/shopwindow.cpp:117 +#: src/gui/shopwindow.cpp:119 msgid "Sell items" -msgstr "" +msgstr "Prodat věci" -#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122 -#: src/gui/tradewindow.cpp:88 +#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124 +#: src/gui/tradewindow.cpp:89 msgid "Add" msgstr "Přidat" -#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124 +#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126 msgid "Announce" -msgstr "" +msgstr "Oznámit" -#: src/gui/shopwindow.cpp:125 +#: src/gui/shopwindow.cpp:127 msgid "Show links in announce" -msgstr "" +msgstr "Zobrazit odkazy v oznámení" + +#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149 +msgid "Auction" +msgstr "Aukce" -#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" -msgstr "" +msgstr "Požadavek k obchodování" -#: src/gui/shopwindow.cpp:724 +#: src/gui/shopwindow.cpp:749 #, c-format msgid "%s wants to %s %s do you accept?" -msgstr "" +msgstr "%s chce %s %s příjímáte?" -#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81 +#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81 msgid "Skills" msgstr "Dovednosti" -#: src/gui/skilldialog.cpp:283 +#: src/gui/skilldialog.cpp:288 msgid "Up" -msgstr "" +msgstr "Zvýšit" -#: src/gui/skilldialog.cpp:336 +#: src/gui/skilldialog.cpp:341 #, c-format msgid "Skill points available: %d" msgstr "" -#: src/gui/skilldialog.cpp:413 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:425 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "" -#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "" -#: src/gui/skilldialog.cpp:537 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "" -#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52 +#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" -msgstr "Guilda" +msgstr "Gilda" -#: src/gui/socialwindow.cpp:146 +#: src/gui/socialwindow.cpp:147 #, c-format msgid "Invited user %s to guild %s." -msgstr "" +msgstr "Pozvali jste %s do gildy %s." -#: src/gui/socialwindow.cpp:160 +#: src/gui/socialwindow.cpp:161 #, c-format msgid "Guild %s quit requested." -msgstr "" +msgstr "Požadován odchod z gildy %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 msgid "Member Invite to Guild" -msgstr "" +msgstr "Člen pozval do gildy" -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:189 #, c-format msgid "Who would you like to invite to guild %s?" -msgstr "" +msgstr "Koho byste rád pozval do gildy %s?" -#: src/gui/socialwindow.cpp:197 +#: src/gui/socialwindow.cpp:198 msgid "Leave Guild?" -msgstr "" +msgstr "Opustit gildu?" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:199 #, c-format msgid "Are you sure you want to leave guild %s?" -msgstr "" +msgstr "Jste si jisti že chcete opustit gildu %s?" -#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Parta" -#: src/gui/socialwindow.cpp:243 +#: src/gui/socialwindow.cpp:347 #, c-format msgid "Invited user %s to party." msgstr "" -#: src/gui/socialwindow.cpp:257 +#: src/gui/socialwindow.cpp:361 #, c-format msgid "Party %s quit requested." msgstr "" -#: src/gui/socialwindow.cpp:284 +#: src/gui/socialwindow.cpp:388 msgid "Member Invite to Party" msgstr "" -#: src/gui/socialwindow.cpp:285 +#: src/gui/socialwindow.cpp:389 #, c-format msgid "Who would you like to invite to party %s?" msgstr "" -#: src/gui/socialwindow.cpp:294 +#: src/gui/socialwindow.cpp:398 msgid "Leave Party?" msgstr "" -#: src/gui/socialwindow.cpp:295 +#: src/gui/socialwindow.cpp:399 #, c-format msgid "Are you sure you want to leave party %s?" msgstr "" -#: src/gui/socialwindow.cpp:521 +#: src/gui/socialwindow.cpp:625 msgid "Nav" msgstr "" -#: src/gui/socialwindow.cpp:799 +#: src/gui/socialwindow.cpp:903 msgid "Atk" msgstr "" -#: src/gui/socialwindow.cpp:840 +#: src/gui/socialwindow.cpp:944 msgid "Priority mobs" -msgstr "" +msgstr "Prioritní monstra" -#: src/gui/socialwindow.cpp:872 +#: src/gui/socialwindow.cpp:976 msgid "Attack mobs" -msgstr "" +msgstr "Útočit na monstra" -#: src/gui/socialwindow.cpp:907 +#: src/gui/socialwindow.cpp:1011 msgid "Ignore mobs" -msgstr "" +msgstr "Ignorovat monstra" -#: src/gui/socialwindow.cpp:970 +#: src/gui/socialwindow.cpp:1074 msgid "Create Guild" -msgstr "Vytvořit guildu" +msgstr "Vytvořit gildu" -#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387 +#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 msgid "Create Party" -msgstr "" +msgstr "Vytvořit partu" -#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 msgid "Social" -msgstr "" +msgstr "Společenství" -#: src/gui/socialwindow.cpp:1034 +#: src/gui/socialwindow.cpp:1140 msgid "Invite" -msgstr "" +msgstr "Pozvat" -#: src/gui/socialwindow.cpp:1176 +#: src/gui/socialwindow.cpp:1286 #, c-format msgid "Accepted party invite from %s." -msgstr "" +msgstr "Přijato pozvání do party od %s." -#: src/gui/socialwindow.cpp:1186 +#: src/gui/socialwindow.cpp:1296 #, c-format msgid "Rejected party invite from %s." -msgstr "" +msgstr "Odmítnuto přijetí do party od %s." -#: src/gui/socialwindow.cpp:1203 +#: src/gui/socialwindow.cpp:1313 #, c-format msgid "Accepted guild invite from %s." -msgstr "" +msgstr "Přijato pozvání do gildy od %s." -#: src/gui/socialwindow.cpp:1213 +#: src/gui/socialwindow.cpp:1326 #, c-format msgid "Rejected guild invite from %s." -msgstr "" +msgstr "Odmítnuto pozvání do gildy od %s." -#: src/gui/socialwindow.cpp:1257 +#: src/gui/socialwindow.cpp:1373 #, c-format msgid "Creating guild called %s." -msgstr "" +msgstr "Vytvářím gildu s názvem %s." -#: src/gui/socialwindow.cpp:1280 +#: src/gui/socialwindow.cpp:1396 #, c-format msgid "Creating party called %s." -msgstr "" +msgstr "Vytvářím partu s názvem %s." -#: src/gui/socialwindow.cpp:1294 +#: src/gui/socialwindow.cpp:1410 msgid "Guild Name" -msgstr "" +msgstr "Název gildy" -#: src/gui/socialwindow.cpp:1295 +#: src/gui/socialwindow.cpp:1411 msgid "Choose your guild's name." -msgstr "" +msgstr "Zvolte jméno vaší gildy." -#: src/gui/socialwindow.cpp:1309 +#: src/gui/socialwindow.cpp:1425 msgid "Received guild request, but one already exists." -msgstr "" +msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje." -#: src/gui/socialwindow.cpp:1315 +#: src/gui/socialwindow.cpp:1431 #, c-format msgid "%s has invited you to join the guild %s." -msgstr "" +msgstr "%s vás zve ke vstupu do gildy %s." -#: src/gui/socialwindow.cpp:1321 +#: src/gui/socialwindow.cpp:1437 msgid "Accept Guild Invite" -msgstr "" +msgstr "Přílmout pozvání do gildy" -#: src/gui/socialwindow.cpp:1336 +#: src/gui/socialwindow.cpp:1452 msgid "Received party request, but one already exists." -msgstr "" +msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje." -#: src/gui/socialwindow.cpp:1347 +#: src/gui/socialwindow.cpp:1463 msgid "You have been invited you to join a party." -msgstr "" +msgstr "Byli jste pozváni k připojení se do party." -#: src/gui/socialwindow.cpp:1351 +#: src/gui/socialwindow.cpp:1467 #, c-format msgid "You have been invited to join the %s party." -msgstr "" +msgstr "Byli jste pozváni k připojení se do party %s." -#: src/gui/socialwindow.cpp:1359 +#: src/gui/socialwindow.cpp:1475 #, c-format msgid "%s has invited you to join their party." -msgstr "%s vás zve ke vstupu do své party." +msgstr "%s vás pozval ke vstupu do své party." -#: src/gui/socialwindow.cpp:1364 +#: src/gui/socialwindow.cpp:1480 #, c-format msgid "%s has invited you to join the %s party." -msgstr "%s vás zve ke vstupu do party: %s" +msgstr "%s vás zve ke vstupu do party: %s." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1489 msgid "Accept Party Invite" msgstr "Přijmout pozvání do party" -#: src/gui/socialwindow.cpp:1388 +#: src/gui/socialwindow.cpp:1504 msgid "Cannot create party. You are already in a party" -msgstr "" +msgstr "Nemohu vytvořit partu. Již jste členem party." -#: src/gui/socialwindow.cpp:1393 +#: src/gui/socialwindow.cpp:1509 msgid "Party Name" -msgstr "" +msgstr "Jméno party" -#: src/gui/socialwindow.cpp:1394 +#: src/gui/socialwindow.cpp:1510 msgid "Choose your party's name." -msgstr "" +msgstr "Zvolte jméno vaší party." #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88 msgid "Specials" @@ -2706,79 +2777,79 @@ msgstr "" #: src/gui/statuspopup.cpp:197 msgid "(D) default moves" -msgstr "" +msgstr "(D) výchozí pohyby" #: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" -msgstr "" +msgstr "(I) invertované pohyby" #: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" -msgstr "" +msgstr "(c) pohyby s trochou šílených pohybů" #: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" -msgstr "" +msgstr "(C) pohyby s šílenými pohyby" #: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" -msgstr "" +msgstr "(d) dvojité normální + šílené" #: src/gui/statuspopup.cpp:222 msgid "(?) move" -msgstr "" +msgstr "(?) pohyb" #: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" -msgstr "" +msgstr "(a) vlastní šílené pohyby" #: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" -msgstr "" +msgstr "(?) šílené pohyby" #: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" -msgstr "" +msgstr "(0) výchozí pohyb k cíli" #: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" -msgstr "" +msgstr "(1) pohyb k cíli do vzdálenosti 1" #: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" -msgstr "" +msgstr "(2) pohyb k cíli do vzdálenosti 2" #: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" -msgstr "" +msgstr "(3) pohyb k cíli do vzdálenosti 3" #: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" -msgstr "" +msgstr "(5) pohyb k cíli do vzdálenosti 5" #: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" -msgstr "" +msgstr "(7) pohyb k cíli do vzdálenosti 7" #: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" -msgstr "" +msgstr "(A) pohyb k cíli na útočný dosah" #: src/gui/statuspopup.cpp:289 msgid "(?) move to target" -msgstr "" +msgstr "(?) pohyb k cíli" #: src/gui/statuspopup.cpp:297 msgid "(D) default follow" -msgstr "" +msgstr "(D) výchozí následování" #: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" -msgstr "" +msgstr "(R) relativní následování" #: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" -msgstr "" +msgstr "(M) zrcadlené následování" #: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" @@ -2786,151 +2857,151 @@ msgstr "" #: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" -msgstr "" +msgstr "(?) neznámé následování" #: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" -msgstr "" +msgstr "(D) výchozí útok" #: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" -msgstr "" +msgstr "(s) přepínat útok bez štítu" #: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" -msgstr "" +msgstr "(S) přepínat útok se štítem" #: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" -msgstr "" +msgstr "(?) útok" #: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" -msgstr "" +msgstr "(G) jdi a útoč" #: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" -msgstr "" +msgstr "(A) jdi, útoč, sbírej" #: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" -msgstr "" +msgstr "(d) bez automatického útoku" #: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" -msgstr "" +msgstr "(S) malý sběr 1x1 pole" #: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" -msgstr "" +msgstr "(D) výchozí sběr 2x1 pole" #: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" -msgstr "" +msgstr "(F) sběr před 2x3 pole" #: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" -msgstr "" +msgstr "(3) sběr 3x3 pole" #: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" -msgstr "" +msgstr "(g) jdi a seber do vzdálenosti 4" #: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" -msgstr "" +msgstr "(G) jdi a seber do vzdálenosti 8" #: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" -msgstr "" +msgstr "(A) jdi a seber do max. vzdálenosti" #: src/gui/statuspopup.cpp:403 msgid "(?) pick up" -msgstr "" +msgstr "(?) sběr" #: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" -msgstr "" +msgstr "(N) Normální zobrazení mapy" #: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" -msgstr "" +msgstr "(D) debug zobrazení mapy" #: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" -msgstr "" +msgstr "(u) ultra zobrazení mapy" #: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" -msgstr "" +msgstr "(U) ultra zobrazení mapy 2" #: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" -msgstr "" +msgstr "(e) zobrazen prázdné mapy" #: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" -msgstr "" +msgstr "(b) zobrazení černobílé mapy" #: src/gui/statuspopup.cpp:436 msgid "(?) map view" -msgstr "" +msgstr "(?) zobrazení pamy" #: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" -msgstr "" +msgstr "(f) použij #flar pro magický útok" #: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" -msgstr "" +msgstr "(c) použij #chiza pro magický útok" #: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" -msgstr "" +msgstr "(I) použij #ingrav pro magický útok" #: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" -msgstr "" +msgstr "(F) použij #frillyar pro magický útok" #: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" -msgstr "" +msgstr "(U) použij #upmarmu pro magický útok" #: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" -msgstr "" +msgstr "(?) magický útok attack" #: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" -msgstr "" +msgstr "(D) výchozí imitace" #: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" -msgstr "" +msgstr "(O) imitace výstroje" #: src/gui/statuspopup.cpp:485 msgid "(?) imitation" -msgstr "" +msgstr "(?) imitace" #: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" -msgstr "" +msgstr "(O) u počítače" #: src/gui/statuspopup.cpp:497 msgid "(A) away" -msgstr "" +msgstr "(A) pryč (away)" #: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" -msgstr "" +msgstr "(?) away" #: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" -msgstr "" +msgstr "(G) mód herní kamery" #: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" -msgstr "" +msgstr "(F) mód volné kamery" #: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" @@ -2938,194 +3009,194 @@ msgstr "" #: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" -msgstr "" +msgstr "Modifikátory hry jsou vypnuty" #: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" -msgstr "" +msgstr "Modifikátory hry jsou zapnuty" -#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259 -#: src/gui/statuswindow.cpp:322 +#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273 +#: src/gui/statuswindow.cpp:336 #, c-format msgid "Level: %d" msgstr "Úroveň: %d" -#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245 -#: src/gui/statuswindow.cpp:289 +#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259 +#: src/gui/statuswindow.cpp:303 #, c-format msgid "Money: %s" msgstr "Peníze: %s" -#: src/gui/statuswindow.cpp:140 +#: src/gui/statuswindow.cpp:150 msgid "HP:" msgstr "" -#: src/gui/statuswindow.cpp:147 +#: src/gui/statuswindow.cpp:157 msgid "Exp:" msgstr "Exp:" -#: src/gui/statuswindow.cpp:161 +#: src/gui/statuswindow.cpp:171 msgid "MP:" msgstr "" -#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372 +#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386 #, c-format msgid "Job: %d" -msgstr "" +msgstr "Práce: %d" -#: src/gui/statuswindow.cpp:194 +#: src/gui/statuswindow.cpp:204 msgid "Job:" -msgstr "" +msgstr "Práce:" -#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296 +#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310 #, c-format msgid "Character points: %d" -msgstr "" +msgstr "Bodů postavy: %d" -#: src/gui/statuswindow.cpp:254 +#: src/gui/statuswindow.cpp:268 #, c-format msgid "Level: %d (GM %d)" -msgstr "" +msgstr "Úroveň: %d (GM %d)" -#: src/gui/statuswindow.cpp:310 +#: src/gui/statuswindow.cpp:324 #, c-format msgid "Correction points: %d" msgstr "" -#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698 -#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734 -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809 -#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851 +#: 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 msgid "(D)" -msgstr "" +msgstr "(D)" -#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759 +#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773 msgid "(I)" -msgstr "" +msgstr "(I)" -#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756 +#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770 msgid "(c)" -msgstr "" +msgstr "(c)" -#: src/gui/statuswindow.cpp:642 +#: src/gui/statuswindow.cpp:656 msgid "(C)" -msgstr "" +msgstr "(C)" -#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743 +#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757 msgid "(d)" -msgstr "" - -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662 -#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710 -#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746 -#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838 -#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867 +msgstr "(d)" + +#: 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 msgid "(?)" -msgstr "" +msgstr "(?)" -#: src/gui/statuswindow.cpp:659 +#: src/gui/statuswindow.cpp:673 msgid "(a)" -msgstr "" +msgstr "(a)" -#: src/gui/statuswindow.cpp:670 +#: src/gui/statuswindow.cpp:684 msgid "(0)" -msgstr "" +msgstr "(0)" -#: src/gui/statuswindow.cpp:673 +#: src/gui/statuswindow.cpp:687 msgid "(1)" -msgstr "" +msgstr "(1)" -#: src/gui/statuswindow.cpp:676 +#: src/gui/statuswindow.cpp:690 msgid "(2)" -msgstr "" +msgstr " (2)" -#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786 +#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800 msgid "(3)" -msgstr "" +msgstr "(3)" -#: src/gui/statuswindow.cpp:682 +#: src/gui/statuswindow.cpp:696 msgid "(5)" -msgstr "" +msgstr "(5)" -#: src/gui/statuswindow.cpp:685 +#: src/gui/statuswindow.cpp:699 msgid "(7)" -msgstr "" +msgstr "(7)" -#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864 +#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754 +#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878 msgid "(A)" -msgstr "" +msgstr "(A)" -#: src/gui/statuswindow.cpp:701 +#: src/gui/statuswindow.cpp:715 msgid "(R)" -msgstr "" +msgstr "(R)" -#: src/gui/statuswindow.cpp:704 +#: src/gui/statuswindow.cpp:718 msgid "(M)" -msgstr "" +msgstr "(M)" -#: src/gui/statuswindow.cpp:707 +#: src/gui/statuswindow.cpp:721 msgid "(P)" -msgstr "" +msgstr "(P)" -#: src/gui/statuswindow.cpp:721 +#: src/gui/statuswindow.cpp:735 msgid "(s)" -msgstr "" +msgstr "(s)" -#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777 +#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791 msgid "(S)" -msgstr "" +msgstr "(S)" -#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792 -#: src/gui/statuswindow.cpp:845 +#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806 +#: src/gui/statuswindow.cpp:859 msgid "(G)" -msgstr "" +msgstr "(G)" -#: src/gui/statuswindow.cpp:753 +#: src/gui/statuswindow.cpp:767 msgid "(f)" -msgstr "" +msgstr "(f)" -#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783 -#: src/gui/statuswindow.cpp:848 +#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797 +#: src/gui/statuswindow.cpp:862 msgid "(F)" -msgstr "" +msgstr "(F)" -#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815 +#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829 msgid "(U)" -msgstr "" +msgstr "(U)" -#: src/gui/statuswindow.cpp:789 +#: src/gui/statuswindow.cpp:803 msgid "(g)" -msgstr "" +msgstr "(g)" -#: src/gui/statuswindow.cpp:806 +#: src/gui/statuswindow.cpp:820 msgid "(N)" -msgstr "" +msgstr "(N)" -#: src/gui/statuswindow.cpp:812 +#: src/gui/statuswindow.cpp:826 msgid "(u)" -msgstr "" +msgstr "(u)" -#: src/gui/statuswindow.cpp:818 +#: src/gui/statuswindow.cpp:832 msgid "(e)" -msgstr "" +msgstr "(e)" -#: src/gui/statuswindow.cpp:821 +#: src/gui/statuswindow.cpp:835 msgid "(b)" -msgstr "" +msgstr "(b)" -#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861 +#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875 msgid "(O)" -msgstr "" +msgstr "(O)" #: src/gui/textcommandeditor.cpp:113 msgid "No Target" -msgstr "" +msgstr "Žádný cíl" #: src/gui/textcommandeditor.cpp:114 msgid "Allow Target" -msgstr "" +msgstr " " #: src/gui/textcommandeditor.cpp:115 msgid "Need Target" @@ -3133,39 +3204,39 @@ msgstr "" #: src/gui/textcommandeditor.cpp:120 msgid "General Magic" -msgstr "" +msgstr "Obecná magie" #: src/gui/textcommandeditor.cpp:121 msgid "Life Magic" -msgstr "" +msgstr "Magie života" #: src/gui/textcommandeditor.cpp:122 msgid "War Magic" -msgstr "" +msgstr "Magie války" #: src/gui/textcommandeditor.cpp:123 msgid "Transmute Magic" -msgstr "" +msgstr "Magie přeměn" #: src/gui/textcommandeditor.cpp:124 msgid "Nature Magic" -msgstr "" +msgstr "Magie přírody" #: src/gui/textcommandeditor.cpp:125 msgid "Astral Magic" -msgstr "" +msgstr "Magie hvězd" #: src/gui/textcommandeditor.cpp:168 msgid "Command Editor" -msgstr "" +msgstr "Editor příkazů" #: src/gui/textcommandeditor.cpp:185 msgid "magic" -msgstr "" +msgstr "magie" #: src/gui/textcommandeditor.cpp:189 msgid "other" -msgstr "" +msgstr "ostatní" #: src/gui/textcommandeditor.cpp:194 msgid "Symbol:" @@ -3173,35 +3244,35 @@ msgstr "" #: src/gui/textcommandeditor.cpp:197 msgid "Command:" -msgstr "" +msgstr "Příkaz:" #: src/gui/textcommandeditor.cpp:200 msgid "Mana:" -msgstr "" +msgstr "Mana:" #: src/gui/textcommandeditor.cpp:206 msgid "Target Type:" -msgstr "" +msgstr "Typ cíle:" #: src/gui/textcommandeditor.cpp:212 msgid "Icon:" -msgstr "" +msgstr "Ikona:" #: src/gui/textcommandeditor.cpp:218 msgid "Magic level:" -msgstr "" +msgstr "Úroveň magie:" #: src/gui/textcommandeditor.cpp:224 msgid "Magic School:" -msgstr "" +msgstr "Škola magie:" #: src/gui/textcommandeditor.cpp:230 msgid "School level:" -msgstr "" +msgstr "Úroveň školy:" #: src/gui/textcommandeditor.cpp:235 msgid "Save" -msgstr "" +msgstr "Uložit" #: src/gui/tradewindow.cpp:60 msgid "Propose trade" @@ -3209,7 +3280,7 @@ msgstr "Nabídnout obchod" #: src/gui/tradewindow.cpp:61 msgid "Confirmed. Waiting..." -msgstr "" +msgstr "Potvrzeno. Čekám..." #: src/gui/tradewindow.cpp:62 msgid "Agree trade" @@ -3217,68 +3288,67 @@ msgstr "Souhlasit s obchodem" #: src/gui/tradewindow.cpp:63 msgid "Agreed. Waiting..." -msgstr "" +msgstr "Odsouhlaseno. Čekám..." #: src/gui/tradewindow.cpp:66 msgid "Trade: You" -msgstr "" +msgstr "Obchod: Ty" -#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166 +#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167 #, c-format msgid "You get %s" -msgstr "" +msgstr "Dostaneš: %s" -#: src/gui/tradewindow.cpp:111 +#: src/gui/tradewindow.cpp:112 msgid "You give:" -msgstr "" +msgstr "Dáváš:" -#: src/gui/tradewindow.cpp:115 +#: src/gui/tradewindow.cpp:116 msgid "Change" msgstr "Změnit" -#: src/gui/tradewindow.cpp:332 -msgid "" -"Failed adding item. You can not overlap one kind of item on the window." -msgstr "" - -#: src/gui/tradewindow.cpp:377 +#: src/gui/tradewindow.cpp:375 msgid "You don't have enough money." msgstr "Nemáte dost peněz." +#: src/gui/tradewindow.cpp:454 +msgid "Failed adding item. You can not overlap one kind of item on the window." +msgstr "" + #: src/gui/unregisterdialog.cpp:54 #, c-format msgid "Name: %s" msgstr "Jméno: %s" -#: src/gui/updatewindow.cpp:136 +#: src/gui/updaterwindow.cpp:138 msgid "Updating..." msgstr "Aktualizuje se..." -#: src/gui/updatewindow.cpp:155 +#: src/gui/updaterwindow.cpp:159 msgid "Connecting..." msgstr "Připojuji se..." -#: src/gui/updatewindow.cpp:158 +#: src/gui/updaterwindow.cpp:162 msgid "Play" msgstr "Hrát" -#: src/gui/updatewindow.cpp:556 +#: src/gui/updaterwindow.cpp:564 msgid "##1 The update process is incomplete." -msgstr "" +msgstr "##1 Proces aktualizace není kompletní." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updatewindow.cpp:558 +#: src/gui/updaterwindow.cpp:566 msgid "##1 It is strongly recommended that" -msgstr "" +msgstr "##1 silně doporučujeme zkusit" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updatewindow.cpp:560 +#: src/gui/updaterwindow.cpp:568 msgid "##1 you try again later." -msgstr "" +msgstr "##1 aktualizaci později" -#: src/gui/updatewindow.cpp:686 +#: src/gui/updaterwindow.cpp:744 msgid "Completed" -msgstr "" +msgstr "Hotovo" #: src/gui/userpalette.cpp:116 msgid "Being" @@ -3286,19 +3356,19 @@ msgstr "" #: src/gui/userpalette.cpp:117 msgid "Friend Names" -msgstr "" +msgstr "Jména přátel" #: src/gui/userpalette.cpp:118 msgid "Disregarded Names" -msgstr "" +msgstr "Jména přehlížených" #: src/gui/userpalette.cpp:119 msgid "Ignored Names" -msgstr "" +msgstr "Jména ignorovaných" #: src/gui/userpalette.cpp:120 msgid "Erased Names" -msgstr "" +msgstr "Jména vymazaných" #: src/gui/userpalette.cpp:121 msgid "Other Players' Names" @@ -3306,7 +3376,7 @@ msgstr "Jména ostatních hráčů" #: src/gui/userpalette.cpp:122 msgid "Own Name" -msgstr "" +msgstr "Vlastní jméno" #: src/gui/userpalette.cpp:123 msgid "GM Names" @@ -3314,55 +3384,55 @@ msgstr "Jména GM" #: src/gui/userpalette.cpp:124 msgid "NPCs" -msgstr "" +msgstr "Jména NPC" #: src/gui/userpalette.cpp:126 msgid "Monster HP bar" -msgstr "" +msgstr "Pruh HP monster" #: src/gui/userpalette.cpp:128 msgid "Monster HP bar (second color)" -msgstr "" +msgstr "Pruh HP monster (druhá barva)" #: src/gui/userpalette.cpp:129 msgid "Party Members" -msgstr "" +msgstr "Členové party" #: src/gui/userpalette.cpp:130 msgid "Guild Members" -msgstr "" +msgstr "Členové gildy" #: src/gui/userpalette.cpp:131 msgid "Particle Effects" -msgstr "" +msgstr "Částicové efekty" #: src/gui/userpalette.cpp:132 msgid "Pickup Notification" -msgstr "" +msgstr "Oznámení o sběru" #: src/gui/userpalette.cpp:133 msgid "Exp Notification" -msgstr "" +msgstr "Oznámení o zkušenostech" #: src/gui/userpalette.cpp:134 msgid "Player HP bar" -msgstr "" +msgstr "Hráčův HP pruh" #: src/gui/userpalette.cpp:136 msgid "Player HP bar (second color)" -msgstr "" +msgstr "Hráčův HP pruh (druhá barva)" #: src/gui/userpalette.cpp:137 msgid "Player Hits Monster" -msgstr "" +msgstr "Hráč zasáhne monstrum" #: src/gui/userpalette.cpp:138 msgid "Monster Hits Player" -msgstr "" +msgstr "Monstrum zasáhne hráče" #: src/gui/userpalette.cpp:140 msgid "Other Player Hits Local Player" -msgstr "" +msgstr "Hráč zasáhne místního hráče" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" @@ -3370,87 +3440,87 @@ msgstr "Kritický zásah" #: src/gui/userpalette.cpp:143 msgid "Local Player Hits Monster" -msgstr "" +msgstr "Místní hráč zasáhne monstrum" #: src/gui/userpalette.cpp:145 msgid "Local Player Critical Hit" -msgstr "" +msgstr "Kritický zásah místního hráče" #: src/gui/userpalette.cpp:147 msgid "Local Player Miss" -msgstr "" +msgstr "Místní hráč minul" #: src/gui/userpalette.cpp:148 msgid "Misses" -msgstr "" +msgstr "Minutí" #: src/gui/userpalette.cpp:149 msgid "Portal Highlight" -msgstr "" +msgstr "Zvýraznění portálů" #: src/gui/userpalette.cpp:151 msgid "Default collision Highlight" -msgstr "" +msgstr "Zvýraznění výchozí kolize" #: src/gui/userpalette.cpp:153 msgid "Air collision Highlight" -msgstr "" +msgstr "Zvýraznění vzdušné kolize" #: src/gui/userpalette.cpp:155 msgid "Water collision Highlight" -msgstr "" +msgstr "Zvýraznění vodní kolize" #: src/gui/userpalette.cpp:157 msgid "Walkable Highlight" -msgstr "" +msgstr "Zvýraznění schůdnosti" #: src/gui/userpalette.cpp:159 msgid "Local Player Attack Range" -msgstr "" +msgstr "Útočný dosah místního hráče" #: src/gui/userpalette.cpp:161 msgid "Local Player Attack Range Border" -msgstr "" +msgstr "Hranice útočného dosahu místního hráče" #: src/gui/userpalette.cpp:163 msgid "Monster Attack Range" -msgstr "" +msgstr "Útočný dosah monstra" #: src/gui/userpalette.cpp:165 msgid "Home Place" -msgstr "" +msgstr "Domovské místo" #: src/gui/userpalette.cpp:167 msgid "Home Place Border" -msgstr "" +msgstr "Hranice domácího místa" #: src/gui/userpalette.cpp:169 msgid "Road Point" -msgstr "" +msgstr "Bod cesty" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" -msgstr "" +msgstr "Kdo je online - Obnovuji" -#: src/gui/whoisonline.cpp:101 +#: src/gui/whoisonline.cpp:104 msgid "Update" -msgstr "" +msgstr "Obnovit" -#: src/gui/whoisonline.cpp:294 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " -msgstr "" +msgstr "Kdo je online - " -#: src/gui/whoisonline.cpp:485 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" -msgstr "" +msgstr "Kdo je online - chyba" -#: src/gui/whoisonline.cpp:516 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" #: src/gui/widgets/battletab.cpp:45 msgid "Battle" -msgstr "" +msgstr "Bitvy" #: src/gui/widgets/channeltab.cpp:52 msgid "/users > Lists the users in the current channel" @@ -3509,7 +3579,8 @@ msgid "This command makes <nick> a channel operator." msgstr "" #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94 -#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85 +#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69 +#: src/net/ea/gui/partytab.cpp:85 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")." msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")." @@ -3547,6 +3618,45 @@ msgstr "Globální oznámení od %s:" msgid "%s whispers: %s" msgstr "" +#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67 +#: src/net/ea/gui/partytab.cpp:83 +msgid "Command: /invite <nick>" +msgstr "" + +#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68 +msgid "This command invites <nick> to the guild you're in." +msgstr "" + +#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74 +#: src/net/ea/gui/partytab.cpp:90 +msgid "Command: /leave" +msgstr "" + +#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75 +msgid "This command causes the player to leave the guild." +msgstr "" + +#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135 +#: src/net/ea/gui/partytab.cpp:69 +msgid "/help > Display this help." +msgstr "" + +#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136 +msgid "/invite > Invite a player to your guild" +msgstr "" + +#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137 +msgid "/leave > Leave the guild you are in" +msgstr "" + +#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138 +msgid "/kick > Kick some one from the guild you are in" +msgstr "" + +#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394 +msgid "Edit" +msgstr "Upravit" + #: src/gui/widgets/whispertab.cpp:107 msgid "/ignore > Ignore the other player" msgstr "" @@ -3580,8 +3690,7 @@ msgid "Command: /unignore <player>" msgstr "" #: src/gui/widgets/whispertab.cpp:131 -msgid "" -"This command stops ignoring the other player if they are being ignored." +msgid "This command stops ignoring the other player if they are being ignored." msgstr "" #: src/gui/windowmenu.cpp:65 @@ -3590,7 +3699,7 @@ msgstr "" #: src/gui/windowmenu.cpp:65 msgid "Bot checker" -msgstr "" +msgstr "Ověřovač botů" #: src/gui/windowmenu.cpp:67 msgid "ONL" @@ -3598,7 +3707,7 @@ msgstr "" #: src/gui/windowmenu.cpp:67 msgid "Who is online" -msgstr "" +msgstr "Kdo je online" #: src/gui/windowmenu.cpp:69 msgid "KS" @@ -3606,7 +3715,7 @@ msgstr "" #: src/gui/windowmenu.cpp:71 msgid "Smilies" -msgstr "" +msgstr "Smajlíci" #: src/gui/windowmenu.cpp:73 msgid "STA" @@ -3642,7 +3751,7 @@ msgstr "" #: src/gui/windowmenu.cpp:94 msgid "Shortcuts" -msgstr "" +msgstr "Zkratky" #: src/gui/windowmenu.cpp:96 msgid "SP" @@ -3658,7 +3767,7 @@ msgstr "" #: src/gui/windowmenu.cpp:98 msgid "Did you know" -msgstr "" +msgstr "Víte že" #: src/gui/windowmenu.cpp:100 msgid "SET" @@ -3666,39 +3775,39 @@ msgstr "" #: src/gui/worldselectdialog.cpp:77 msgid "Select World" -msgstr "" +msgstr "Zvol svět" #: src/gui/worldselectdialog.cpp:82 msgid "Change Login" -msgstr "" +msgstr "Změň přihlášení" #: src/gui/worldselectdialog.cpp:83 msgid "Choose World" -msgstr "" +msgstr "vyber svět" -#: src/inventory.cpp:248 +#: src/inventory.cpp:251 msgid "Storage" -msgstr "" +msgstr "Úložiště" -#: src/inventory.cpp:250 +#: src/inventory.cpp:253 msgid "Cart" -msgstr "" +msgstr "Košík" #: src/keyboardconfig.cpp:43 msgid "Move Up" -msgstr "" +msgstr "Pohyb nahoru" #: src/keyboardconfig.cpp:44 msgid "Move Down" -msgstr "" +msgstr "Pohyb dolů" #: src/keyboardconfig.cpp:45 msgid "Move Left" -msgstr "" +msgstr "Pohyb vlevo" #: src/keyboardconfig.cpp:46 msgid "Move Right" -msgstr "" +msgstr "Pohyb vpravo" #: src/keyboardconfig.cpp:49 msgid "Target & Attack" @@ -3706,19 +3815,19 @@ msgstr "Cíl & Útok" #: src/keyboardconfig.cpp:51 msgid "Move to Target" -msgstr "" +msgstr "Přejít k cíli" #: src/keyboardconfig.cpp:53 msgid "Change Move to Target type" -msgstr "" +msgstr "Změnit typ přesunu k cíli" #: src/keyboardconfig.cpp:55 msgid "Move to Home location" -msgstr "" +msgstr "Přejít na domácí místo" #: src/keyboardconfig.cpp:57 msgid "Set home location" -msgstr "" +msgstr "Nastavit domácí místo" #: src/keyboardconfig.cpp:59 msgid "Move to navigation point" @@ -3734,27 +3843,27 @@ msgstr "Zastavit Útok" #: src/keyboardconfig.cpp:64 msgid "Target Closest" -msgstr "" +msgstr "Zaměřit nejbližší" #: src/keyboardconfig.cpp:66 msgid "Target NPC" -msgstr "" +msgstr "Zaměřit NPC" #: src/keyboardconfig.cpp:67 msgid "Target Player" -msgstr "" +msgstr "Zaměřit hráče" #: src/keyboardconfig.cpp:69 msgid "Pickup" -msgstr "" +msgstr "Sebrat" #: src/keyboardconfig.cpp:70 msgid "Change Pickup Type" -msgstr "" +msgstr "Změnit typ sběru" #: src/keyboardconfig.cpp:72 msgid "Hide Windows" -msgstr "" +msgstr "Skrýt okna" #: src/keyboardconfig.cpp:74 msgid "Sit" @@ -3766,11 +3875,11 @@ msgstr "Snímek obrazovky" #: src/keyboardconfig.cpp:76 msgid "Enable/Disable Trading" -msgstr "" +msgstr "Zapnout/Vypnout obchody" #: src/keyboardconfig.cpp:78 msgid "Change Map View Mode" -msgstr "" +msgstr "Změnit mód zobrazení mapy" #: src/keyboardconfig.cpp:80 msgid "Item Shortcuts Key" @@ -3793,31 +3902,31 @@ msgstr "" #: src/keyboardconfig.cpp:122 msgid "Help Window" -msgstr "" +msgstr "Okno nápovědy" #: src/keyboardconfig.cpp:124 msgid "Status Window" -msgstr "" +msgstr "Stavové okno" #: src/keyboardconfig.cpp:126 msgid "Inventory Window" -msgstr "" +msgstr "Okno inventáře" #: src/keyboardconfig.cpp:128 msgid "Equipment Window" -msgstr "" +msgstr "Okno vybavení" #: src/keyboardconfig.cpp:130 msgid "Skill Window" -msgstr "" +msgstr "Okno dovedností" #: src/keyboardconfig.cpp:132 msgid "Minimap Window" -msgstr "" +msgstr "Okno s minimapou" #: src/keyboardconfig.cpp:134 msgid "Chat Window" -msgstr "" +msgstr "Okno s chatem" #: src/keyboardconfig.cpp:136 msgid "Item Shortcut Window" @@ -3825,27 +3934,27 @@ msgstr "" #: src/keyboardconfig.cpp:138 msgid "Setup Window" -msgstr "" +msgstr "Okno nastavení" #: src/keyboardconfig.cpp:140 msgid "Debug Window" -msgstr "" +msgstr "Debug okno" #: src/keyboardconfig.cpp:142 msgid "Social Window" -msgstr "" +msgstr "Okno spolešenství" #: src/keyboardconfig.cpp:144 msgid "Emote Shortcut Window" -msgstr "" +msgstr "Okno zkratek smajlíků" #: src/keyboardconfig.cpp:146 msgid "Outfits Window" -msgstr "" +msgstr "Okno výstroje" #: src/keyboardconfig.cpp:148 msgid "Shop Window" -msgstr "" +msgstr "Okno s obchodem" #: src/keyboardconfig.cpp:150 msgid "Quick drop Window" @@ -3865,19 +3974,19 @@ msgstr "" #: src/keyboardconfig.cpp:159 msgid "Who Is Online Window" -msgstr "" +msgstr "Okno \"Kdo je online\"" #: src/keyboardconfig.cpp:161 msgid "Did you know Window" -msgstr "" +msgstr "Okno \"Víte že...\"" #: src/keyboardconfig.cpp:164 msgid "Previous Social Tab" -msgstr "" +msgstr "Předchozí záložka společenství" #: src/keyboardconfig.cpp:166 msgid "Next Social Tab" -msgstr "" +msgstr "Další záložka společenství" #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174 @@ -3904,95 +4013,95 @@ msgstr "" #: src/keyboardconfig.cpp:355 #, c-format msgid "Emote Shortcut %d" -msgstr "" +msgstr "Zkratka smajlíku %d" #: src/keyboardconfig.cpp:261 msgid "Wear Outfit" -msgstr "" +msgstr "Obléct výstroj" #: src/keyboardconfig.cpp:263 msgid "Copy Outfit" -msgstr "" +msgstr "Kopírovat výstroj" #: src/keyboardconfig.cpp:265 msgid "Copy equipped to Outfit" -msgstr "" +msgstr "Kopírovat výbavu do výstroje" #: src/keyboardconfig.cpp:267 msgid "Toggle Chat" -msgstr "" +msgstr "Přepnout chat" #: src/keyboardconfig.cpp:269 msgid "Scroll Chat Up" -msgstr "" +msgstr "Rolovat chat nahoru" #: src/keyboardconfig.cpp:271 msgid "Scroll Chat Down" -msgstr "" +msgstr "Rolovat chat dolů" #: src/keyboardconfig.cpp:273 msgid "Previous Chat Tab" -msgstr "" +msgstr "Předchozí záložka chatu" #: src/keyboardconfig.cpp:275 msgid "Next Chat Tab" -msgstr "" +msgstr "Další záložka chatu" #: src/keyboardconfig.cpp:278 msgid "Close current Chat Tab" -msgstr "" +msgstr "Zavřít stávající záložku chatu" #: src/keyboardconfig.cpp:280 msgid "Previous chat line" -msgstr "" +msgstr "Předchozí řádek chatu" #: src/keyboardconfig.cpp:282 msgid "Next chat line" -msgstr "" +msgstr "Další řádek chatu" #: src/keyboardconfig.cpp:284 msgid "Chat Auto Complete" -msgstr "" +msgstr "Autodoplňování v chatu" #: src/keyboardconfig.cpp:286 msgid "Deactivate Chat Input" -msgstr "" +msgstr "Deaktivovat vstup chatu" #: src/keyboardconfig.cpp:288 msgid "Select OK" -msgstr "" +msgstr "Vybrat OK" #: src/keyboardconfig.cpp:291 msgid "Ignore input 1" -msgstr "" +msgstr "Ignorovat vstup 1" #: src/keyboardconfig.cpp:293 msgid "Ignore input 2" -msgstr "" +msgstr "Ignorovat vstup 2" #: src/keyboardconfig.cpp:295 msgid "Direct Up" -msgstr "" +msgstr "Otočit nahoru" #: src/keyboardconfig.cpp:296 msgid "Direct Down" -msgstr "" +msgstr "Otočit dolů" #: src/keyboardconfig.cpp:298 msgid "Direct Left" -msgstr "" +msgstr "Otočit vlevo" #: src/keyboardconfig.cpp:299 msgid "Direct Right" -msgstr "" +msgstr "Otočit vpravo" #: src/keyboardconfig.cpp:301 msgid "Crazy moves" -msgstr "" +msgstr "Šílené pohyby" #: src/keyboardconfig.cpp:303 msgid "Change Crazy Move mode" -msgstr "" +msgstr "Změnit mód šílených pohybů" #: src/keyboardconfig.cpp:305 msgid "Quick Drop N Items from 0 slot" @@ -4008,39 +4117,39 @@ msgstr "" #: src/keyboardconfig.cpp:311 msgid "Quick heal target or self" -msgstr "" +msgstr "Rychlé léčení cíle nebo sebe" #: src/keyboardconfig.cpp:313 msgid "Use #itenplz spell" -msgstr "" +msgstr "Použít kouzlo #itenplz" #: src/keyboardconfig.cpp:315 msgid "Use magic attack" -msgstr "" +msgstr "Použít magický útok" #: src/keyboardconfig.cpp:317 msgid "Switch magic attack" -msgstr "" +msgstr "Přepnout magický útok" #: src/keyboardconfig.cpp:319 msgid "Change move type" -msgstr "" +msgstr "Změnit typ pohybu" #: src/keyboardconfig.cpp:321 msgid "Change Attack Weapon Type" -msgstr "" +msgstr "Změnit typ útočné zbraně" #: src/keyboardconfig.cpp:323 msgid "Change Attack Type" -msgstr "" +msgstr "Změnit typ útoku" #: src/keyboardconfig.cpp:325 msgid "Change Follow mode" -msgstr "" +msgstr "Změnit mód následování" #: src/keyboardconfig.cpp:327 msgid "Change Imitation mode" -msgstr "" +msgstr "Změnit mód imitace" #: src/keyboardconfig.cpp:330 msgid "Disable / Enable Game modifier keys" @@ -4048,23 +4157,23 @@ msgstr "" #: src/keyboardconfig.cpp:331 msgid "On / Off audio" -msgstr "" +msgstr "Zapnout/Vypnout audio" #: src/keyboardconfig.cpp:333 msgid "Enable / Disable away mode" -msgstr "" +msgstr "Zapnout/Vypnout Away mód" #: src/keyboardconfig.cpp:335 msgid "Emulate right click from keyboard" -msgstr "" +msgstr "Emulovat pravý klik z klávesnice" #: src/keyboardconfig.cpp:337 msgid "Toggle camera mode" -msgstr "" +msgstr "přemnout mód kamery" #: src/keyboardconfig.cpp:339 msgid "Modifier key" -msgstr "" +msgstr "Klávesa modifikátoru" #: src/keyboardconfig.cpp:411 #, c-format @@ -4072,42 +4181,44 @@ msgid "" "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " "strange behaviour." msgstr "" +"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může " +"chovat podivně." -#: src/localplayer.cpp:371 +#: src/localplayer.cpp:377 msgid "You were killed by " -msgstr "" +msgstr "Zabil vás " -#: src/localplayer.cpp:1402 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." -msgstr "" +msgstr "Snažili jste se sebrat neexistující předmět." -#: src/localplayer.cpp:1404 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." -msgstr "" +msgstr "Předmět je příliš těžký." -#: src/localplayer.cpp:1406 +#: src/localplayer.cpp:1420 msgid "Item is too far away." -msgstr "" +msgstr "Předmět je příliš daleko." -#: src/localplayer.cpp:1408 +#: src/localplayer.cpp:1422 msgid "Inventory is full." -msgstr "" +msgstr "Inventář je plný." -#: src/localplayer.cpp:1410 +#: src/localplayer.cpp:1424 msgid "Stack is too big." -msgstr "" +msgstr "Hromada je příliš velká." -#: src/localplayer.cpp:1413 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." -msgstr "" +msgstr "Předmět patří někomu jinému." -#: src/localplayer.cpp:1416 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." -msgstr "" +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:1440 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4115,29 +4226,29 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/localplayer.cpp:3174 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "" -#: src/localplayer.cpp:3478 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3480 src/localplayer.cpp:3495 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" -msgstr "" +msgstr "Následování zrušeno." -#: src/localplayer.cpp:3487 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3489 src/localplayer.cpp:3497 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" -msgstr "" +msgstr "Imitace zrušena." -#: src/localplayer.cpp:3849 +#: src/localplayer.cpp:3832 msgid "You see " -msgstr "" +msgstr "Vidíte " #: src/main.cpp:47 msgid "manaplus [options] [mana-file]" @@ -4233,7 +4344,7 @@ msgstr "" #: src/net/ea/buysellhandler.cpp:163 msgid "Nothing to sell." -msgstr "" +msgstr "Nemáte nic k prodeji." #: src/net/ea/buysellhandler.cpp:171 msgid "Thanks for buying." @@ -4241,35 +4352,35 @@ msgstr "Děkuji za nákup." #: src/net/ea/buysellhandler.cpp:179 msgid "Unable to buy." -msgstr "" +msgstr "Nelze koupit." #: src/net/ea/charserverhandler.cpp:63 msgid "Strength:" -msgstr "" +msgstr "Síla:" #: src/net/ea/charserverhandler.cpp:64 msgid "Agility:" -msgstr "" +msgstr "Hbitost:" #: src/net/ea/charserverhandler.cpp:65 msgid "Vitality:" -msgstr "" +msgstr "Vitalita:" #: src/net/ea/charserverhandler.cpp:66 msgid "Intelligence:" -msgstr "" +msgstr "Inteligence:" #: src/net/ea/charserverhandler.cpp:67 msgid "Dexterity:" -msgstr "" +msgstr "Obratnost:" #: src/net/ea/charserverhandler.cpp:68 msgid "Luck:" -msgstr "" +msgstr "Štěstí:" #: src/net/ea/charserverhandler.cpp:102 msgid "Access denied. Most likely, there are too many players on this server." -msgstr "" +msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů." #: src/net/ea/charserverhandler.cpp:106 msgid "Cannot use this ID." @@ -4277,117 +4388,87 @@ msgstr "" #: src/net/ea/charserverhandler.cpp:109 msgid "Unknown char-server failure." -msgstr "" +msgstr "Neznámá chyba postavy na serveru." #: src/net/ea/charserverhandler.cpp:138 msgid "Failed to create character. Most likely the name is already taken." 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 msgid "Wrong name." -msgstr "" +msgstr "Špatné jméno." #: src/net/ea/charserverhandler.cpp:145 msgid "Incorrect stats." -msgstr "" +msgstr "Nesprávné statistiky." #: src/net/ea/charserverhandler.cpp:148 msgid "Incorrect hair." -msgstr "" +msgstr "Nesprávný účes." #: src/net/ea/charserverhandler.cpp:151 msgid "Incorrect slot." -msgstr "" +msgstr "Nesprávný slot." #: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210 msgid "Info" -msgstr "Info" +msgstr "informaceInfo" #: src/net/ea/charserverhandler.cpp:166 msgid "Character deleted." -msgstr "" +msgstr "Postava odstraněna." #: src/net/ea/charserverhandler.cpp:172 msgid "Failed to delete character." -msgstr "" +msgstr "Nepodařilo se odstranit postavu." -#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66 -#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77 -#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88 -#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101 +#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67 +#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78 +#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89 +#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102 msgid "Channels are not supported!" -msgstr "" +msgstr "Kanály nejsou podporovány." -#: src/net/ea/chathandler.cpp:128 +#: src/net/ea/chathandler.cpp:129 #, c-format msgid "Whisper could not be sent, %s is offline." -msgstr "" +msgstr "Nelze odeslat šeptání, %s není připojen." -#: src/net/ea/chathandler.cpp:136 +#: src/net/ea/chathandler.cpp:137 #, c-format msgid "Whisper could not be sent, ignored by %s." -msgstr "" +msgstr "Nelze odeslat šeptání, %s vás ignoruje." -#: src/net/ea/chathandler.cpp:348 +#: src/net/ea/chathandler.cpp:355 msgid "MVP player." msgstr "" -#: src/net/ea/chathandler.cpp:352 +#: src/net/ea/chathandler.cpp:359 msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" -msgstr "" +msgstr "připojených uživatel: %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" -msgstr "" +msgstr "Hra" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" -#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83 -msgid "Command: /invite <nick>" -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:68 -msgid "This command invites <nick> to the guild you're in." -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90 -msgid "Command: /leave" -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:75 -msgid "This command causes the player to leave the guild." -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69 -msgid "/help > Display this help." -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:136 -msgid "/invite > Invite a player to your guild" -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:137 -msgid "/leave > Leave the guild you are in" -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:138 -msgid "/kick > Kick some one from the guild you are in" -msgstr "" - #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85 msgid "Guild created." -msgstr "" +msgstr "Gilda vytvořena." #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93 msgid "You are already in guild." -msgstr "" +msgstr "Již jste členem gildy." #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." @@ -4395,90 +4476,86 @@ msgstr "" #: src/net/ea/guildhandler.cpp:103 msgid "Unknown server response." -msgstr "" +msgstr "Neznámá odpověď serveru." -#: src/net/ea/guildhandler.cpp:180 +#: src/net/ea/guildhandler.cpp:181 #, c-format msgid "Guild name: %s" -msgstr "" +msgstr "Jméno gildy: %s" -#: src/net/ea/guildhandler.cpp:182 +#: src/net/ea/guildhandler.cpp:183 #, c-format msgid "Guild master: %s" -msgstr "" +msgstr "Vedoucí gildy: %s" -#: src/net/ea/guildhandler.cpp:184 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Guild level: %d" -msgstr "" +msgstr "Úroveň gildy: %d" -#: src/net/ea/guildhandler.cpp:186 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Online members: %d" -msgstr "" +msgstr "Připojených členů: %d" -#: src/net/ea/guildhandler.cpp:188 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Max members: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:190 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Average level: %d" -msgstr "" +msgstr "Průměrná úroveň: %d" -#: src/net/ea/guildhandler.cpp:192 +#: src/net/ea/guildhandler.cpp:193 #, c-format msgid "Guild exp: %d" -msgstr "" +msgstr "Zkušenosti gildy: %d" -#: src/net/ea/guildhandler.cpp:194 +#: src/net/ea/guildhandler.cpp:195 #, c-format msgid "Guild next exp: %d" msgstr "" -#: src/net/ea/guildhandler.cpp:196 +#: src/net/ea/guildhandler.cpp:197 #, c-format msgid "Guild castle: %s" msgstr "" -#: src/net/ea/guildhandler.cpp:402 +#: src/net/ea/guildhandler.cpp:403 msgid "Could not inivte user to guild." -msgstr "" +msgstr "Nelze pozvat uživatele do gildy." -#: src/net/ea/guildhandler.cpp:406 +#: src/net/ea/guildhandler.cpp:407 msgid "User rejected guild invite." -msgstr "" +msgstr "Uživatel zamítl pozvánku do gildy." -#: src/net/ea/guildhandler.cpp:410 +#: src/net/ea/guildhandler.cpp:411 msgid "User is now part of your guild." -msgstr "" +msgstr "Uživatel je nyní členem vaší gildy." -#: src/net/ea/guildhandler.cpp:414 +#: src/net/ea/guildhandler.cpp:415 msgid "Your guild is full." -msgstr "" +msgstr "Vaše gilda je plná." -#: src/net/ea/guildhandler.cpp:418 +#: src/net/ea/guildhandler.cpp:419 msgid "Unknown guild invite response." -msgstr "" - -#: src/net/ea/guildhandler.cpp:438 -msgid "You have left the guild." -msgstr "" +msgstr "Neznámá odpověď na pozváku do gildy." -#: src/net/ea/guildhandler.cpp:452 +#: src/net/ea/guildhandler.cpp:453 #, c-format msgid "%s has left your guild." -msgstr "" +msgstr "%s opustil vaši gildu." -#: src/net/ea/guildhandler.cpp:483 +#: src/net/ea/guildhandler.cpp:484 msgid "You was kicked from guild." -msgstr "" +msgstr "Byl jste vykopnut z gildy." -#: src/net/ea/guildhandler.cpp:496 +#: src/net/ea/guildhandler.cpp:497 #, c-format msgid "%s has kicked from your guild." -msgstr "" +msgstr "%s byl vykopnut z vaší gildy." #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" @@ -4554,78 +4631,78 @@ msgstr "" #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286 msgid "Item sharing enabled." -msgstr "" +msgstr "Sdílení předmětů povoleno." #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296 msgid "Item sharing disabled." -msgstr "" +msgstr "Sdílení předmětů zakázáno." #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306 msgid "Item sharing not possible." -msgstr "" +msgstr "Sdílení předmětů není možné." #: src/net/ea/gui/partytab.cpp:157 msgid "Item sharing unknown." -msgstr "" +msgstr "Stav sdílení předmětů neznámý." #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248 msgid "Experience sharing enabled." -msgstr "" +msgstr "Sdílení zkušeností povoleno." #: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258 msgid "Experience sharing disabled." -msgstr "" +msgstr "Sdílení zkušeností zakázáno." #: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268 msgid "Experience sharing not possible." -msgstr "" +msgstr "Sdílení zkušeností není možné." #: src/net/ea/gui/partytab.cpp:196 msgid "Experience sharing unknown." -msgstr "" +msgstr "Stav sdílení zkušeností neznámý." #: src/net/ea/inventoryhandler.cpp:407 msgid "Failed to use item." -msgstr "" +msgstr "Pokus o použití předmětu selhal." #: src/net/ea/inventoryhandler.cpp:580 msgid "Unable to equip." -msgstr "" +msgstr "Nelze vybavit." #: src/net/ea/loginhandler.cpp:131 msgid "Account was not found. Please re-login." -msgstr "" +msgstr "Účet nenalezen, prosím přihlaste se znovu." #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." -msgstr "" +msgstr "Půvoní heslo je nesprávné." #: src/net/ea/loginhandler.cpp:137 msgid "New password too short." -msgstr "" +msgstr "Nové heslo je příliš krátké." #: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." -msgstr "" +msgstr "Neznámá chyba." #: src/net/ea/loginhandler.cpp:205 msgid "Unregistered ID." -msgstr "" +msgstr "Neregistované ID." #: src/net/ea/loginhandler.cpp:208 msgid "Wrong password." -msgstr "" +msgstr "Špatné heslo." #: src/net/ea/loginhandler.cpp:211 msgid "Account expired." -msgstr "" +msgstr "Platnost účtu vypršela." #: src/net/ea/loginhandler.cpp:214 msgid "Rejected from server." -msgstr "" +msgstr "Odmítnut ze serveru." #: src/net/ea/loginhandler.cpp:217 msgid "" @@ -4634,7 +4711,7 @@ msgstr "" #: src/net/ea/loginhandler.cpp:221 msgid "Client too old." -msgstr "" +msgstr "Klient je příliš starý." #: src/net/ea/loginhandler.cpp:224 #, c-format @@ -4645,48 +4722,48 @@ msgstr "" #: src/net/ea/loginhandler.cpp:231 msgid "Server overpopulated." -msgstr "" +msgstr "Server je přelidněný." #: src/net/ea/loginhandler.cpp:234 msgid "This user name is already taken." -msgstr "" +msgstr "Toto uživatelské jméno je již používáno." #: src/net/ea/loginhandler.cpp:240 msgid "Username permanently erased." -msgstr "" +msgstr "Uživatelské jméno bylo trvale odstraněno." #: src/net/ea/partyhandler.cpp:82 msgid "Could not create party." -msgstr "" +msgstr "Nelze vytvořit partu." #: src/net/ea/partyhandler.cpp:84 msgid "Party successfully created." -msgstr "" +msgstr "Parta úspěšně vytvořena." #: src/net/ea/partyhandler.cpp:140 #, c-format msgid "%s has joined your party." -msgstr "" +msgstr "%s se připojil k vaší partě." #: src/net/ea/partyhandler.cpp:176 #, c-format msgid "%s is already a member of a party." -msgstr "" +msgstr "%s je již členem vaší party." #: src/net/ea/partyhandler.cpp:181 #, c-format msgid "%s refused your invitation." -msgstr "" +msgstr "%s zamítl vaši pozvánku." #: src/net/ea/partyhandler.cpp:186 #, c-format msgid "%s is now a member of your party." -msgstr "" +msgstr "%s je nyní člen vaší party." #: src/net/ea/partyhandler.cpp:191 #, c-format msgid "%s can't join your party because party is full." -msgstr "" +msgstr "%s nemůže být členem party, jelikož je parta plná." #: src/net/ea/partyhandler.cpp:196 #, c-format @@ -4695,185 +4772,190 @@ msgstr "" #: src/net/ea/partyhandler.cpp:356 msgid "You have left the party." -msgstr "" +msgstr "Odešel jste z party." -#: src/net/ea/partyhandler.cpp:368 +#: src/net/ea/partyhandler.cpp:369 #, c-format msgid "%s has left your party." -msgstr "" +msgstr "%s opustil vaši partu." -#: src/net/ea/partyhandler.cpp:444 +#: src/net/ea/partyhandler.cpp:448 #, c-format msgid "An unknown member tried to say: %s" -msgstr "" +msgstr "Neznámý člen se snažil říct: %s" #: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." -msgstr "" +msgstr "Jste mrtev." #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." -msgstr "" +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 msgid "You are not that alive anymore." -msgstr "" +msgstr "Nejste již více naživu." #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "" +msgstr "Chladné ruce smrti se natahují po vaší duši." #: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" -msgstr "" +msgstr "Konec hry!" #: src/net/ea/playerhandler.cpp:101 msgid "Insert coin to continue." -msgstr "" +msgstr "Vložte minci pro pokračování." #: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." 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 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." -msgstr "" +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 msgid "I guess this did not run too well." -msgstr "" +msgstr "Tuším že to nešlo tak hladce." #: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" -msgstr "" +msgstr "Chcete zaevidovat váš majetek?" #: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." -msgstr "" +msgstr "Žel, nezbyla po vás ani stopa..." #: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." -msgstr "" +msgstr "Zničen." #: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." -msgstr "" +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 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 msgid "You're not dead yet. You're just resting." -msgstr "" +msgstr "Ještě nejste mrtev. Zatím jen odpočíváte." #: src/net/ea/playerhandler.cpp:120 msgid "You are no more." -msgstr "" +msgstr "Již nejste." #: src/net/ea/playerhandler.cpp:121 msgid "You have ceased to be." -msgstr "" +msgstr "Bylo vám odepřeno být." #: src/net/ea/playerhandler.cpp:122 msgid "You've expired and gone to meet your maker." -msgstr "" +msgstr "Expiroval jste a šel jste navštívit svého tvůrce." #: src/net/ea/playerhandler.cpp:123 msgid "You're a stiff." -msgstr "" +msgstr "Jste tuhý." #: src/net/ea/playerhandler.cpp:124 msgid "Bereft of life, you rest in peace." -msgstr "" +msgstr "Jste zbaven života, odpočívejte v pokoji." #: src/net/ea/playerhandler.cpp:125 msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" +msgstr "Kdybyste nebyl tak animovaný, čuchal by jste ke květinkám zespoda." #: src/net/ea/playerhandler.cpp:126 msgid "Your metabolic processes are now history." -msgstr "" +msgstr "vaše metabolické procesy jsou nyní historií." #: src/net/ea/playerhandler.cpp:127 msgid "You're off the twig." -msgstr "" +msgstr "Padl jste." #: src/net/ea/playerhandler.cpp:128 msgid "You've kicked the bucket." -msgstr "" +msgstr "A je to v kýblu." #: src/net/ea/playerhandler.cpp:129 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." 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 msgid "You are an ex-player." -msgstr "" +msgstr "nyní jste bývalý hráč." #: src/net/ea/playerhandler.cpp:132 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:425 +#: src/net/ea/playerhandler.cpp:428 msgid "Message" -msgstr "" +msgstr "Zpráva" #: src/net/ea/playerhandler.cpp:337 msgid "" -"You are carrying more than half your weight. You are unable to regain " -"health." -msgstr "" +"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 msgid "You are carrying less than half your weight. You can regain health." -msgstr "" +msgstr "Nesete méně než polovinu vaší váhy. Obnovování života je nyní možné." -#: src/net/ea/playerhandler.cpp:451 +#: src/net/ea/playerhandler.cpp:454 #, c-format msgid "You picked up %s." -msgstr "" +msgstr "Sebral jste %s." -#: src/net/ea/playerhandler.cpp:457 +#: src/net/ea/playerhandler.cpp:460 #, c-format msgid "You spent %s." -msgstr "" +msgstr "utratil jste %s." -#: src/net/ea/playerhandler.cpp:501 +#: src/net/ea/playerhandler.cpp:506 msgid "Cannot raise skill!" -msgstr "" +msgstr "Nelze zlepšit tuto dovednost!" -#: src/net/ea/playerhandler.cpp:618 +#: src/net/ea/playerhandler.cpp:624 msgid "Equip arrows first." -msgstr "" +msgstr "nejdřív se vybavte šípy." #: src/net/ea/specialhandler.cpp:149 msgid "Trade failed!" -msgstr "" +msgstr "Obchod selhal!" #: src/net/ea/specialhandler.cpp:152 msgid "Emote failed!" -msgstr "" +msgstr "Smajlík selhal!" #: src/net/ea/specialhandler.cpp:155 msgid "Sit failed!" -msgstr "" +msgstr "Sednutí selhalo!" #: src/net/ea/specialhandler.cpp:158 msgid "Chat creating failed!" -msgstr "" +msgstr "Selhalo vytváčení postavy!" #: src/net/ea/specialhandler.cpp:161 msgid "Could not join party!" -msgstr "" +msgstr "Nemůžete vstoupit do party!" #: src/net/ea/specialhandler.cpp:164 msgid "Cannot shout!" @@ -4881,15 +4963,15 @@ msgstr "" #: src/net/ea/specialhandler.cpp:177 msgid "You have not yet reached a high enough lvl!" -msgstr "" +msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!" #: src/net/ea/specialhandler.cpp:181 msgid "Insufficient HP!" -msgstr "" +msgstr "Nedostatek životů (HP)!" #: src/net/ea/specialhandler.cpp:184 msgid "Insufficient SP!" -msgstr "" +msgstr "Nedostatek many (SP)!" #: src/net/ea/specialhandler.cpp:187 msgid "You have no memos!" @@ -4897,15 +4979,15 @@ msgstr "" #: src/net/ea/specialhandler.cpp:190 msgid "You cannot do that right now!" -msgstr "" +msgstr "Nyní toto nelze!" #: src/net/ea/specialhandler.cpp:193 msgid "Seems you need more money... ;-)" -msgstr "" +msgstr "Vypadá to že potřebujete více peněz... ;-)" #: src/net/ea/specialhandler.cpp:196 msgid "You cannot use this skill with that kind of weapon!" -msgstr "" +msgstr "Nemůžete použít tuto dovednost s touto zbraní!" #: src/net/ea/specialhandler.cpp:200 msgid "You need another red gem!" @@ -4990,7 +5072,7 @@ msgstr "" msgid "Trade completed." msgstr "" -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258 msgid "Strength" msgstr "Síla" @@ -4999,7 +5081,7 @@ msgstr "Síla" msgid "Strength %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259 msgid "Agility" msgstr "Hbitost" @@ -5008,7 +5090,7 @@ msgstr "Hbitost" msgid "Agility %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262 msgid "Dexterity" msgstr "Obratnost" @@ -5017,7 +5099,7 @@ msgstr "Obratnost" msgid "Dexterity %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260 msgid "Vitality" msgstr "Vitalita" @@ -5026,7 +5108,7 @@ msgstr "Vitalita" msgid "Vitality %+.1f" msgstr "" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261 msgid "Intelligence" msgstr "Inteligence" @@ -5296,111 +5378,115 @@ msgstr "" msgid "Unable to sell unsellable item." msgstr "" -#: src/net/tmwa/generalhandler.cpp:109 +#: src/net/tmwa/generalhandler.cpp:108 #, c-format msgid "Strength %+d" msgstr "" -#: src/net/tmwa/generalhandler.cpp:110 +#: src/net/tmwa/generalhandler.cpp:109 #, c-format msgid "Agility %+d" msgstr "" -#: src/net/tmwa/generalhandler.cpp:111 +#: src/net/tmwa/generalhandler.cpp:110 #, c-format msgid "Vitality %+d" msgstr "" -#: src/net/tmwa/generalhandler.cpp:112 +#: src/net/tmwa/generalhandler.cpp:111 #, c-format msgid "Intelligence %+d" msgstr "" -#: src/net/tmwa/generalhandler.cpp:113 +#: src/net/tmwa/generalhandler.cpp:112 #, c-format msgid "Dexterity %+d" msgstr "" -#: src/net/tmwa/generalhandler.cpp:114 +#: src/net/tmwa/generalhandler.cpp:113 #, c-format msgid "Luck %+d" msgstr "" -#: src/net/tmwa/generalhandler.cpp:140 +#: src/net/tmwa/generalhandler.cpp:139 msgid "Authentication failed." msgstr "" -#: src/net/tmwa/generalhandler.cpp:143 +#: src/net/tmwa/generalhandler.cpp:142 msgid "No servers available." msgstr "" -#: src/net/tmwa/generalhandler.cpp:147 +#: src/net/tmwa/generalhandler.cpp:146 msgid "Someone else is trying to use this account." msgstr "" -#: src/net/tmwa/generalhandler.cpp:150 +#: src/net/tmwa/generalhandler.cpp:149 msgid "This account is already logged in." msgstr "" -#: src/net/tmwa/generalhandler.cpp:153 +#: src/net/tmwa/generalhandler.cpp:152 msgid "Speed hack detected." msgstr "" -#: src/net/tmwa/generalhandler.cpp:156 +#: src/net/tmwa/generalhandler.cpp:155 msgid "Duplicated login." msgstr "" -#: src/net/tmwa/generalhandler.cpp:159 +#: src/net/tmwa/generalhandler.cpp:158 msgid "Unknown connection error." msgstr "" -#: src/net/tmwa/generalhandler.cpp:232 +#: src/net/tmwa/generalhandler.cpp:231 msgid "Got disconnected from server!" msgstr "" -#: src/net/tmwa/generalhandler.cpp:264 +#: src/net/tmwa/generalhandler.cpp:263 msgid "Luck" msgstr "Štěstí" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:266 msgid "Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:267 msgid "M.Attack" msgstr "" -#: src/net/tmwa/generalhandler.cpp:269 +#: src/net/tmwa/generalhandler.cpp:268 msgid "M.Defense" msgstr "" -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:270 #, no-c-format msgid "% Accuracy" msgstr "" -#: src/net/tmwa/generalhandler.cpp:273 +#: src/net/tmwa/generalhandler.cpp:272 #, no-c-format msgid "% Evade" msgstr "" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Critical" msgstr "" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:275 msgid "Attack Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:277 msgid "Walk Delay" msgstr "" -#: src/net/tmwa/generalhandler.cpp:280 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Range" msgstr "" +#: src/net/tmwa/generalhandler.cpp:281 +msgid "Damage per sec." +msgstr "" + #: src/net/tmwa/network.cpp:152 msgid "Empty address given to Network::connect()!" msgstr "" @@ -5418,49 +5504,47 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "Attack %+d" msgstr "Útok %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "Defense %+d" msgstr "Obrana %+d" -#: src/resources/itemdb.cpp:67 +#: src/resources/itemdb.cpp:65 #, c-format msgid "HP %+d" msgstr "" -#: src/resources/itemdb.cpp:68 +#: src/resources/itemdb.cpp:66 #, c-format msgid "MP %+d" msgstr "" -#: src/resources/itemdb.cpp:171 +#: src/resources/itemdb.cpp:169 msgid "Unknown item" msgstr "Neznámý předmět" - - @@ -2,17 +2,18 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # -# <der.loisl@gmx.de>, 2011. +# Translators: +# Andrei Karas <akaras@inbox.ru>, 2011. # <clos3rlook@gmail.com>, 2011. +# <der.loisl@gmx.de>, 2011. # <jack@krass.com>, 2011. # <Necromong@inbox.ru>, 2011. -# Andrei Karas <akaras@inbox.ru>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/" "de/)\n" @@ -22,57 +23,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "ausweichen" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "verfehlt" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Einstellungen" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Video" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Verbinde zum Server" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Anmelden" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Betrete die Spielwelt" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Spielfiguren werden angefragt" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Verbinde zum Charakterserver" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Charakterserver wechseln" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -82,64 +95,64 @@ msgstr "Charakterserver wechseln" msgid "Error" msgstr "Fehler" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Anfrage der Registrierungsdetails" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Passwort ändern" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Passwort erfolgreich geändert!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "E-Mail ändern" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "E-Mail erfolgreich geändert!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "erfolgreich abgemeldet." -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Leb wohl und komme jeder Zeit wieder..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s existiert nicht und kann nicht erstellt werden! Beende." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Ungültiger Updateserver: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" "Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Unbekannter Befehl." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Kann keine leeren Nachrichten versenden!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -148,152 +161,152 @@ msgstr "" "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, " "oder du bist es selbst." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Anfrage den Kanal %s betreten zu dürfen." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Name der Party fehlt." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Name der Gilde fehlt." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Bitte gib einen Namen an." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Nachricht schließt den Chat." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Enter aktiviert jetzt den Chat." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Nachricht schließt jetzt den Chat." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "Freund" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "unbeachtet" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Spieler ist bereits %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Spieler erfolgreich %s!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Spieler konnte nicht %s werden!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "Spieler wurde nicht ignoriert!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "Spieler wird nicht länger ignoriert!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Spieler ist bereits gelöscht!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Spieler erfolgreich gelöscht!" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Spieler konnte nicht gelöscht werden!" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -311,15 +324,15 @@ msgstr "Allgemein" msgid "Debug" msgstr "Debug" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Bildschirmfoto gespeichert unter" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Bildschirmfoto konnte nicht gespeichert werden!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "Die Verbindung zum Server wurde getrennt." @@ -327,19 +340,19 @@ msgstr "Die Verbindung zum Server wurde getrennt." msgid "Network Error" msgstr "Netzwerkfehler" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Ignoriere eingehende Handelsanfragen" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Akzeptiere eingehende Handelsanfragen" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Karte konnte nicht geladen werden." -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Fehler beim Laden von %s" @@ -368,37 +381,38 @@ msgstr "" msgid "Bot Checker" msgstr "Bot-Prüfer" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Name" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Angriff" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Sprechen" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Bewegen" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Resultat" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Zurücksetzten" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Kaufen" @@ -425,7 +439,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -438,12 +452,12 @@ msgid "Max" msgstr "Max" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Laden" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -452,16 +466,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -562,7 +576,7 @@ msgstr "Frisur:" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Erstellen" @@ -630,26 +644,26 @@ msgstr "" msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Löschen" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Wähle" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Level: %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(leer)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "Standard" @@ -705,11 +719,12 @@ msgstr "Regenbogen 2" msgid "rainbow 3" msgstr "Regenbogen 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -735,14 +750,14 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "ignorieren" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Karte" @@ -883,8 +898,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Schließen" @@ -901,7 +916,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "Ok" @@ -909,10 +924,10 @@ msgstr "Ok" msgid "Equipment" msgstr "Ausrüstung" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Ablegen" @@ -920,80 +935,88 @@ msgstr "Ablegen" msgid "Help" msgstr "Hilfe" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventar" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Plätze:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Filter:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Sortieren:" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Ausrüsten" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Benutzen" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Wegwerfen" -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Aufteilen" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Ausrüstung" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Gewicht:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Aufbewahren" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Abholen" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Wegwerfen" @@ -1047,91 +1070,91 @@ msgstr "Gewicht: %s" msgid "Kill stats" msgstr "" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Statistik zurücksetzen" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Timer zurücksetzen" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "Du hast die Guilde verlassen." @@ -1229,11 +1252,11 @@ msgid "Submit" msgstr "Absenden" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Frei" @@ -1271,328 +1294,329 @@ msgstr "Zuerst ausziehen" msgid "Away outfit" msgstr "Abwesend-Outfit" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handeln" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Flüstern" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Heilen" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Befreunden" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "@@ignore|Ignoriere %s komplett@@" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Folgen" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "Kommentar hinzufügen" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Aufheben" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Zu Chat hinzufügen" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Umbenennen" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Entfernen" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Zaubersprüche" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Hervorhebung abschalten" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Hervorhebung einschalten" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Verlassen" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "Position der Gilde ändern" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Kartenzeichen umbenennen" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Name:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "10 aufbewahren" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Die Hälfte aufbewahren" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Alles aufbewahren" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "10 abholen" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Die Hälfte abholen" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Alles abholen" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Server wechseln" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Spielfigur wechseln" @@ -1832,7 +1856,7 @@ msgstr "Zeit" msgid "Use local time" msgstr "" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "" @@ -1995,122 +2019,130 @@ msgstr "Zeige Pfad" msgid "Draw hotkeys on map" msgstr "Zeige Hotekeys auf der Karte" -#: src/gui/setup_other.cpp:88 -msgid "Moving" +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" msgstr "" #: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 +msgid "Moving" +msgstr "" + +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Automatischen Berichtigen der Position" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Während des Bewegens angreifen" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "Synchronisiere Bewegungen des Spielers" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Verrückte Bewegungen A-Programm" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Spieler" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Eigenen HP-Balken anzeigen" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Angriffsziele des Spielers einkreisen" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Zeige \"job exp\"-Nachrichten" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Zeige Job" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Verkauf- und Kaufanfragen akzeptieren" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Laden-Modus einschalten" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Protokolliere NPC Dialoge" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Botprüfer einschalten" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Debug-Protokoll benutzen" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Zeige Hintergrund" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2120,27 +2152,27 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" +msgid "Hw acceleration" msgstr "" #: src/gui/setup_perfomance.cpp:64 -msgid "Hw acceleration" +msgid "Enable opacity cache (Software, can use many memory)" msgstr "" #: src/gui/setup_perfomance.cpp:67 -msgid "Enable opacity cache (Software, can use many memory)" +msgid "Enable map reduce (Software)" msgstr "" #: src/gui/setup_perfomance.cpp:70 -msgid "Enable map reduce (Software)" +msgid "Better quality (disable for better perfomance)" msgstr "" #: src/gui/setup_perfomance.cpp:73 -msgid "Better quality (disable for better perfomance)" +msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 -msgid "Enable alpha channel fix (Software, can be very slow)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" msgstr "" #: src/gui/setup_perfomance.cpp:80 @@ -2395,14 +2427,10 @@ msgid "FPS limit:" msgstr "FPS Limit:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Alt FPS Limit:" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Video" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Chat über Spielern" @@ -2421,7 +2449,7 @@ msgstr "Partikeldetail" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Kein(e)" @@ -2535,22 +2563,22 @@ msgstr "Erhöhen" msgid "Skill points available: %d" msgstr "Fähigkeitspunkte verfügbar: %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Lvl: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "" @@ -2750,243 +2778,243 @@ msgstr "Name deiner Party wählen." msgid "Specials" msgstr "Special" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3475,23 +3503,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" @@ -4163,68 +4191,68 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Abwesend" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Folgen:" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "Du siehst" @@ -4425,16 +4453,16 @@ msgstr "" msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Spiel" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5484,19 +5512,19 @@ msgstr "Verbindung mit Server abgebrochen. " msgid "%s is not in your party!" msgstr "%s ist nicht in Deiner Party!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Drucke '..'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Blinkender Name" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Schwebende '...' Blase" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "Schwebende Blase" @@ -2,17 +2,18 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # -# Nelson <nelson6eeduardo65@gmail.com>, 2011. -# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011. -# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011. -# Jumpy <antoinebcn@hotmail.com>, 2011. +# Translators: # Andrei Karas <akaras@inbox.ru>, 2011. +# Jumpy <antoinebcn@hotmail.com>, 2011. +# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011. +# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011. +# Nelson <nelson6eeduardo65@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 22:15+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-17 04:30+0000\n" "Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" "manaplus/team/es/)\n" @@ -22,57 +23,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Visible sobre el mapa" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "evade" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "falla" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "I" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuración" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "Rendimiento" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Vídeo" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "Temas" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Conectando al servidor" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Accediendo a la cuenta" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Entrando al mundo del juego" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Cargando personajes" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Conectando al servidor del juego" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Cambiando servidores del juego" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -82,63 +95,63 @@ msgstr "Cambiando servidores del juego" msgid "Error" msgstr "Error" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Solicitando detalles de registro" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Cambio de contraseña" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "¡Contraseña cambiada exitosamente!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Cambio de Email" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "¡Email modificado exitosamente!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Registro cancelado" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Adiós, vuelve cuando quieras..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "¡%s no existe y no puede ser creado! Saliendo." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Servidor de actualización inválido: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "¡Error al crear la carpeta de actualizaciones!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Comando desconocido." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "¡No puedes enviar susurros vacíos!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -147,152 +160,152 @@ msgstr "" "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya " "existe, o eres tú." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando la entrada del canal %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta el nombre del grupo." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." -msgstr "Falta el nombre del gremio." +msgstr "Falta el nombre del Clan." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Por favor, especifique un nombre." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Volver a alternar el chat." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Mensaje cierra la charla." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Volver ahora a cambiar de chat." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Mensaje ahora cierra el chat." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "desatendido" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "¡Jugador ya es %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "¡Jugador %s exitosamente!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "¡Jugador no pudo ser %s!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "El jugador no estaba ignorado!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "¡El jugador ya no es ignorado!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "¡Al jugador no se le puede dejar de ignorar!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "¡Jugador ya borrado!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "¡Jugador borrado con éxito!" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "¡Jugador no pudo ser borrado!" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "Tiempo de actividad del cliente: %s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d día" msgstr[1] "%d días" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "tamaño de caché de fuente" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "Tám. caché:" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Creado:" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Borrado:" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "Imágenes de recurso:" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "Imágenes de recurso huérfano:" @@ -310,15 +323,15 @@ msgstr "General" msgid "Debug" msgstr "Depurador" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Captura de pantalla guardada como " -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "¡El guardado de la captura de pantalla ha fallado!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "Se ha perdido la conexión con el servidor." @@ -326,19 +339,19 @@ msgstr "Se ha perdido la conexión con el servidor." msgid "Network Error" msgstr "Error de Red" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Ignorando las peticiones de intercambio" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Aceptando las peticiones de intercambio" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "No se pudo cargar el mapa" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Error mientras cargaba %s" @@ -351,7 +364,7 @@ msgstr "Grupo: %s" #: src/gui/beingpopup.cpp:138 #, c-format msgid "Guild: %s" -msgstr "Gremio: %s" +msgstr "Clan: %s" #: src/gui/beingpopup.cpp:151 #, c-format @@ -367,37 +380,38 @@ msgstr "Comentario: %s" msgid "Bot Checker" msgstr "Bot Checker" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nombre" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Hablar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Mover" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Restablecer" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Comprar" @@ -424,7 +438,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -437,12 +451,12 @@ msgid "Max" msgstr "Máximo" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Tienda" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -451,16 +465,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -561,7 +575,7 @@ msgstr "Peinado:" msgid "Race:" msgstr "Race:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Crear" @@ -629,26 +643,26 @@ msgstr "Ingrese la contraseña para borrar el personaje" msgid "Enter password:" msgstr "Ingrese contraseña:" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Borrar" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Seleccionar" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Nivel: %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(vacío)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "predeterminado" @@ -704,11 +718,12 @@ msgstr "arco iris 2" msgid "rainbow 3" msgstr "arco iris 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -734,14 +749,14 @@ msgstr "Sí" msgid "No" msgstr "No" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Ignorar" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Mapa" @@ -840,7 +855,7 @@ msgstr "Grupo de destino:" #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 #: src/gui/debugwindow.cpp:349 msgid "Target Guild:" -msgstr "Diana de Guild:" +msgstr "Target Guild:" #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 #: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 @@ -882,8 +897,8 @@ msgid "Did You Know?" msgstr "¿Sabías que...?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Cerrar" @@ -900,7 +915,7 @@ msgid "Auto open this window" msgstr "Abrir automáticamente esta ventana" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" @@ -908,10 +923,10 @@ msgstr "OK" msgid "Equipment" msgstr "Equipamiento" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Quitárselo" @@ -919,80 +934,88 @@ msgstr "Quitárselo" msgid "Help" msgstr "Ayuda" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "por nombre" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "por id" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "por peso" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "por cantidad" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "por tipo" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventario" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Espacios:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Filtro:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Ordenar:" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "na" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "az" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Equipar" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Usar" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Tirar..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Dividir" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Conjuntos" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Peso:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Almacenar" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Recuperar" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Tirar" @@ -1046,93 +1069,93 @@ msgstr "Peso: %s" msgid "Kill stats" msgstr "Estadísticas" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Restablecer estadísticas" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Restablecer cronometrador" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "Nivel: %d de %f%%" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "Exp: %d/%d Queda: %d" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "1%% = %d exp, prom. pandilla para 1%%: %s" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "Muertes: %s, exp. total: %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "Matanza/Mín: %s, Exp/Mín: %s" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "Rapidez de experiencia por %d minuto: %s" msgstr[1] "Rapidez de experiencia por %d minutos: %s" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s" msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "Exp de último monstruo eliminado:" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "Tiempo antes de que jacko desove:" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr " Tiempo para el siguiente nivel: %s" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "¿%s %d?" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "desove de jacko" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." -msgstr "Has dejado el gremio." +msgstr "Has dejado el clan." #: src/gui/logindialog.cpp:59 msgid "Normal" @@ -1228,11 +1251,11 @@ msgid "Submit" msgstr "Enviar" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Limpiar" @@ -1270,328 +1293,329 @@ msgstr "Quitárselo antes" msgid "Away outfit" msgstr "Conjunto para modo AFK" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Intercambio" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Susurrar" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Sanar" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Ser amigo" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "Desatender" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Borrar" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "Des-ignorar" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Imitación" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "Invitar a grupo" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "Sacar del grupo" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" -msgstr "Sacar del gremio" +msgstr "Sacar del clan" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" -msgstr "Cambiar posición en el gremio" +msgstr "Cambiar posición en el clan" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" -msgstr "Invitar al gremio" +msgstr "Invitar al clan" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "Sacar jugador" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "Eliminar" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Mostrar artículos" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "Desvestir" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "Agregar comentario" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "Vender (?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "Sacar" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "Remover de la lista de ataque" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "Añadir a la lista de ataque prioritaria" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "Agregar a la lista de ataque" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "Agregar a la lista de ignorados" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "Agregar nombre al chat" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Recoger" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Añadir al chat" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Mapa Objeto" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Renombrar" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Quitar" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "Deformar" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Cargar conjuntos antiguos" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Hechizos" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Cargar hechizos antiguos" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Editar hechizo" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Deshabilitar resaltado" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Habilitar resaltado" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "No remover nombre" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "Remover nombre" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "Habilitar ausencia" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "Deshabilitar ausencia" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Dejar" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" -msgstr "Cambiar posición del gremio" +msgstr "Cambiar posición del Clan" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Renombrar señal del mapa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Nombre:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "Comentario del jugador " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "Comentario: " -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "Agredar al intercambio" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "Agregar 10 al intercambio" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "Agregar la mitad al intercambio" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "Agregar todo al intercambio" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Almacenar 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Almacenar la mitad" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Almacenar todo" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "Tirar todo" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Recuperar 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Recuperar la mitad" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Recuperar todo" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Cargar atajos antiguos de artículos" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Cargar atajos antiguos de soltar (drop)" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "Restablecer barra amarilla" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copiar al chat" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(predeterminado)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Subir" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Bajar" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Cambiar de servidor" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Cambiar de personaje" @@ -1707,7 +1731,7 @@ msgstr "Habilitar música" #: src/gui/setup_audio.cpp:54 msgid "Enable mumble voice chat" -msgstr "Habilitar el chat de voz entre dientes" +msgstr "Habilitar el chat de voz de mumble" #: src/gui/setup_audio.cpp:56 msgid "Download music" @@ -1831,7 +1855,7 @@ msgstr "Tiempo" msgid "Use local time" msgstr "Usar hora local" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "Otro" @@ -1994,122 +2018,130 @@ msgstr "Dibujar trayectoria" msgid "Draw hotkeys on map" msgstr "Dibujar teclas de acceso rápido en el mapa" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "Habilitar desplazamiento perezoso" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "Pereza al desplazarse" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "Radio de desplazamiento" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "En movimiento" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Corrección automatica de la posición" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Atacar mientras está en movimiento" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "Sincronización de movimiento de jugador" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Programa de movimientos locos A" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Jugador" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Mostrar barra de energía propia" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "Habilitar estadísticas rápidas" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Apuntar a los jugadores en derredor, no necesariamente al más cercano" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Mostrar los mensajes de experiencia de trabajo" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "Mostrar las ventanas emergentes de jugadores" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "Mensaje afk" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Mostrar trabajo" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "Habilitar filtro de ataque" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "Habilitar el protocolo de anuncio" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Aceptar solicitudes de compra / venta" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Habilitar la tienda" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Registro de diálogo de NPC" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "Soporte de bots" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "Habilitar soporte para auction bot" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "Habilitar los ataques colaterales de servidor" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Habilitar el control de robot" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "Habilitar la proteción contra servidores defectuosos" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Habilitar registro de depuración" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "Modo de bajo tráfico" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "Ocultar los objetos escudos" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Mostrar fondo" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "Rendimiento" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "Mejor rendimiento (permite obtener un mejor rendimiento)" @@ -2119,29 +2151,29 @@ msgid "Auto adjust perfomance" msgstr "Ajustar rendimiento automáticamente" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "Mostrar transparencia de criaturas" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Aceleración de hardware" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "Habilitar caché de opacidad (Software, puede usar mucha memoria)" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "Habilitar reducción de mapa (Software)" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "Mejor calidad (desabilitar para un mejor desmpeño)" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "Mostrar transparencia de criaturas" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "Habilitar re ordenamiento de sprites." @@ -2394,14 +2426,10 @@ msgid "FPS limit:" msgstr "Límite FPS:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Límite FPS alternativo: " -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Vídeo" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Sobrecarga de texto" @@ -2420,7 +2448,7 @@ msgstr "Detalle de partículas" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Nada" @@ -2529,22 +2557,22 @@ msgstr "Incrementar" msgid "Skill points available: %d" msgstr "Puntos de habilidades: %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "Habilidades %d" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "Habilidad %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Nivel: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Nivel: %d (%+d)" @@ -2557,7 +2585,7 @@ msgstr "Clan" #: src/gui/socialwindow.cpp:147 #, c-format msgid "Invited user %s to guild %s." -msgstr "Invita al jugador %s para su clan %s." +msgstr "Invita al jugador %s al clan %s." #: src/gui/socialwindow.cpp:161 #, c-format @@ -2575,12 +2603,12 @@ msgstr "A quién te gustaría invitar al clan %s?" #: src/gui/socialwindow.cpp:198 msgid "Leave Guild?" -msgstr "Salir del clan?" +msgstr "¿Dejar el clan?" #: src/gui/socialwindow.cpp:199 #, c-format msgid "Are you sure you want to leave guild %s?" -msgstr "Estás seguro de dejar el clan %s?" +msgstr "¿Estás seguro de dejar el clan %s?" #: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 msgid "Party" @@ -2636,7 +2664,7 @@ msgstr "Ignorar pandillas" #: src/gui/socialwindow.cpp:1074 msgid "Create Guild" -msgstr "Crear clan" +msgstr "Crear Clan" #: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 msgid "Create Party" @@ -2663,12 +2691,12 @@ msgstr "Cancelada la invitación de %s." #: src/gui/socialwindow.cpp:1313 #, c-format msgid "Accepted guild invite from %s." -msgstr "Aceptada la invitación a la guild de %s." +msgstr "Aceptada la invitación al clan de %s." #: src/gui/socialwindow.cpp:1326 #, c-format msgid "Rejected guild invite from %s." -msgstr "Cancelada la invitación a la guild de %s." +msgstr "Rechazada la invitación al clan de %s." #: src/gui/socialwindow.cpp:1373 #, c-format @@ -2744,243 +2772,243 @@ msgstr "Escoja el nombre del grupo." msgid "Specials" msgstr "Especiales" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) moverse predeterminado" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "(I) moverse invertido" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "(c) moverse con algunos movimientos locos" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "(C) moverse con movimientos locos" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) doble normal + loco" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) maniobra" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "(a) maniobra alocada personalizada" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "(?) maniobra loca" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "(0) moverse por defecto hacia el objetivo" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "(1) moverse al objetivo en distancia 1" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) moverse al objetivo en distancia 2" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "(3) moverse al objetivo en distancia 3" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "(5) moverse al objetivo en distancia 5" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "(7) moverse al objetivo en distancia 7" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "(A) desplazarse al objetivo en el rango de ataque" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?) mover al objetivo" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "(D) seguimiento predeterminado" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "(R) seguimiento relativo" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "(M) seguimiento tipo espejo" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "(P) seguimiento como mascota" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "(?) seguimiento desconoicido" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) ataque predeterminado" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) intercambiar ataque sin escudo" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) intercambiar ataque con escudo" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) atacar" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) ir y atacar" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) ir, atacar, recoger" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) sin atacar automáticamente" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "(S) recoger a 1x1 celdas (pequeño)" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "(D) recoger a 2x1 celdas (predeterminado)" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "(F) recoger interesadamente a 2x3 celda" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "(3) recoger a 3x3 celdas" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "(g) ir y recoger en distancia 4" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "(G) ir y recoger en distancia 8" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "(A) ir y recoger a máxima distancia" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) recoger" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) vista normal del mapa" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "(D) vista depurar del mapa" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "(u) ultra vista del mapa" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "(U) ultra vista del mapa 2" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) vista vacía del mapa" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b) vista del mapa en blanco y negro" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "(?) vista del mapa" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) usar #flar para ataque mágico" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) usar #chiza para ataque mágico" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(I) usar #ingrav para ataque mágico" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) usar #frillyar para ataque mágico" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) usar #upmarmu para ataque mágico" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) ataque mágico" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "(D) imitación predeterminada" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "(O) imitación de conjuntos" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) imitación" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) en el teclado" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) lejos del teclado" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) afuera" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "(G) modo de cámara de juego" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "(F) modo de cámara libre" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "(D) Definir el modo operativo de la cámara" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "Modificadores del juego están deshabilitados" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "Modificadores del juego están habilitados" @@ -3371,7 +3399,7 @@ msgstr "Miembros del grupo" #: src/gui/userpalette.cpp:130 msgid "Guild Members" -msgstr "Miembros del guild" +msgstr "Miembros del Clan" #: src/gui/userpalette.cpp:131 msgid "Particle Effects" @@ -3469,23 +3497,23 @@ msgstr "Limites de Lugar de Inicio" msgid "Road Point" msgstr "Mostrar camino" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "Quién está conectado - Actualizando" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Actualizar" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "Quienes están conectados - " -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "Quienes están conectados - error" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "Quienes están conectados - Actualizar" @@ -3620,7 +3648,7 @@ msgstr "/invite > Invita un jugador a tu clan" #: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137 msgid "/leave > Leave the guild you are in" -msgstr "/leave > Deja el clan en la que estas" +msgstr "/leave > Deja el clan en el que estas" #: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138 msgid "/kick > Kick some one from the guild you are in" @@ -4159,68 +4187,68 @@ msgstr "" "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego " "puede presentar un comportamiento raro." -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "Fuiste eliminado por " -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Intentaste recoger un objeto inexistante." -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "El artículo es muy pesado." -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "El artículo está muy lejos." -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "El inventario está lleno." -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "El agrupamiento es demasiado grande." -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "El artículo pertenece a alguien más." -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 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:1439 +#: src/localplayer.cpp:1454 #, 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:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Fuera del Teclado" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Seguir: " -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Imitacion: " -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Imitación cancelada" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "Ves " @@ -4421,16 +4449,16 @@ msgstr "Jugador VIP." msgid "MVP player: " msgstr "Jugador MVP: " -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "Jugadores online: %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Juego" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "Petición de salida denegada!" @@ -4440,7 +4468,7 @@ msgstr "Clan creado." #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93 msgid "You are already in guild." -msgstr "Ya estás en el gremio." +msgstr "Ya estás en el clan." #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." @@ -4453,17 +4481,17 @@ msgstr "Respuesta del servidor desconocida." #: src/net/ea/guildhandler.cpp:181 #, c-format msgid "Guild name: %s" -msgstr "Nombre del gremio: %s" +msgstr "Nombre del clan: %s" #: src/net/ea/guildhandler.cpp:183 #, c-format msgid "Guild master: %s" -msgstr "Maestro del gremio: %s" +msgstr "Maestro del clan: %s" #: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Guild level: %d" -msgstr "Nivel en gremio: %d" +msgstr "Nivel en el clan: %d" #: src/net/ea/guildhandler.cpp:187 #, c-format @@ -4483,17 +4511,17 @@ msgstr "Nivel promedio: %d" #: src/net/ea/guildhandler.cpp:193 #, c-format msgid "Guild exp: %d" -msgstr "Experiencia del gremio: %d" +msgstr "Experiencia del clan: %d" #: src/net/ea/guildhandler.cpp:195 #, c-format msgid "Guild next exp: %d" -msgstr "Experiencia siguiente del gremio: %d" +msgstr "Experiencia siguiente del clan: %d" #: src/net/ea/guildhandler.cpp:197 #, c-format msgid "Guild castle: %s" -msgstr "Castillo del gremio: %s" +msgstr "Castillo del clan: %s" #: src/net/ea/guildhandler.cpp:403 msgid "Could not inivte user to guild." @@ -4501,7 +4529,7 @@ msgstr "No se puede invitar jugadores al clan." #: src/net/ea/guildhandler.cpp:407 msgid "User rejected guild invite." -msgstr "El jugador cancel la invitacion a tu guild." +msgstr "El jugador ha rechazado la invitación al clan." #: src/net/ea/guildhandler.cpp:411 msgid "User is now part of your guild." @@ -4513,21 +4541,21 @@ msgstr "Tu clan está lleno." #: src/net/ea/guildhandler.cpp:419 msgid "Unknown guild invite response." -msgstr "Invitación desconocida a una guild." +msgstr "Invitación desconocida a un clan." #: src/net/ea/guildhandler.cpp:453 #, c-format msgid "%s has left your guild." -msgstr "%s ha dejado tu gremio." +msgstr "%s ha dejado tu clan." #: src/net/ea/guildhandler.cpp:484 msgid "You was kicked from guild." -msgstr "Usted fue expulsado del gremio." +msgstr "Usted fue expulsado del clan." #: src/net/ea/guildhandler.cpp:497 #, c-format msgid "%s has kicked from your guild." -msgstr "%s saco alguien de tu gremio." +msgstr "%s saco alguien de tu clan." #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" @@ -5496,19 +5524,19 @@ msgstr "Conexión al servidor terminada." msgid "%s is not in your party!" msgstr "%s no está en tu grupo!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Parpadear nombre" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Burbuja '...' flotante" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "Burbuja Flotante" @@ -2,14 +2,15 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # -# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011. +# Translators: # Andrei Karas <akaras@inbox.ru>, 2011. +# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:12+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: fi\n" @@ -18,57 +19,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Näkyvillä kartalla" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "väistö" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "huti" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Asetukset" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Kuva" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Yhdistän palvelimeen" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Kirjaudun sisään" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Siirryn pelimaailmaan" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Pyydän hahmoja" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Yhdistän pelipalvelimeen" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Vaihdan pelipalvelinta" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -78,63 +91,63 @@ msgstr "Vaihdan pelipalvelinta" msgid "Error" msgstr "Virhe" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Pyydän rekisteröitymisen yksityiskohtia" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Salasanan vaihto" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Salasana vaihdettu onnistuneesti!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Sähköpostin vaihto" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "Sähköpostiosoite vaihdettu onnistuneesti!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Tietojen poisto onnistui" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Näkemisiin, tule pian takaisin..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Epäkelpo päivitysosoite: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Päivityshakemistoa luodessa tapahtui virhe!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Tuntematon komento." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Et voi lähettää tyhjiä kuiskauksia!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -143,152 +156,152 @@ msgstr "" "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai " "käytit omaa nimeäsi." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Pyyntö liittyä kanavalle %s lähetetty." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ryhmän nimi puuttuu." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Killan nimi puuttuu." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Anna nimi." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Viesti sulkee keskustelun." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Nyt viesti sulkee keskustelun." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "ystävä" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "vaimennettu" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "neutraali" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Pelaaja on jo %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Pelaaja on nyt %s." -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "Pelaajaa ei ollut jätetty huomiotta!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "Pelaaja huomioidaan taas." -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Pelaajan uudelleenhuomiointi epäonnistui." -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Pelaaja on jo pyyhitty!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Pelaaja pyyhitty." -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty." -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "Ohjelma ollut käynnissä: %s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d viikon" msgstr[1] "%d viikkoa" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d päivän" msgstr[1] "%d päivää" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d tunnin" msgstr[1] "%d tuntia" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuutin" msgstr[1] "%d minuuttia" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunnin" msgstr[1] "%d sekuntia" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "kirjasinvälimuistin koko" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "Välimuistin koko:" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Luotu:" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Poistettu:" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "Resurssikuvat:" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "Orvot resurssikuvat:" @@ -307,15 +320,15 @@ msgstr "Yleiset" msgid "Debug" msgstr "Debug" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Ruutukaappaus tallennettu nimellä " -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Ruutukaappauksen tallentaminen epäonnistui!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "Yhteys palvelimeen katkesi." @@ -323,19 +336,19 @@ msgstr "Yhteys palvelimeen katkesi." msgid "Network Error" msgstr "Verkkovirhe" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Et huomioi kaupankäyntipyyntöjä" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Hyväksyt kaupankäyntipyynnöt" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Kartan lataaminen epäonnistui" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Kohdetta %s ladattaessa tapahtui virhe." @@ -364,37 +377,38 @@ msgstr "" msgid "Bot Checker" msgstr "Bottitutka" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nimi" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Hyökkää" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Keskustele" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Liiku" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Tulos" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Nollaa" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Osta" @@ -421,7 +435,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -434,12 +448,12 @@ msgid "Max" msgstr "Max" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Kauppa" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -448,16 +462,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -558,7 +572,7 @@ msgstr "Hiustyyli:" msgid "Race:" msgstr "Rotu: " -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Luo" @@ -626,26 +640,26 @@ msgstr "Anna salasana hahmon poistamiseksi" msgid "Enter password:" msgstr "Salasana:" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Poista" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Valitse" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Taso %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(tyhjä)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "oletus" @@ -701,11 +715,12 @@ msgstr "sateenkaari 2" msgid "rainbow 3" msgstr "sateenkaari 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -731,14 +746,14 @@ msgstr "Kyllä" msgid "No" msgstr "Ei" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Ohita" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Kartta" @@ -879,8 +894,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Sulje" @@ -897,7 +912,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "Ok" @@ -905,10 +920,10 @@ msgstr "Ok" msgid "Equipment" msgstr "Varusteet" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Poista varuste käytöstä" @@ -916,80 +931,88 @@ msgstr "Poista varuste käytöstä" msgid "Help" msgstr "Apua" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Tavarat" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Paikkoja:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Suodin:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Järj.:" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "-" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "A" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "#" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Ota käyttöön" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Käytä" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Pudota..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Jaa" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Asukokonaisuudet" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Paino:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Varastoi" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Ota" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Pudota" @@ -1043,91 +1066,91 @@ msgstr "Paino: %s" msgid "Kill stats" msgstr "Tappotilastot" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Nollaa tiedot" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Nollaa ajastin" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "Olet eronnut killasta." @@ -1225,11 +1248,11 @@ msgid "Submit" msgstr "Lähetä" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "Ei-pelaajahahmo (NPC)" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Tyhjennä" @@ -1267,328 +1290,329 @@ msgstr "Riisu ensin" msgid "Away outfit" msgstr "Poissaoloasu" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Tee kaupat" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Kuiskaa" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Paranna" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Ystävysty" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "Vaimenna" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Pyyhi" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "Huomioi jälleen" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "Jätä täysin huomiotta" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Seuraa" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Matki" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "Kutsu ryhmään" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "Potki ryhmästä" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "Potki killasta" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "Muuta kilta-asemaa" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "Kutsu kiltaan" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "Potki pelaaja" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "Pommita" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Näytä tavarat" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "Riisu" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "Potki" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "Poista hyökkäyslistasta" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "Lisää prioriteettihyökkäyslistalle" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "Lisää hyökkäyslistaan" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "Lisää ohitettavien listaan" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "Lisää nimi keskusteluun" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Nosta" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Lisää keskusteluun" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Karttaolio" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Nimeä uudelleen" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Poista" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Lataa vanhat asut" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Loitsut" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Lataa vanhat loitsut" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Muokkaa loitsua" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Estä korostus" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Salli korostus" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "Poista nimi" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "Ota poissaolo käyttöön" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "Poista poissaolo käytöstä" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Eroa" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "Muuta asemaa killassa" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Muuta merkin nimeä " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Nimi: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "Lisää kauppaan" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "Lisää 10 kauppaan" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "Lisää puolet kauppaan" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "Lisää kaikki kauppaan" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Varastoi 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Varastoi puolet" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Varastoi kaikki" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Ota 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Ota puolet" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Ota kaikki" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Lataa vanhat tavarapikavalinnat" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Lataa vanhat pudotuspikavalinnat" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Piilota" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Näytä" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "Palauta oletusmuokkaimet (keltainen palkki)" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(oletus)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Siirrä ylös" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Siirrä alas" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Vaihda palvelinta" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Vaihda hahmoa" @@ -1828,7 +1852,7 @@ msgstr "" msgid "Use local time" msgstr "" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "" @@ -1991,122 +2015,130 @@ msgstr "Piirrä polku" msgid "Draw hotkeys on map" msgstr "Piirrä siirtymäpikanäppäimet kartalle" -#: src/gui/setup_other.cpp:88 -msgid "Moving" +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" msgstr "" #: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 +msgid "Moving" +msgstr "" + +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Korjaa sijainti automaattisesti" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Hyökkää liikkuessa" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "Synkronoi pelaajan liikkeet" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Villiliike (a) -ohjelma" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Näytä oma vp-palkki" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "Ota pikatilastot käyttöön" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Vaihda pelaajakohteita syklissä" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Näytä työkokemusviestit" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "Näytä pelaajaponnahdusikkunat" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Näytä työ" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "Ota käyttöön hyökkäyssuodin" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Salli osta/myy-pyynnöt" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Ota kauppatila käyttöön" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "Ota käyttöön palvelinpuolen hyökkäys" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Ota bottitutka käyttöön" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "Ota käyttöön suoja bugisten palvelinten varalta" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Ota käyttöön debug-loki" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "Matalan liikenteen tila" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "Piilota kilpihahmo" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Näytä tausta" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2116,29 +2148,29 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Rautakiihdytys" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "" @@ -2391,14 +2423,10 @@ msgid "FPS limit:" msgstr "Piirtonopeusrajoitin (FPS):" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Vaihtoehtoinen FPS-rajoitin:" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Kuva" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Tekstinä yläpuolella" @@ -2417,7 +2445,7 @@ msgstr "Hiukkastehosteiden yksityiskohtaisuus" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "-" @@ -2524,22 +2552,22 @@ msgstr "Ylös" msgid "Skill points available: %d" msgstr "%d taitopistettä käyttämättä" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "Taitojoukko %d" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "Taito %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Taso: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Taso: %d (%+d)" @@ -2739,243 +2767,243 @@ msgstr "Anna ryhmällesi nimi." msgid "Specials" msgstr "Erikoisuudet" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) oletusliikkeet" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "(I) käännetyt liikkeet" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "(c) liikkuu osin villiliikkein" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "(C) liikkuu villiliikkein" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) tuplaa tavallinen + villi" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) liiku" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "(a) oma villiliike" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "(?) villiliike" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "(0) oletussiirtymä kohteen luo" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "(1) siirry kohteen luo etäisyydellä 1" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) siirry kohteen luo etäisyydellä 2" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "(3) siirry kohteen luo etäisyydellä 3" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "(5) siirry kohteen luo etäisyydellä 5" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "(7) siirry kohteen luo etäisyydellä 7" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "(A) siirry kohteen luo hyökkäyskantamalla" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?) siirry kohteen luo" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "(D) oletusseuraaminen" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "(R) suhteellinen seuraaminen" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "(M) peilikuvaseuraaminen" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "(P) lemmikkiseuraaminen" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "(?) tuntematon seuraaminen" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) oletushyökkäys" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) vaihda hyökkäystä, ei kilpeä" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) vaihda hyökkäystä, kilpi mukana" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) hyökkäys" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) mene ja hyökkää" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) mene, hyökkää, nosta" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) ei automaattista hyökkäystä" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "(S) pieni nosto 1x1 ruutua" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "(D) oletusnosto 2x1 ruutua" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "(F) nosto edestä 2x3 ruutua" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "(3) nosto 3x3 ruutua" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "(g) mene ja nosta etäisyydellä 4" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "(G) mene ja nosta etäisyydellä 8" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "(A) mene ja nosta maksimietäisyydellä" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) nosta" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) normaali karttanäkymä" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "(D) debug-karttanäkymä" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "(u) ultra-karttanäkymä" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "(U) ultra-karttanäkymä 2" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) tyhjä karttanäkymä" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b) mustavalkoinen karttanäkymä" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "(?) karttanäkymä" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) #flar taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) #chiza taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(I) #ingrav taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) #frillyar taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) #upmarmu taikahyökkäyksenä" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) taikahyökkäys" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "(D) oletusmatkinta" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "(O) asun matkinta" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) matkinta" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) paikalla" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) poissa" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) poissaolo" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "(G) pelin kameratila" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "(F) vapaa kamera" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "(D) suunnittelukamera" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "Pelimuokkaimet poissa käytöstä" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "Pelimuokkaimet käytössä" @@ -3462,23 +3490,23 @@ msgstr "Kotipaikan raja" msgid "Road Point" msgstr "Väyläpiste" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "Kuka on linjoila - päivitän" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Päivitä" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "Kuka on linjoilla - " -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "Kuka on linjoilla - virhe" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "Kuka on linjoilla - päivitä" @@ -4153,68 +4181,68 @@ msgstr "" "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; " "ole hyvä ja poista päällekkäisyydet. " -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "Sinut otti hengiltä " -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Yritit nostaa olemattoman tavaran." -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "Tavara on liian painava." -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "Tavara on liian kaukana." -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "Sinulla on liikaa tavaraa ennestään." -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "Kasa on liian suuri." -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "Tavara kuuluu jollekulle muulle." -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 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:1439 +#: src/localplayer.cpp:1454 #, 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:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Poissa" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Seuraa: " -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Seuraaminen keskeytetty" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Matki: " -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Matkiminen keskeytetty" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "Näet " @@ -4416,16 +4444,16 @@ msgstr "MVP-pelaaja." msgid "MVP player: " msgstr "MVP-pelaaja: " -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "Käyttäjiä palvelimella: %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Peli" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "Lopetuspyyntö evätty!" @@ -5484,19 +5512,19 @@ msgstr "Yhteys palvelimeen katkaistu. " msgid "%s is not in your party!" msgstr "%s ei ole ryhmässäsi!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Tulosta '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Vilkuta nimeä" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Leijuva '...' -puhekupla" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "Leijuva puhekupla" @@ -2,16 +2,17 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Andrei Karas <akaras@inbox.ru>, 2011. # <antoinebcn@hotmail.com>, 2011. -# Jumpy <antoinebcn@hotmail.com>, 2011. # Bernard <nard@bh28.net>, 2011. -# Andrei Karas <akaras@inbox.ru>, 2011. +# Jumpy <antoinebcn@hotmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/" "fr/)\n" @@ -21,57 +22,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Visible sur la carte" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "esquivé" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "raté" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "I" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configuration" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Vidéo" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Connexion au serveur" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Connexion" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Vous entrez dans un nouveau monde" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Téléchargement des personnages" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Connexion au serveur de jeu" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Changement de serveur de jeu" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -81,64 +94,64 @@ msgstr "Changement de serveur de jeu" msgid "Error" msgstr "Erreur" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Demande des paramètres d'inscription" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Changement de mot de passe" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Le mot de passe a été changé avec succès !" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Changer d'e-mail" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "L'adresse e-mail a été changée avec succès !" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Désinscription réussie" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "A bientôt, revenez quand vous voudrez..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Site de mise à jour invalide : %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Impossible de créer le dossier de mise à jour !" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Commande inconnue." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Vous ne pouvez pas envoyer de messages vides." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -147,153 +160,153 @@ 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:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Demande de rejoindre le canal %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Le nom du groupe est manquant." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Le nom de la guilde est manquant." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Veuillez indiquer un nom." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "La touche <entrée> ferme la ligne d'entrée du chat." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Le message ferme la conversation." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "" "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Le message ferme maintenant la conversation." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "ami" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "écarté" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "neutre" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Joueur déjà %s !" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Joueur %s avec succès!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Le joueur n'a pas pu %s !" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "Le joueur n'était pas ignoré !" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "Le joueur n'est plus ignoré !" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Joueur déjà effacé !" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Joueur éliminé avec succès !" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "le joueur n'a pas pu être effacé !" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "Heure de lancement du client : %s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondes" msgstr[1] "%d secondes" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "Taille du cache de polices" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "Dimension du cache :" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Créé : " -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Effacé :" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "Images des ressources :" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "Images des ressources non affectées :" @@ -311,15 +324,15 @@ msgstr "Général" msgid "Debug" msgstr "Informations" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Capture d'écran sauvegardée sous" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "La sauvegarde de la capture d'écran a échoué !" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "" "La connexion au serveur a été coupée, le programme va maintenant se fermer." @@ -328,19 +341,19 @@ msgstr "" msgid "Network Error" msgstr "Erreur Réseau" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Ignorer les requêtes d'échanges entrantes" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Accepter les requêtes d'échanges entrantes" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "La carte n'a pu être chargée" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Erreur durant le chargement %s" @@ -369,37 +382,38 @@ msgstr "Commentaire : %s" msgid "Bot Checker" msgstr "Testeur de Robot" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nom" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Attaquer" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Parler" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Déplacement" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Résultat" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Réinitialiser" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Acheter" @@ -426,7 +440,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -439,12 +453,12 @@ msgid "Max" msgstr "Max." #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Boutique" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -453,16 +467,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -563,7 +577,7 @@ msgstr "Coupe :" msgid "Race:" msgstr "Race:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Créer" @@ -631,26 +645,26 @@ msgstr "Entrer le mot de passe pour effacer le personnage" msgid "Enter password:" msgstr "Entrer le mot de passe :" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Supprimer" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Choisir" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Niveau %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(vide)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "défaut" @@ -706,11 +720,12 @@ msgstr "arc en ciel 2" msgid "rainbow 3" msgstr "arc en ciel 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -736,14 +751,14 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Ignorer" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Carte" @@ -884,8 +899,8 @@ msgid "Did You Know?" msgstr "Le saviez-vous ?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fermer" @@ -902,7 +917,7 @@ msgid "Auto open this window" msgstr "Ouverture automatique de cette fenêtre" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "Ok" @@ -910,10 +925,10 @@ msgstr "Ok" msgid "Equipment" msgstr "Équipement" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Retirer" @@ -921,80 +936,88 @@ msgstr "Retirer" msgid "Help" msgstr "Aide" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventaire" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Emplacements :" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Filtre :" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Tri :" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "sans" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "a-z" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Équiper" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Utiliser" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Jeter..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Partager" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Tenues" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Poids :" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Entreposer" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Récupérer" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Jeter" @@ -1048,91 +1071,91 @@ msgstr "Poids : %s" msgid "Kill stats" msgstr "Statistiques" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "RaZ stats" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "RaZ temps" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "Niveau : %d à %f%%" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "Exp : %d/%d Reste : %d" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "1%% = %d Moyenne des monstres tués 1%% : %s" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "Nbre Tués : %s, total exp : %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "Moyenne Exp: %s, Nombre de monstres pour le prochain niveau : %s" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "Tués/Min : %s, Exp/Min : %s" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "Rapidité exp pour %d min : %s" msgstr[1] "Rapidité exp pour %d min : %s" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "Temps pour le prochain niveau %d min : %s" msgstr[1] "Temps pour le prochain niveau %d min : %s" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "Exp du dernier tué :" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "Temps avant l'arrivée de Jack0 :" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr " Temps pour le prochain niveau : %s" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "%s %d?" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "Arrivée de Jack0" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "vous avez quitté la guilde." @@ -1230,11 +1253,11 @@ msgid "Submit" msgstr "Soumettre" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "PNJ" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Effacer" @@ -1272,328 +1295,329 @@ msgstr "Retirer d'abord l'équipement" msgid "Away outfit" msgstr "Équipement en absence" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Échange" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Message" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Soigner" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Être ami" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "Éviter" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Éliminer" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "Ne plus ignorer" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "Ignorer complètement" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Suivre" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Imiter" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "Inviter dans le groupe" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "Sortir du groupe" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "Sortir de la guilde" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "Changer la position dans la guilde" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "Inviter dans la guilde" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "Sortir le joueur" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "Annihiler" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Montrer les objets" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "Déshabiller" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "Ajouter commentaire" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "Acheter (?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "Vendre (?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "Virer" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "Enlever de la liste d'attaque" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "Ajouter à la liste de priorités d'attaque" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "Ajouter à la liste d'attaque" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "Ajouter à la liste d'ignorés" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "Ajouter le nom dans la boite de dialogue" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Ramasser" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Ajouter à la conversation" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Objet de carte" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Renommer" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Enlever" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Charger les anciennes tenues" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Sortilèges" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Charger les anciens sorts" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Éditer le sortilège" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Désactiver la surbrillance" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Activer la surbrillance" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "Enlève le nom" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "Active la fonction Absence" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "Désactive la fonction Absence" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Quitter" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 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:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Renommer le panneau de carte" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Nom : " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "Le joueur commente " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "Commentaire : " -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "Ajouter à la transaction" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "Ajouter 10 dans l'échange" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "Ajouter la moitié dans l'échange" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "Ajouter tout dans l'échange" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Entreposer 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Entreposer la moitié" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Entreposer tout" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "Jeter tout" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Reprendre 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Reprendre la moitié" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Reprendre tout" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Charger les anciens raccourcis d'objets" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Charger les anciens raccourcis de jets d'objets" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Cacher" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Montrer" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "Remise aux valeurs de défaut de la barre jaune" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copier dans la conversation" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(défaut)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Aller vers le haut" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Aller vers le bas" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Changer de serveur" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Changer de personnage" @@ -1832,7 +1856,7 @@ msgstr "Temps" msgid "Use local time" msgstr "Utiliser l’horaire local" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "Autre" @@ -1995,122 +2019,130 @@ msgstr "Afficher le chemin" msgid "Draw hotkeys on map" msgstr "Afficher les touches-raccourcis sur la carte" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "En mouvement" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Auto-correction de position" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Attaquer en bougeant" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "Synchroniser les mouvements du joueur" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Programme A de mouvement de fou" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Joueur" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Afficher votre propre barre de vie" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "Activer les statistiques instantanées" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Entourer les joueurs visés" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Afficher les expériences de compétences" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "Afficher les pop-ups des joueurs" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "Message d'absence" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Afficher les compétences" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "Activer le mode attaque" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "Lancer le protocole d'avertissements" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Accepter les requêtes d'achat et de vente" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Activer le mode boutique" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Enregistrer les conversations des PNJ" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "Activer l'attaque de la part du serveur" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Activer le testeur de robots" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "Activer la protection contre les serveurs instables" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Activer l'enregistrement des informations" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "Mode traffic faible" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "Cacher le bouclier" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Montrer le fond" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2120,29 +2152,29 @@ msgid "Auto adjust perfomance" msgstr "Ajustement automatique des performances" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "Montrer les êtres en transparence" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Accélération matériel" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "Montrer les êtres en transparence" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "" @@ -2395,14 +2427,10 @@ msgid "FPS limit:" msgstr "Limite FPS :" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Alterner les limites FPS" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Vidéo" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Texte aérien" @@ -2421,7 +2449,7 @@ msgstr "Détail des particules" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Rien" @@ -2535,22 +2563,22 @@ msgstr "Augmenter" msgid "Skill points available: %d" msgstr "Points de compétences : %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "Compétence choisie : %d" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "Compétence %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Niveau : %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Niveau : %d (%+d)" @@ -2754,243 +2782,243 @@ msgstr "Choisissez le nom du groupe." msgid "Specials" msgstr "Cpt. spéciales" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) Mouvements par défaut" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "(I) Mouvements inversés" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "(c) Mouvements un peu fous" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "(C) Mouvement complètement fous" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) double normal et fou" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) Mouvements" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "(a) Mouvements fous personnalisés" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "(?) Mouvements fous" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "(0) Aller à la cible distante par défaut" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "(1) Aller à la cible en distante de 1" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) Aller vers la cible jusqu'à 2 de distance" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "(3) Aller à la cible en distante de 3" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "(5) Aller à la cible en distante de 5" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "(7) Aller à la cible en distante de 7" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "(A) Aller à la cible dans le champ d'attaque" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?) Aller à la cible" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "(D) Suivre : défaut" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "(R) Suivre: mouvement relatif" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "(M) Suivre effet miroir" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "(P) Suivre comme un toutou" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "(?) Suivre : mode inconnu" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) Attaque : défaut" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) Attaquer sans protection" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) Attaquer avec protection" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) Attaque" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) Se déplacer et attaquer" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) Se déplacer, attaquer et ramasser" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) Sans attaque automatique" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "(S) Ramassage sur 1x1 case" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "(D) Ramassage par défaut sur 2x1 cases" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Ramassage avant sur 2x3 cases" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "(3) Ramassage sur 3x3 cases" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "(g) Aller et ramasser jusqu'à 4 de distance" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "(G) Aller et ramasser jusqu'à 8 de distance" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "(A) Aller et ramasser jusqu'à la distance max" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) Ramassage" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) Vue normale du jeu" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "(D) Vue du jeu mode déverminage" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "(u) Vue du jeu mode Ultra 1" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "(u) Vue du jeu mode Ultra 2" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) Vue de la carte vide" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b) Vue de la carte en N&B" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "(?) Carte" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) Utiliser #flar comme sort d'attaque" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) Utiliser #chiza comme sort d'attaque" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(I) Utiliser #ingrav comme sort d'attaque" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) Utiliser #frillyar comme sort d'attaque" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Utiliser #upmarmu comme sort d'attaque" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) Sorts d'attaque" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "(D) Imitation par défaut" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "(O) Imiter les équipements" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) Imitation" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) Présent sur le jeu" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) Absent" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) Absent" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "(G) Mode camera du jeu" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "(F) Mode camera libre" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "(D) Définir le mode camera" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "Modificateurs de mode de jeu désactivés" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "Modificateurs de mode de jeu activés" @@ -3479,23 +3507,23 @@ msgstr "Limites de votre position" msgid "Road Point" msgstr "Étape" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "Qui est en ligne - Mise à jour" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Mise à jour" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "Qui est en ligne - " -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "Qui est en ligne - Erreur" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "Qui est en ligne - Mise à jour" @@ -4173,68 +4201,68 @@ 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:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "Vous avez été tué par " -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Vous avez essayé de prendre un item qui n'existe pas." -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "L'objet est trop lourd." -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "L'objet est trop éloigné" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "L'inventaire est plein" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "La pile est trop grande" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "L'objet appartient a quelqu'un d'autre" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 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:1439 +#: src/localplayer.cpp:1454 #, 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:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Inactif" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Suivre : " -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Suivi annulé" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Imitation: " -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Imitation annulée" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "Vous voyez " @@ -4444,16 +4472,16 @@ msgstr "Joueur MVP" msgid "MVP player: " msgstr "MVP joueur :" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "Joueurs en ligne : %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Jeu" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "Requête de départ refusée !" @@ -5534,19 +5562,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:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Affiche '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Fais clignoter le nom" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Bulle flottante '...'" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 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-09-02 18:27+0300\n" +"POT-Creation-Date: 2011-09-17 16:12+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,57 +18,69 @@ 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:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Podešavanje" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Slika" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -78,63 +90,63 @@ msgstr "" msgid "Error" msgstr "Greška" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "" -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Nepoznata naredba." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Ne mogu poslati prazan šapate!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -143,97 +155,97 @@ msgstr "" "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to " "vi." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Zahtjev za pridruživanje kanalu %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ime partije nedostaje." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Poruka zatvara chat." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Poruka sada zatvara chat." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -241,7 +253,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" @@ -249,7 +261,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -257,7 +269,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -265,7 +277,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -273,27 +285,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -310,15 +322,15 @@ msgstr "Općenito" msgid "Debug" msgstr "" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Spremanje screenshot-a nije uspjelo!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "" @@ -326,19 +338,19 @@ msgstr "" msgid "Network Error" msgstr "Mreža Greška" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Ignoriranje dolaznih zahtjeva za trgovanje" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Greška prilikom učitavanja %s" @@ -367,37 +379,38 @@ msgstr "" msgid "Bot Checker" msgstr "" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Ime" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Napad" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Govori" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Poništi" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Kupi" @@ -424,7 +437,7 @@ msgid "-" msgstr "" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -437,12 +450,12 @@ msgid "Max" msgstr "Max" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Trgovina" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -451,16 +464,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -561,7 +574,7 @@ msgstr "" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Stvori" @@ -629,26 +642,26 @@ msgstr "" msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Obriši" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "" @@ -704,11 +717,12 @@ msgstr "" msgid "rainbow 3" msgstr "" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -734,14 +748,14 @@ msgstr "Da" msgid "No" msgstr "Ne" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Karta" @@ -882,8 +896,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Zatvori" @@ -900,7 +914,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "U redu" @@ -908,10 +922,10 @@ msgstr "U redu" msgid "Equipment" msgstr "Oprema" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Skini opremu" @@ -919,80 +933,90 @@ msgstr "Skini opremu" msgid "Help" msgstr "Pomoć" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +#, fuzzy +msgid "by name" +msgstr "Vidljiva imena" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +#, fuzzy +msgid "by weight" +msgstr "Težina:" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Zalihe" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Mjesta:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Opremi" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Upotrijebi" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Razdvoji" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Težina:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Pohrani" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Preuzmi" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Ispusti" @@ -1046,51 +1070,51 @@ msgstr "" msgid "Kill stats" msgstr "" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" @@ -1098,7 +1122,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" @@ -1106,33 +1130,33 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "" @@ -1230,11 +1254,11 @@ msgid "Submit" msgstr "Dostavi" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "" @@ -1272,328 +1296,329 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Trgovanje" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Promijeni poslužitelj" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Promijeni lika" @@ -1831,7 +1856,7 @@ msgstr "" msgid "Use local time" msgstr "" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "" @@ -1994,122 +2019,130 @@ msgstr "" msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 -msgid "Moving" +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" msgstr "" #: src/gui/setup_other.cpp:90 -msgid "Auto fix position" +msgid "Scroll laziness" msgstr "" #: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 +msgid "Moving" +msgstr "" + +#: src/gui/setup_other.cpp:99 +msgid "Auto fix position" +msgstr "" + +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2119,27 +2152,27 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" +msgid "Hw acceleration" msgstr "" #: src/gui/setup_perfomance.cpp:64 -msgid "Hw acceleration" +msgid "Enable opacity cache (Software, can use many memory)" msgstr "" #: src/gui/setup_perfomance.cpp:67 -msgid "Enable opacity cache (Software, can use many memory)" +msgid "Enable map reduce (Software)" msgstr "" #: src/gui/setup_perfomance.cpp:70 -msgid "Enable map reduce (Software)" +msgid "Better quality (disable for better perfomance)" msgstr "" #: src/gui/setup_perfomance.cpp:73 -msgid "Better quality (disable for better perfomance)" +msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 -msgid "Enable alpha channel fix (Software, can be very slow)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" msgstr "" #: src/gui/setup_perfomance.cpp:80 @@ -2394,14 +2427,10 @@ msgid "FPS limit:" msgstr "" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Slika" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Tekst iznad glave" @@ -2420,7 +2449,7 @@ msgstr "" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "" @@ -2526,22 +2555,22 @@ msgstr "Gore" msgid "Skill points available: %d" msgstr "" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "" @@ -2741,243 +2770,243 @@ msgstr "" msgid "Specials" msgstr "" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3464,23 +3493,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" @@ -4149,41 +4178,41 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4191,27 +4220,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "" @@ -4412,16 +4441,16 @@ msgstr "" msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5463,19 +5492,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%s nije u vašoj partiji!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 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-09-02 18:27+0300\n" +"POT-Creation-Date: 2011-09-17 16:12+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,57 +17,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Beállítások" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Videó" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -77,63 +89,63 @@ msgstr "" msgid "Error" msgstr "Hiba" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "" -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Hiba a frissítési könyvtár létrehozása közben!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Ismeretlen parancs." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Nem küldhetsz üres üzenetet!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -141,152 +153,152 @@ msgid "" msgstr "" "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Kapcsolódási kérelem a %s nevű csatornába." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "A csapatnév hiányzik." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Az enter megnyitja a bevitelt." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Az üzenet bezárja a bevitelt." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Az enter mostantól megnyitja a bevitelt." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Az üzenet mostantól bezárja a bevitelt." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -305,15 +317,15 @@ msgstr "Általános" msgid "Debug" msgstr "" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Hiba a képernyő mentése során!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "" @@ -321,19 +333,19 @@ msgstr "" msgid "Network Error" msgstr "Hálózati hiba" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Kereskedési kérelmek elutasítása" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Kereskedési kérelmek elfogadása" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Hiba %s betöltése közben" @@ -362,37 +374,38 @@ msgstr "" msgid "Bot Checker" msgstr "" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Név" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Támadás" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Csevegés" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Alaphelyzet" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Vétel" @@ -419,7 +432,7 @@ msgid "-" msgstr "" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -432,12 +445,12 @@ msgid "Max" msgstr "Max." #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Üzlet" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -446,16 +459,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -556,7 +569,7 @@ msgstr "" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Létrehozás" @@ -624,26 +637,26 @@ msgstr "" msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Törlés" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "" @@ -699,11 +712,12 @@ msgstr "" msgid "rainbow 3" msgstr "" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -729,14 +743,14 @@ msgstr "Igen" msgid "No" msgstr "Nem" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Térkép" @@ -877,8 +891,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Bezár" @@ -895,7 +909,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "Ok" @@ -903,10 +917,10 @@ msgstr "Ok" msgid "Equipment" msgstr "Felszerelés" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Nem használ" @@ -914,80 +928,90 @@ msgstr "Nem használ" msgid "Help" msgstr "Súgó" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +#, fuzzy +msgid "by name" +msgstr "Látható nevek" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +#, fuzzy +msgid "by weight" +msgstr "Súly:" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Táska" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Hely:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Használ" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Bevet" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Felosztás" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Súly:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Raktároz" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Magához vesz" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Eldob" @@ -1041,91 +1065,91 @@ msgstr "" msgid "Kill stats" msgstr "" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "" @@ -1223,11 +1247,11 @@ msgid "Submit" msgstr "Küldés" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "Gépjátékos" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "" @@ -1265,328 +1289,329 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Üzlet" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Szerver változtatása" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Karakter változtatása" @@ -1824,7 +1849,7 @@ msgstr "" msgid "Use local time" msgstr "" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "" @@ -1987,122 +2012,130 @@ msgstr "" msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 -msgid "Moving" +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" msgstr "" #: src/gui/setup_other.cpp:90 -msgid "Auto fix position" +msgid "Scroll laziness" msgstr "" #: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 +msgid "Moving" +msgstr "" + +#: src/gui/setup_other.cpp:99 +msgid "Auto fix position" +msgstr "" + +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2112,27 +2145,27 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" +msgid "Hw acceleration" msgstr "" #: src/gui/setup_perfomance.cpp:64 -msgid "Hw acceleration" +msgid "Enable opacity cache (Software, can use many memory)" msgstr "" #: src/gui/setup_perfomance.cpp:67 -msgid "Enable opacity cache (Software, can use many memory)" +msgid "Enable map reduce (Software)" msgstr "" #: src/gui/setup_perfomance.cpp:70 -msgid "Enable map reduce (Software)" +msgid "Better quality (disable for better perfomance)" msgstr "" #: src/gui/setup_perfomance.cpp:73 -msgid "Better quality (disable for better perfomance)" +msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 -msgid "Enable alpha channel fix (Software, can be very slow)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" msgstr "" #: src/gui/setup_perfomance.cpp:80 @@ -2387,14 +2420,10 @@ msgid "FPS limit:" msgstr "" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Videó" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Fej feletti szöveg" @@ -2413,7 +2442,7 @@ msgstr "" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "" @@ -2519,22 +2548,22 @@ msgstr "Fejleszt" msgid "Skill points available: %d" msgstr "" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "" @@ -2734,243 +2763,243 @@ msgstr "" msgid "Specials" msgstr "" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3458,23 +3487,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" @@ -4144,68 +4173,68 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "" @@ -4406,16 +4435,16 @@ msgstr "" msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5459,19 +5488,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%s nincs a csapatodban!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "" @@ -2,15 +2,16 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # +# Translators: # <adjieps@yahoo.com>, 2011. -# <Genesis_Junior@yahoo.com>, 2011. # Andrei Karas <akaras@inbox.ru>, 2011. +# <Genesis_Junior@yahoo.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:12+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/" "id/)\n" @@ -20,57 +21,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Terlihat di peta" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "Menghindar" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "Luput" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "l" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Pengaturan" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Video" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Terhubung dengan server" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Masuk" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Memasuki arena permainan" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Pemilihan karakter" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "terhubung dengan server" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Pergantian server" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -80,63 +93,63 @@ msgstr "Pergantian server" msgid "Error" msgstr "Kesalahan" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Meminta detail registrasi" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Ubah sandi" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Perubahan sandi berhasil" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Perubahan email" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "Perubahan email berhasil" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Telah tidak terdaftar" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Selamat tinggal, datang kembali setiap saat" -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s tidak ada dan tidak dapat dibuat!keluar." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Gagal mengupdate host: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Gagal membuat direktori update!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Perintah tidak dikenal." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Tidak dapat mengirimkan pesan tanpa nama" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -145,147 +158,147 @@ msgstr "" "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, " "atau nama anda sendiri" -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Meminta untuk masuk ke channel %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Nama kelompok tidak dapat di temukan" -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Nama organisasi tidak ditemukan." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Tetapkan sebuah nama" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Kembalikan pengalihan obrolan" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Tutup pesan obrolan" -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Kembalikan sekarang pengalihan obrolan" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Pesan menutup obrolan" -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "Teman" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "Diabaikan" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "netral" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Pemain telah %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Pemain telah berhasil %s!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Pemain tidak bisa %s!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "Pemain tidak diabaikan!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "Pemain tidak lagi diabaikan!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Pemain tidak dapat diabaikan" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Pemain telah terhapus" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Pemain telah berhasil dihapus" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Pemain tidak dapat dihapus" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "Ukuran jenis huruf cache" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "Ukuran Cache:" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Buat" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Hapus" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "Sumber gambar" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -303,15 +316,15 @@ msgstr "Umum" msgid "Debug" msgstr "Debug" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Screenshot disimpan sebagai" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Gagal menyimpan screenshot!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "Koneksi ke server terputus" @@ -319,19 +332,19 @@ msgstr "Koneksi ke server terputus" msgid "Network Error" msgstr "Kesalahan jaringan" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Abaikan permohonan transaksi" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Terima permohonan transaksi" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Tidak dapat menampilkan peta" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Error ketika menunggu %s" @@ -360,37 +373,38 @@ msgstr "Komentar: %s" msgid "Bot Checker" msgstr "Pengecek Bot" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nama" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Pukul" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Berbicara" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Jalan" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Hasil" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Reset" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Beli" @@ -417,7 +431,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -430,12 +444,12 @@ msgid "Max" msgstr "Max" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Toko" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -444,16 +458,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -554,7 +568,7 @@ msgstr "Gaya rambut" msgid "Race:" msgstr "Ras:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Buat" @@ -622,26 +636,26 @@ msgstr "Masukan Sandi untuk menghapus karakter" msgid "Enter password:" msgstr "Masukkan sandi" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Hapus" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Pilih" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Level %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(kosong)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "kembalikan ke semula" @@ -697,11 +711,12 @@ msgstr "pelangi 2" msgid "rainbow 3" msgstr "pelangi 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -727,14 +742,14 @@ msgstr "Ya" msgid "No" msgstr "Tidak" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Abaikan" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Peta" @@ -875,8 +890,8 @@ msgid "Did You Know?" msgstr "Apakah kamu tahu?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Tutup" @@ -893,7 +908,7 @@ msgid "Auto open this window" msgstr "Buka jendela otomatis" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" @@ -901,10 +916,10 @@ msgstr "OK" msgid "Equipment" msgstr "Perlengkapan" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Lepaskan" @@ -912,80 +927,88 @@ msgstr "Lepaskan" msgid "Help" msgstr "Bantuan" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Perbekalan" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Slot" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Penyaring:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Susun" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "t/a" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "az" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Pakai" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Gunakan" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Buang..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Pecah" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Setelan" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Berat" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Simpan" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Kembalikan" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Buang" @@ -1039,89 +1062,89 @@ msgstr "Berat: %s" msgid "Kill stats" msgstr "Stat membunuh" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Atur ulang stats" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Atur ulang penghitung waktu" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "Level: %d pada %f%%" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "Exp: %d%d Tersisa:%d" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "Membunuh: %s, exp total: %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "Membunuh/menit: %s, Exp/menit: %s" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "Kecepatan Exp per %d menit: %s" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "Exp terakhir" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "waktu sebelum Jacko kembali" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "waktu untuk ke level selanjutnya: %s" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "%s %d?" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "Jacko bertelur" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "" @@ -1219,11 +1242,11 @@ msgid "Submit" msgstr "Masukan" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Hapus" @@ -1261,328 +1284,329 @@ msgstr "Copot lebih dahulu" msgid "Away outfit" msgstr "Setelan saat bepergian" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Tukar" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Berbisik" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Menyembuhkan" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Jadikan teman" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Hapus" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "Batalkan pengabaian" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Mengikuti" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Tirukan" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "Undang ke kelompok" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "Keluarkan dari kelompok" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "Keluarkan dari organisasi" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "Ubah posisi di organisasi" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "Undang ke organisasi" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "keluarkan pemain" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "Sembunyikan" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Perlihatkan item" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "Tanggalkan pakaian" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "Penambahan komentar" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "Beli(?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "Jual(?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "keluarkan" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "Hapus dari daftar menyerang" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "Tambahkan prioritas daftar menyerang" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "Tambahkan ke daftar menyerang" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "Tambahkan ke daftar Abaikan" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "Tambahkan nama ke Obrolan" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Ambil" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Ambil ke obrolan" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Daftar barang" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Ganti nama" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Hapus" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Memuat setelan lama" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Mantra" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Memuat mantra lama" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Edit mantra" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Nonaktifkan sorotan" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Aktifkan sorotan" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "hapus nama" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "Ubah posisi Organisasi" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Ubah nama tanda peta" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Nama:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "Komentar pemain" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "komentar" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "Tambahkan semua ke Penukaran" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Masukkan 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Masukkan setengah" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Masukkan semua" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "Buang semuanya" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Ambil 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Ambil setengah" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Ambil semua" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Muat jalan pintas iItem lama" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Muat jalan pintas Buang yang lama" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Sembunyikan" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Tampilkan" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "Atur ulang bar kuning" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Pindahkan ke chat" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(kembalikan)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Bergerak keatas" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Bergerak kebawah" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Ganti Server" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Ganti Karakter" @@ -1820,7 +1844,7 @@ msgstr "Waktu" msgid "Use local time" msgstr "Pengunaan waktu lokal" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "Lainnya" @@ -1983,122 +2007,130 @@ msgstr "" msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "Bergerak" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Perbaiki posisi otomatis" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Menyerang ketika berjalan" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Program Crazy move A" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Pemain" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Tampilkan hp bar sendiri" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Siklus target pemain" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Tampilkan pesan exp job" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "Tampilkan popup pemain" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "Pesan saat meninggalkan keyboard" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Perlihatkan Job" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "Perbolehkan Penyaring Serangan" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Terima permintaan jual/beli" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Perbolehkan mode Jual" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Riwayat dialog NPC" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Perbolehkan pengecekan bot" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Perlihatkan latar belakang" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2108,29 +2140,29 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Akselerasi perangkat keras" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "" @@ -2383,14 +2415,10 @@ msgid "FPS limit:" msgstr "Batas FPS:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "batas Alt FPS:" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Video" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "" @@ -2409,7 +2437,7 @@ msgstr "Detil partikel" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Tidak ada" @@ -2515,22 +2543,22 @@ msgstr "Naik" msgid "Skill points available: %d" msgstr "poin Skill yang tersedia: %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "Skill %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Level: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Level: %d (%+d)" @@ -2730,243 +2758,243 @@ msgstr "" msgid "Specials" msgstr "" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) jalan normal" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) normal ganda + mode gila" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) jalan" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) jalan ke target di jarak 2" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?)bergerak ke target" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) pukulan normal" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) ganti pukulan tanpa pelindung" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) pukulan dengan pelindung" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?)serangan" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) jalan dan serang" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) jalan, serang, ambil" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) tanpa penyerangan otomatis" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?)mengambil" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) penampilan peta normal" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) penampilan peta kosong" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b)penampilan peta hitam & putih" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) gunakan #flar untuk serangan magic" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) gunakan #chiza untuk serangan magic" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(l) gunakan #ingrav untuk serangan magic" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) gunakan #frillyar untuk serangan magic" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gunakan #upmarmu untuk serangan magic" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) serangan magic" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) pada keyboard" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) pergi" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) pergi" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "Perombakan game tidak diperbolehkan" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "Perombakan game diperbolehkan" @@ -3453,23 +3481,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" @@ -4137,67 +4165,67 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Mencoba mengambil item yang tidak lagi ada" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "item terlalu berat" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "barang terlalu jauh" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "Perbekalan sudah penuh" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "Barang milik orang lain." -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Ikuti:" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Batal mengikuti" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Tirukan:" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Batal menirukan" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "" @@ -4398,16 +4426,16 @@ msgstr "" msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5449,19 +5477,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "" @@ -2,15 +2,16 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Andrei Karas <akaras@inbox.ru>, 2011. # <guglielmo__@hotmail.it>, 2011. # WildX <guglielmo__@hotmail.it>, 2011. -# Andrei Karas <akaras@inbox.ru>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-16 23:07+0300\n" +"PO-Revision-Date: 2011-09-16 20: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" @@ -19,57 +20,69 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "Schivato" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "Mancato" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Impostazioni" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Video" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Connessione al server" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Accesso" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Accesso al gioco" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Ricerca personaggi" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Connessione al server del gioco" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Cambiamento server del gioco" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -79,63 +92,63 @@ msgstr "Cambiamento server del gioco" msgid "Error" msgstr "Errore" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Richiesta dettagli di registrazione" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Cambiamento password" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Password modificata con successo!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Cambio Email" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "Email cambiata con successo!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Annullamento registrazione effettuato con successo" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Addio, torna quando vuoi..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, 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:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Invalido aggiornamento host: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Errore durante la creazione della directory degli aggiornamenti" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, 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:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Comando sconosciuto." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Impossibile inviare un sussurro vuoto!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is" @@ -144,152 +157,152 @@ msgstr "" "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure " "sei tu." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Richiesta per accedere al canale %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Manca il nome del party." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Manca il nome della gilda." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Prego specificare un nome." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Invio attiva/disattiva la conversazione." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "I messaggi chiudono la conversazione." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "\"Invio\" adesso attiva/disattiva la conversazione." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "I messaggi adesso chiudono la conversazione." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "Amico" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "Disprezzato" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "Neutro" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Giocatore già %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Giocatore %s con successo!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Player non può essere %s!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "Il giocatore non era ignorato!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "Giocatore non più ignorato!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Impossibile annullare l'ignoro!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Il giocatore è già cancellato!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Giocatore cancellato dal tuo schermo con successo!" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Il giocatore non può essere cancellato!" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -308,15 +321,15 @@ msgstr "Generale" msgid "Debug" msgstr "Debug" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Screenshot salvato come" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Salvataggio della schermata fallito!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "La connessione al server è stata persa." @@ -324,19 +337,19 @@ msgstr "La connessione al server è stata persa." msgid "Network Error" msgstr "Errore di rete" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno ignorate" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno accettate" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Impossibile caricare la mappa." -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Errore durante il caricamento di %s" @@ -365,37 +378,38 @@ msgstr "" msgid "Bot Checker" msgstr "Bot Checker" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Attacco" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Parla" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Movimento" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Risultato" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 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:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Compra" @@ -422,7 +436,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -435,12 +449,12 @@ msgid "Max" msgstr "Massimo" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Negozio" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -449,16 +463,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -559,7 +573,7 @@ msgstr "Taglio di capelli:" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Crea" @@ -627,26 +641,26 @@ msgstr "" msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Elimina" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Scegli" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Livello %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(vuoto)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "Predefinito" @@ -702,11 +716,12 @@ msgstr "Arcobaleno 2" msgid "rainbow 3" msgstr "Arcobaleno 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -732,14 +747,14 @@ msgstr "Sì" msgid "No" msgstr "No" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Ignora" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Mappa" @@ -880,8 +895,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Chiudi" @@ -898,7 +913,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" @@ -906,10 +921,10 @@ msgstr "OK" msgid "Equipment" msgstr "Equipaggiamento" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Togli" @@ -917,80 +932,88 @@ msgstr "Togli" msgid "Help" msgstr "Aiuto" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventario" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Slot:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Filtro:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Ordina per:" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "na" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "az" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Equipaggia" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Usa" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Lascia..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Dividi" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Attrezzatura" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Peso:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Magazzino" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Recupera" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Lascia" @@ -1044,91 +1067,91 @@ msgstr "Peso: %s" msgid "Kill stats" msgstr "Statistiche uccisioni" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Reset statistiche" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Reset timer" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "" @@ -1226,11 +1249,11 @@ msgid "Submit" msgstr "Invia" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Cancella" @@ -1268,328 +1291,329 @@ msgstr "Rimuovi prima" msgid "Away outfit" msgstr "Away outfit" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Commercia" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Aggiungi alla chat" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Oggetto mappa" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Spells" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Disabilita highlight" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Abilita highlight" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "Cambia posizione nella gilda" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Nome:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Salva 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Salva metà" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Salva tutto" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Ritira 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Ritira metà" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Ritira tutto" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Carica vecchie scorciatoie oggetti" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Carica vecchie scorciatoie drop" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Cambia server" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Cambia personaggio" @@ -1829,7 +1853,7 @@ msgstr "" msgid "Use local time" msgstr "" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "" @@ -1992,122 +2016,130 @@ msgstr "" msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 -msgid "Moving" +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" msgstr "" #: src/gui/setup_other.cpp:90 -msgid "Auto fix position" +msgid "Scroll laziness" msgstr "" #: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 +msgid "Moving" +msgstr "" + +#: src/gui/setup_other.cpp:99 +msgid "Auto fix position" +msgstr "" + +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2117,27 +2149,27 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" +msgid "Hw acceleration" msgstr "" #: src/gui/setup_perfomance.cpp:64 -msgid "Hw acceleration" +msgid "Enable opacity cache (Software, can use many memory)" msgstr "" #: src/gui/setup_perfomance.cpp:67 -msgid "Enable opacity cache (Software, can use many memory)" +msgid "Enable map reduce (Software)" msgstr "" #: src/gui/setup_perfomance.cpp:70 -msgid "Enable map reduce (Software)" +msgid "Better quality (disable for better perfomance)" msgstr "" #: src/gui/setup_perfomance.cpp:73 -msgid "Better quality (disable for better perfomance)" +msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 -msgid "Enable alpha channel fix (Software, can be very slow)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" msgstr "" #: src/gui/setup_perfomance.cpp:80 @@ -2392,14 +2424,10 @@ msgid "FPS limit:" msgstr "" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Video" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Testo sovrastante" @@ -2418,7 +2446,7 @@ msgstr "" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "" @@ -2524,22 +2552,22 @@ msgstr "Su" msgid "Skill points available: %d" msgstr "" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "" @@ -2739,243 +2767,243 @@ msgstr "" msgid "Specials" msgstr "" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3465,23 +3493,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" @@ -4152,68 +4180,68 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "" @@ -4414,16 +4442,16 @@ msgstr "" msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5469,19 +5497,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%s non è nel tuo party!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "" @@ -2,16 +2,17 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # -# <Necromong@inbox.ru>, 2011. +# Translators: +# Andrei Karas <akaras@inbox.ru>, 2011. # Necromonger <Necromong@inbox.ru>, 2011. +# <Necromong@inbox.ru>, 2011. # sn0w75 <ibenrunnin@gmail.com>, 2011. -# Andrei Karas <akaras@inbox.ru>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:11+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/" "ja/)\n" @@ -21,57 +22,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "ドッジ" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "ミス" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "設定" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "ビデオ" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "サーバー通信中…" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "ログイン中…" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "ゲームの世界に入る中" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "服：％d" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "ゲームサーバー通信中…" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "サーバーを入り替え中…" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -81,63 +94,63 @@ msgstr "サーバーを入り替え中…" msgid "Error" msgstr "エラー" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "登録細目を要請中" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "パスワード変更" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "パスワード変更成功！" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "メール変更" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "メール変更成功！" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "登録解除成功" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "さよなら、いつでも戻ってね..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s は存在しないので作成することが不可能！終了中…" -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "無効なアップデートホスト: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "更新フォルダの作成エラー" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "エラー： %s は存在しないので作成することが不可能！終了中…" -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "不明なコマンド" -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "空のメッセージを送信することはできません！" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -146,147 +159,147 @@ msgstr "" "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分" "です。" -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "%sというチャンネルへの参加を要求しています。" -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "パーティ名がない。" -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "ギルド名がない。" -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "名前を教えてください。" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "リターンはチャットを留めておきます。" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "メッセージはチャットを閉じます。" -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "リターンはこれからチャットを留めておきます。" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "メッセージはこれからチャットを閉じます。" -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "友達" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "無視" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "中性" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "プレイヤーはもう%s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "プレイヤーは%s成功！" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "選手は%sを居られなかった " -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "プレイヤーは無視されなかった！" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "プレイヤーはもう無視していない！" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Playerはunignoredことができなかった！" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "プレイヤーはもう消している!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "プレーアが首尾よくに消去！" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "クライアントの稼働時間：%s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -305,15 +318,15 @@ msgstr "一般" msgid "Debug" msgstr "デバッグ" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "スクリーンショットを保存することに失敗しました！" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "" @@ -321,19 +334,19 @@ msgstr "" msgid "Network Error" msgstr "ネットワークエラー" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "他人からのトレードリクエストを無視します。" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "他人からのトレードリクエストを受け入れます。" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "マップをロードできませんでした" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "%sをロードしている間にエラーが起きました。" @@ -362,37 +375,38 @@ msgstr "" msgid "Bot Checker" msgstr "ボット" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "名前" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "攻撃" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "話す" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "動く" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "結果" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "リセット" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "買う" @@ -419,7 +433,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -432,12 +446,12 @@ msgid "Max" msgstr "最大" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "店" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -446,16 +460,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -556,7 +570,7 @@ msgstr "髪スタイル" msgid "Race:" msgstr "人種:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "作成" @@ -624,26 +638,26 @@ msgstr "" msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "削除" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "選ぶ" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "レベル%d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(空っぽ)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "デフォルト" @@ -699,11 +713,12 @@ msgstr "虹 2" msgid "rainbow 3" msgstr "虹 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -729,14 +744,14 @@ msgstr "はい" msgid "No" msgstr "いいえ" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "無視" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "地図" @@ -877,8 +892,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "閉じる" @@ -895,7 +910,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" @@ -903,10 +918,10 @@ msgstr "OK" msgid "Equipment" msgstr "装備" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "外す" @@ -914,80 +929,88 @@ msgstr "外す" msgid "Help" msgstr "ヘルプ" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "アイテム" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "スロット" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "フィルタ：" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "類：" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "不足" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "字母" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "装備する" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "使う" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "落とす..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "分割する" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "服" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "重量" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "保存" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "取り戻す" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "落とす" @@ -1041,89 +1064,89 @@ msgstr "重力：%s" msgid "Kill stats" msgstr "殺人統計ウィンドウ" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "統計をれセット" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "タイマーをれセット" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "" @@ -1221,11 +1244,11 @@ msgid "Submit" msgstr "決定" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "クリア" @@ -1263,328 +1286,329 @@ msgstr "外す第一" msgid "Away outfit" msgstr "装備一式不在で" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "交換" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "完全無視" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "チャットに追加" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "マップアイテム" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "取り去る" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "呪文" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "強調表示を無効" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "強調表示を有効" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "でる" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "ギルドポジションを変更" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr " 名前: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "に貿易を足す" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "10保存" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "半分保存" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "全部保存" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "10取る" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "半分取る" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "全部取る" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr " 隠す" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "見せる" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(デフォルト)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "サーバーを切り替える" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "キャラクターを切り替える" @@ -1824,7 +1848,7 @@ msgstr "" msgid "Use local time" msgstr "" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "" @@ -1987,122 +2011,130 @@ msgstr "パスを描画" msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 -msgid "Moving" +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" msgstr "" #: src/gui/setup_other.cpp:90 -msgid "Auto fix position" +msgid "Scroll laziness" msgstr "" #: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 +msgid "Moving" +msgstr "" + +#: src/gui/setup_other.cpp:99 +msgid "Auto fix position" +msgstr "" + +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "自分のHPバーを表示する" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "仕事を表示する" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "デバッグループを有効にする" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "背景を表示する" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2112,27 +2144,27 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" +msgid "Hw acceleration" msgstr "" #: src/gui/setup_perfomance.cpp:64 -msgid "Hw acceleration" +msgid "Enable opacity cache (Software, can use many memory)" msgstr "" #: src/gui/setup_perfomance.cpp:67 -msgid "Enable opacity cache (Software, can use many memory)" +msgid "Enable map reduce (Software)" msgstr "" #: src/gui/setup_perfomance.cpp:70 -msgid "Enable map reduce (Software)" +msgid "Better quality (disable for better perfomance)" msgstr "" #: src/gui/setup_perfomance.cpp:73 -msgid "Better quality (disable for better perfomance)" +msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 -msgid "Enable alpha channel fix (Software, can be very slow)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" msgstr "" #: src/gui/setup_perfomance.cpp:80 @@ -2387,14 +2419,10 @@ msgid "FPS limit:" msgstr "FPSリミット" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "ビデオ" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "ヘッダーテキスト" @@ -2413,7 +2441,7 @@ msgstr "粒子の詳細" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "なし" @@ -2519,22 +2547,22 @@ msgstr "上げる" msgid "Skill points available: %d" msgstr "スキルポイント: %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "スキルセット %d" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "スキル %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Lvl: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Lvl：%d (%+d)" @@ -2734,243 +2762,243 @@ msgstr "パーティ名を選んでください" msgid "Specials" msgstr "スペシアール" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) 動く" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) 襲う" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) 拾い上げる" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) " -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) " -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) 不在で" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3459,23 +3487,23 @@ msgstr "" msgid "Road Point" msgstr "ロードのポイント" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "アップデート" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" @@ -4148,67 +4176,67 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "去って" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "従う: " -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "擬い: " -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "あなた" @@ -4409,16 +4437,16 @@ msgstr "プレイヤー MVP" msgid "MVP player: " msgstr "プレイヤー MVP " -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "オンラインユーザー：%d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "ゲーム" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5468,19 +5496,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "%sはパーティにはいない！" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "'...'を表示する" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "名前を瞬き" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "フローティング'...'バブル" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "フローティングバブル" diff --git a/po/manaplus.pot b/po/manaplus.pot index 5a4a251a7..27ac0b8ce 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-09-02 18:27+0300\n" +"POT-Creation-Date: 2011-09-17 16:12+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,57 +18,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -78,215 +90,215 @@ msgstr "" msgid "Error" msgstr "" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "" -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "" -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "" -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "" -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "" -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "" -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -303,15 +315,15 @@ msgstr "" msgid "Debug" msgstr "" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "" @@ -319,19 +331,19 @@ msgstr "" msgid "Network Error" msgstr "" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "" @@ -360,37 +372,38 @@ msgstr "" msgid "Bot Checker" msgstr "" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "" @@ -417,7 +430,7 @@ msgid "-" msgstr "" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -430,12 +443,12 @@ msgid "Max" msgstr "" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -444,16 +457,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -554,7 +567,7 @@ msgstr "" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "" @@ -622,26 +635,26 @@ msgstr "" msgid "Enter password:" msgstr "" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "" @@ -697,11 +710,12 @@ msgstr "" msgid "rainbow 3" msgstr "" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "" @@ -727,14 +741,14 @@ msgstr "" msgid "No" msgstr "" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "" @@ -875,8 +889,8 @@ msgid "Did You Know?" msgstr "" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "" @@ -893,7 +907,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "" @@ -901,10 +915,10 @@ msgstr "" msgid "Equipment" msgstr "" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "" @@ -912,80 +926,88 @@ msgstr "" msgid "Help" msgstr "" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 -#: src/inventory.cpp:249 -msgid "Inventory" +#: src/gui/inventorywindow.cpp:71 +msgid "by name" msgstr "" -#: src/gui/inventorywindow.cpp:105 -msgid "Slots:" +#: src/gui/inventorywindow.cpp:72 +msgid "by id" msgstr "" -#: src/gui/inventorywindow.cpp:116 -msgid "Filter:" +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" msgstr "" -#: src/gui/inventorywindow.cpp:117 -msgid "Sort:" +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" msgstr "" -#: src/gui/inventorywindow.cpp:123 -msgid "na" +#: src/gui/inventorywindow.cpp:75 +msgid "by type" msgstr "" -#: src/gui/inventorywindow.cpp:124 -msgid "az" +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 +#: src/inventory.cpp:249 +msgid "Inventory" msgstr "" -#: src/gui/inventorywindow.cpp:125 -msgid "id" +#: src/gui/inventorywindow.cpp:136 +msgid "Slots:" msgstr "" -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: src/gui/inventorywindow.cpp:148 +msgid "Filter:" +msgstr "" + +#: src/gui/inventorywindow.cpp:149 +msgid "Sort:" +msgstr "" + +#: 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 msgid "Equip" msgstr "" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "" -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "" @@ -1039,91 +1061,91 @@ msgstr "" msgid "Kill stats" msgstr "" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "" @@ -1221,11 +1243,11 @@ msgid "Submit" msgstr "" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "" @@ -1263,328 +1285,329 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "" @@ -1822,7 +1845,7 @@ msgstr "" msgid "Use local time" msgstr "" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "" @@ -1985,122 +2008,130 @@ msgstr "" msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 -msgid "Moving" +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" msgstr "" #: src/gui/setup_other.cpp:90 -msgid "Auto fix position" +msgid "Scroll laziness" msgstr "" #: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 +msgid "Moving" +msgstr "" + +#: src/gui/setup_other.cpp:99 +msgid "Auto fix position" +msgstr "" + +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2110,27 +2141,27 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" +msgid "Hw acceleration" msgstr "" #: src/gui/setup_perfomance.cpp:64 -msgid "Hw acceleration" +msgid "Enable opacity cache (Software, can use many memory)" msgstr "" #: src/gui/setup_perfomance.cpp:67 -msgid "Enable opacity cache (Software, can use many memory)" +msgid "Enable map reduce (Software)" msgstr "" #: src/gui/setup_perfomance.cpp:70 -msgid "Enable map reduce (Software)" +msgid "Better quality (disable for better perfomance)" msgstr "" #: src/gui/setup_perfomance.cpp:73 -msgid "Better quality (disable for better perfomance)" +msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 -msgid "Enable alpha channel fix (Software, can be very slow)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" msgstr "" #: src/gui/setup_perfomance.cpp:80 @@ -2385,14 +2416,10 @@ msgid "FPS limit:" msgstr "" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "" @@ -2411,7 +2438,7 @@ msgstr "" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "" @@ -2517,22 +2544,22 @@ msgstr "" msgid "Skill points available: %d" msgstr "" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "" @@ -2732,243 +2759,243 @@ msgstr "" msgid "Specials" msgstr "" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3455,23 +3482,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "" @@ -4139,68 +4166,68 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." msgstr[0] "" msgstr[1] "" -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "" @@ -4401,16 +4428,16 @@ msgstr "" msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5450,19 +5477,19 @@ msgstr "" msgid "%s is not in your party!" msgstr "" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index 128e50c2a..0e25387f3 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -2,14 +2,15 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # +# Translators: # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011. # Maarten Vanraes <maarten.vanraes@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:12+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" @@ -19,57 +20,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Zichtbaar op de map" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "ontwijkt" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "mist" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "I" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configureren" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Video" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Verbinden met server" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Inloggen" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Spelwereld binnenkomen" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Aanvragen personage" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Verbinden met de spelserver" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Wijzigen spelservers" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -79,63 +92,63 @@ msgstr "Wijzigen spelservers" msgid "Error" msgstr "Fout" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Aanvragen registratie details" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Paswoord Wijziging" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Paswoord is gewijzigd!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Email Wijziging" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "Email is gewijzigd!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Registratie ongedaan gemaakt!" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Tot ziens..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Ongeldige update host %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Fout bij het creëren van de update map!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Onbekend commando." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Kan geen lege berichten sturen!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -144,152 +157,152 @@ msgstr "" "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds " "bestaat, of het is jezelf." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Aanvragen om bij kanaal %s toegevoegd te worden." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Groepsnaam ontbreekt." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Guild-naam ontbreekt." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Gelieve een naam te specifiëren" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Ga terug naar chat" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Bericht sluit chat." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Ga nu terug naar chat." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Bericht sluit nu chat." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "vriend" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "genegeerd" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "neutraal" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Speler reeds %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Speler succesvol %s!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Speler kan niet %s zijn!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "Speler is niet genegeerd!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "Speler niet langer genegeerd!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Speler kan niet worden genegeerd!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Speler reeds verwijderd!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Speler succesvol verwijderd!" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Speler kan niet worden verwijderd!" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "Client uptime: %s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uren" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d seconden" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Aangemaakt:" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Verwijdered:" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -307,15 +320,15 @@ msgstr "Algemeen" msgid "Debug" msgstr "Debug" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Scherafdruk opgeslagen als:" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Opslaan van screenshot mislukt!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "De verbinding met de server is verbroken." @@ -323,19 +336,19 @@ msgstr "De verbinding met de server is verbroken." msgid "Network Error" msgstr "Netwerkfout" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Inkomende handelsaanvragen negeren" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Inkomende handelsaanvragen accepteren" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Kon Map Niet Laden" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Fout bij het laden van %s" @@ -364,37 +377,38 @@ msgstr "" msgid "Bot Checker" msgstr "Bot Controleerder" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Naam" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Aanvallen" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Spreken" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Beweeg" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Resultaat" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Reset" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Kopen" @@ -421,7 +435,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -434,12 +448,12 @@ msgid "Max" msgstr "Maximum" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Winkel" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -448,16 +462,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -558,7 +572,7 @@ msgstr "Haarstijl:" msgid "Race:" msgstr "Ras:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Aanmaken" @@ -626,26 +640,26 @@ msgstr "Geef uw wachtwoord om uw personage te verwijderen" msgid "Enter password:" msgstr "Geef wachtwoord:" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Verwijderen" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Kies" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Niveau %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(leeg)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "standaard" @@ -701,11 +715,12 @@ msgstr "regenboog 2" msgid "rainbow 3" msgstr "regenboog 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -731,14 +746,14 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Negeer" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Map" @@ -862,7 +877,7 @@ msgstr "" #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 #, c-format msgid "Ping: %s ms" -msgstr "" +msgstr "Ping: %s ms" #: src/gui/debugwindow.cpp:395 #, c-format @@ -879,8 +894,8 @@ msgid "Did You Know?" msgstr "Weet u?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Sluiten" @@ -897,7 +912,7 @@ msgid "Auto open this window" msgstr "" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" @@ -905,10 +920,10 @@ msgstr "OK" msgid "Equipment" msgstr "Uitrusting" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Afdoen" @@ -916,80 +931,88 @@ msgstr "Afdoen" msgid "Help" msgstr "Help" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventaris" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Sloten:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Filter:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Sorteer:" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "na" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "az" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Uitrusten" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Gebruiken" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Neerleggen..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Splitsen" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Kleren" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Gewicht:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Opslaan" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Afhalen" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Neerleggen" @@ -1043,91 +1066,91 @@ msgstr "Gewicht: %s" msgid "Kill stats" msgstr "Doden statistieken" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Herzet statistieken" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Herzet timer" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" msgstr[1] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr " Tijd tot volgend niveau: %s" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "" @@ -1225,11 +1248,11 @@ msgid "Submit" msgstr "Indienen" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Wissen" @@ -1267,328 +1290,329 @@ msgstr "Verwijder uitrusting eerst" msgid "Away outfit" msgstr "Kleren om weg te gaan" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handel" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" -msgstr "" +msgstr "Fluister" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" -msgstr "" +msgstr "Genees" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Word vriend" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "Geen rekening mee houden" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Wis" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "Volledig genegeerd" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Volg" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Imiteer" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "Schop speler" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Toon Voorwerpen" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "ontkleed" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "Koop (?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "Verkoop (?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "Schop" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Raap op" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Aan chat toevoegen" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Plaats voorwerp op de kaart" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Hernoem" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Verwijder" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Inladen oude kleren" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Spreuken" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Laad oude spreuken" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Wijzig spreuk" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Markering afzetten" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Markering aanzetten" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "Verwijder naam" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "away aanzetten" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "away afzetten" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Verlaat" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "Wijzig uw guild positie" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Kaart bordje hernoemen " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Naam: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Plaats 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Plaats de helft" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Plaats alles" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "Laat alles vallen" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Haal 10 op" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Haal de helft op" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Haal alles op" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Laden van oude voorwerpsnelkoppelingen" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Laden van oude neerleggingsnelkoppeling" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Verberg" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Toon" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Kopieer naar chat" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(standaard)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Beweeg naar boven" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Beweeg naar beneden" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Van server wisselen" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Van personage wisselen" @@ -1828,7 +1852,7 @@ msgstr "Tijd" msgid "Use local time" msgstr "Gebruik lokale tijd" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "Andere" @@ -1865,7 +1889,7 @@ msgstr "Spectrum" #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319 msgid "Delay:" -msgstr "" +msgstr "Vertraging:" #: src/gui/setup_colors.cpp:112 msgid "Red:" @@ -1985,128 +2009,136 @@ msgstr "Toon uitgebreide minimaps" #: src/gui/setup_other.cpp:81 msgid "Draw path" -msgstr "" +msgstr "Teken de weg" #: src/gui/setup_other.cpp:84 msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "Bewegen" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Aanvallen tijdens verplaatsen" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Speler" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Toon hp statusbalk van jezelf" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "Zet snelle statistieken aan" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Accepteer koop/verkoop aanvragen" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "shop modus aanzetten" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" -msgstr "" +msgstr "Aanval gecontroleerd door server aanzetten" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" -msgstr "" +msgstr "Bot controle aanzetten" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" -msgstr "" +msgstr "Beveiliging tegen fouten van server aanzetten" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Zet debug log aan" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Toon achtergrond" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2116,29 +2148,29 @@ msgid "Auto adjust perfomance" msgstr "" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Hw acceleratie" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "" @@ -2245,27 +2277,27 @@ msgstr "Tijdens negeren:" #: src/gui/setup_theme.cpp:107 msgid "Tiny (10)" -msgstr "" +msgstr "Heel klein (10)" #: src/gui/setup_theme.cpp:108 msgid "Small (11)" -msgstr "" +msgstr "Klein (11)" #: src/gui/setup_theme.cpp:109 msgid "Medium (12)" -msgstr "" +msgstr "Middelmatig (12)" #: src/gui/setup_theme.cpp:110 msgid "Large (13)" -msgstr "" +msgstr "Groot (13)" #: src/gui/setup_theme.cpp:111 msgid "Big (14)" -msgstr "" +msgstr "Heel groot (14)" #: src/gui/setup_theme.cpp:112 msgid "Huge (15)" -msgstr "" +msgstr "Extreem groot (15)" #: src/gui/setup_theme.cpp:143 msgid "Theme" @@ -2391,14 +2423,10 @@ msgid "FPS limit:" msgstr "FPS limiet:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Alt FPS limiet: " -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Video" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "" @@ -2417,7 +2445,7 @@ msgstr "" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Geen" @@ -2529,22 +2557,22 @@ msgstr "Omhoog" msgid "Skill points available: %d" msgstr "" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Niv: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Niv: %d (%+d)" @@ -2695,7 +2723,7 @@ msgstr "Uitnodiging tot guild ontvangen, maar er is er al één." #: src/gui/socialwindow.cpp:1431 #, c-format msgid "%s has invited you to join the guild %s." -msgstr "" +msgstr "%s heeft je uitgenodigd om guid %s te vervoegen." #: src/gui/socialwindow.cpp:1437 msgid "Accept Guild Invite" @@ -2742,245 +2770,245 @@ msgstr "Kies uw groepsnaam." #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88 msgid "Specials" -msgstr "" +msgstr "Specialen" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) standaard bewegingen" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "(I) geïnverteerde bewegingen" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "(c) bewegingen met enkele vreemde bewegingen" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "(C) bewegingen met vreemde bewegingen" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) dubbel normaal + raar" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) beweeg" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "(a) manuele vreemde beweging" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "(?) vreemde beweging" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "(0) standaard bewegingen tot aan doel" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "(1) bewegen tot aan doel in bereik 1" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) bewegen tot aan doel in bereik 2" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "(3) bewegen tot aan doel in bereik 3" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "(5) bewegen tot aan doel in bereik 5" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "(7) bewegen tot aan doel in bereik 7" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "(A) beweeg tot aan doel in aanvalsbereik" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?) beweeg tot aan doel" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "(D) standaard volgen" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "(R) relatief volgen" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "(M) gespiegeld volgen" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "(P) huisdier volgen" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "(?) onbekend volgen" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) standaard aanval" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) wissel aanval zonder schild" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) wissel aanval met schild" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) aanval" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) ga en val aan" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) ga, val aan, raap op" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) zonder auto aanval" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "(S) klein raap op 1x1 velden" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "(D) standaard raap op 2x1 velden" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "(F) vooruit raap op 2x3 velden" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "(3) raap op 3x3 velden" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "(g) go en raap op met bereik 4" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "(G) ga en raap op met bereik 8" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "(A) ga en raap op zonder bereiklimiet" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) raap op" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) normale map tonen" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "(D) debug map tonen" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "(u) ultra map tonen" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "(U) ultra map tonen 2" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) lege map tonen" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b) zwart & witte map tonen" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "(?) map tonen" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) gebruik #flar voor magie aanval" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) gebruik #chiza voor magie aanval" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(I) gebruik #ingrav voor magie aanval" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) gebruik #frillyar voor magie aanval" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) gebruik #upmarmu voor magie aanval" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) magie aanval" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "(D) standaard imitatie" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "(O) kleren imitatie" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) imitatie" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) op toetsenbord" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) weg" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) weg" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "(G) spel camera modus" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "(F) vrije camera modus" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "(D) design camera modus" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3367,11 +3395,11 @@ msgstr "" #: src/gui/userpalette.cpp:129 msgid "Party Members" -msgstr "" +msgstr "Groep Leden" #: src/gui/userpalette.cpp:130 msgid "Guild Members" -msgstr "" +msgstr "Guild Leden" #: src/gui/userpalette.cpp:131 msgid "Particle Effects" @@ -3469,23 +3497,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "Wie Is Online - Bijwerken" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Bijwerken" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "Wie Is Online - " -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "Wie Is Online - fout" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "Wie Is Online - Bijgewerkt" @@ -3997,11 +4025,11 @@ msgstr "Emoticon snelkoppeling %d" #: src/keyboardconfig.cpp:261 msgid "Wear Outfit" -msgstr "" +msgstr "Draag Kledij" #: src/keyboardconfig.cpp:263 msgid "Copy Outfit" -msgstr "" +msgstr "Kopiëer Kledij" #: src/keyboardconfig.cpp:265 msgid "Copy equipped to Outfit" @@ -4137,7 +4165,7 @@ msgstr "" #: src/keyboardconfig.cpp:331 msgid "On / Off audio" -msgstr "" +msgstr "Aan / Uit audio" #: src/keyboardconfig.cpp:333 msgid "Enable / Disable away mode" @@ -4162,68 +4190,68 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "U bent gedoodt door " -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Geprobeerd een nietbestaand voorwerp op te rapen." -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "Voorwerp is te zwaar." -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "Voorwerp is te ver weg." -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "Voorwerp behoort bij iemand anders." -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 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:1439 +#: src/localplayer.cpp:1454 #, 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:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Weg" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Volg: " -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Volgen onderbroken" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Imitatie: " -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Imitatie onderbroken" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "" @@ -4426,16 +4454,16 @@ msgstr "" msgid "MVP player: " msgstr "" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "Online gebruikers: %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Spel" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "Aanvraag op de stoppen is geweigerd!" @@ -4445,7 +4473,7 @@ msgstr "Guild aangemaakt." #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93 msgid "You are already in guild." -msgstr "" +msgstr "U bent al in deze guild." #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." @@ -5496,19 +5524,19 @@ msgstr "Verbinding met server beëindigd. " msgid "%s is not in your party!" msgstr "%s is niet in jouw groep!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Say '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Blink naam" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Zwevende '...' bel" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "Zwevende bel" @@ -2,15 +2,16 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Andrei Karas <akaras@inbox.ru>, 2011. # <freya.df@gmail.com>, 2011. # freya <freya.df@gmail.com>, 2011. -# Andrei Karas <akaras@inbox.ru>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 18:59+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:15+0000\n" "Last-Translator: freya <freya.df@gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/" "pt/)\n" @@ -20,57 +21,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Visivel no mapa" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "desviou" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "errou" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "l" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Configurar" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "Performance" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Vídeo" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "Temas" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Conectando ao servidor" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Efetuando login" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Entrando no domínio do jogo" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Requisitando personagens" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -80,63 +93,63 @@ msgstr "Mudando servidores do jogo" msgid "Error" msgstr "Erro" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s não existe e não pode ser criado! Saindo." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Não é possível enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -145,152 +158,152 @@ 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:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Não foi possível deixar de ignorar o jogador!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "Tamanho do cache de fonte" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "Tamanho de Cache:" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "Recursos de imagens:" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "Recursos de imagens orfãos:" @@ -308,15 +321,15 @@ msgstr "Geral" msgid "Debug" msgstr "Depurador" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Screenshot salva como " -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Falha ao salvar screenshot!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." @@ -324,19 +337,19 @@ msgstr "A conexão com o servidor caiu." msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Não foi possível carregar o mapa" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -365,37 +378,38 @@ msgstr "Comentário: %s" msgid "Bot Checker" msgstr "Analizador de bot" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Mover" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Resetar" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Comprar" @@ -422,7 +436,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -435,12 +449,12 @@ msgid "Max" msgstr "Máximo" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Loja" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -449,16 +463,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -559,7 +573,7 @@ msgstr "Estilo do Cabelo:" msgid "Race:" msgstr "Corrida:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Criar" @@ -627,26 +641,26 @@ msgstr "Entre com a Senha para Deletar o usuario" msgid "Enter password:" msgstr "Entre com a senha" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Excluir" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Escolher" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Nível %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(vazio)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "padrão" @@ -702,11 +716,12 @@ msgstr "arco-íris 2" msgid "rainbow 3" msgstr "arco-íris 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -732,14 +747,14 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Ignora" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Mapa" @@ -880,8 +895,8 @@ msgid "Did You Know?" msgstr "Você sabia?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fechar" @@ -898,7 +913,7 @@ msgid "Auto open this window" msgstr "Abrir automaticamente esta janela" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" @@ -906,10 +921,10 @@ msgstr "OK" msgid "Equipment" msgstr "Equipamento" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Desequipar" @@ -917,80 +932,88 @@ msgstr "Desequipar" msgid "Help" msgstr "Ajuda" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "por nome" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "por id" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "por peso" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "por quantidade" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "por tipo" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventário" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Slots:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Filtro:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Classificar" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "na" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "az" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Equipar" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Usar" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Dividir" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Roupas" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Peso:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1044,91 +1067,91 @@ msgstr "Peso: %s" msgid "Kill stats" msgstr "Estatísticas" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Resetar Status" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Resetar tempo" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "Nível: %d em %f%%" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "Exp: %d%d faltando: %d" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "1%% = %d exp, avg mob para 1%%: %s" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "Mortes: %s, total exp: %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "Mortes/Min: %s Exp/Min: %s" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "Velocidade de exp por %d min: %s" msgstr[1] "Velocidade de exp por %d mins: %s" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "Tempo para próximo nível por %d min: %s" msgstr[1] "Tempo para próximo nível por %d mins: %s" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "Exp de última morte:" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "Tempo para próximo JackO:" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "Tempo para próximo nível: %s" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "%s %d?" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "JackOvai aparecer" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "Você saiu da Guilda." @@ -1226,11 +1249,11 @@ msgid "Submit" msgstr "Enviar" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Limpar" @@ -1268,328 +1291,329 @@ msgstr "Desequipar antes" msgid "Away outfit" msgstr "Roupas de ocupado" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Negócios" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Sussuro" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Curar:" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Ser Amigo" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "Ser inimigo" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Apagar" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "Não ignorar" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Imitar" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "Convidar para grupo" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "Chutar do grupo" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "Chutar da Guilda" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "Mudar posição da Guilda" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "Convidar para Guilda" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "Chutar Jogador" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "Deixar pelado" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Mostar itens:" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "Deixar sem Roupas" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "Adicionar comentário" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "Vender (?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "Chutar" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "Remover da Lista de Ataques" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "Adicionar a prioridade na lista de ataques" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "Adicionar a lista de ataques" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "Adicionar a lista de ignorados" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "Adicionar nome ao chat" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Nome no chat" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Mapa Item" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "A Remover" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "Urdidura" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Carregar Antigas Roupas" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Feitiços" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Carregar Antigos Feitiços" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Editar Feitiços" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Desabilitar destaque" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Habilitar destaque" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "Não remova o nome" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "Remover nome" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "Habilitar longe do teclado" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "Desabilitar longe do teclado" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Sair" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 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:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "Resetar barra amarela" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copiar para o chat" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Mover a cima" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Mover a baixo" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Trocar servidor" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Trocar de Personagem" @@ -1828,7 +1852,7 @@ msgstr "Tempo" msgid "Use local time" msgstr "Usar hora local" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "Outro" @@ -1991,122 +2015,130 @@ msgstr "Desenhar caminho" msgid "Draw hotkeys on map" msgstr "Desenhar atalhos no mapa" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "Habilitar rolagem preguiçosa" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "Rolagem preguiçosa" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "Velocidade de rolagem" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "Movendo" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Auto-ajustar posição" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Atacar enquanto se move" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "Sincronizar movimento" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Movimentos loucos" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Jogador" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Mostrar minha barra de hp" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "Habilitar stats rápidos" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Alvo de jogadores em ciclo" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Mostrar menssagens de job exp" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "Mostrar popups de jogadores" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "Mensagem Ausente" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Mostrar job" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "A habilitar filtro de ataque" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "Habilitar protocolo de aviso" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Aceitar convites de compra/venda" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Habilitar modo loja" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Salvar diálogos com NPC" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "Suporte de bots" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "Habilitar suporte há bot de leilão" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "Habilitar ataque do lado do servidor" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Habilitar Analisador de bot" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "Habilitar proteção contra servidores com bugs" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Habilitar Depurador" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "Modo de baixo tráfego" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "Ocultar sprite de escudo" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Mostrar imagem de fundo" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "Performance" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "Melhor performance (Habilite para melhor performance)" @@ -2116,29 +2148,29 @@ msgid "Auto adjust perfomance" msgstr "Auto ajuste de performance" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "Mostrar transparencia " - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Aceleração por HW" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "Habilitar cache de opacidade (Software, pode usar muita memória)" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "Habilitar redução de mapa (Software)" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "Melhor qualidade (Desative para melhor performace)" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "Habilitar correção de canal alpha (Software, pode ficar muito lento)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "Mostrar transparencia " + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "Habilitar reordenar sprites" @@ -2391,14 +2423,10 @@ msgid "FPS limit:" msgstr "Limite FPS:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Limite FPS alt: " -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Vídeo" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Texto sobrescrito como:" @@ -2417,7 +2445,7 @@ msgstr "Detalhe de partículas" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Nenhum" @@ -2527,22 +2555,22 @@ msgstr "+" msgid "Skill points available: %d" msgstr "Pontos de habilidade disponíveis: %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "Habilidade %d" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "Habilidade %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Nível: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Nível: %d (%+d)" @@ -2742,243 +2770,243 @@ msgstr "Escolha o nome do seu grupo." msgid "Specials" msgstr "Especiais" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) mover" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "(?) movimentos loucos" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) Ataque" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "(?) Visualizador de mapa" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "(D) Mímica padrão" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "(O) Mímica de roupas" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) Mímica" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) Ausente" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) Ausente" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "(D) Modo de jogo câmera design" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo ativados" @@ -3466,23 +3494,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -4154,68 +4182,68 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "Você foi morto por " -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 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:1439 +#: src/localplayer.cpp:1454 #, 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:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Seguir cancelado" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "Você vê " @@ -4420,16 +4448,16 @@ msgstr "Jogador VIP." msgid "MVP player: " msgstr "Jogador VIP: " -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "Jogadores online: %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Jogo" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "Requisição de saída negada!" @@ -5491,19 +5519,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:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "Bolha Flutuante" diff --git a/po/pt_BR.po b/po/pt_BR.po index b27a872a4..80d404092 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,17 +2,18 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # +# Translators: # <alasmirt@gmail.com>, 2011. # alastrim <alasmirt@gmail.com>, 2011. +# Andrei Karas <akaras@inbox.ru>, 2011. # <freya.df@gmail.com>, 2011. # freya <freya.df@gmail.com>, 2011. -# Andrei Karas <akaras@inbox.ru>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 19:00+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:15+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" @@ -22,57 +23,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Mapa visivel " -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" -msgstr "desviou" +msgstr "por nome" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" -msgstr "errou" +msgstr "por id" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "I" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" -msgstr "Configurar" +msgstr "por peso" + +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "Performance" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Vídeo" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "Temas" -#: src/client.cpp:914 +#: src/client.cpp:932 msgid "Connecting to server" -msgstr "Conectando ao servidor" +msgstr "por quantidade" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" -msgstr "Efetuando login" +msgstr "por tipo" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" -msgstr "Entrando no domínio do jogo" +msgstr "Habilitar rolagem preguisoça " -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" -msgstr "Requisitando personagens" +msgstr "Rolagem preguiçosa" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Conectando ao servidor do jogo" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Mudando servidores do jogo" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -82,63 +95,63 @@ msgstr "Mudando servidores do jogo" msgid "Error" msgstr "Erro" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Requisitando detalhes do registro" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Mudar senha" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Senha modificada com sucesso!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Mudar email" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "Email modificado com sucesso!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Registro cancelado com sucesso" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Tchau, volte sempre..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s não existe e não pode ser criado! Saindo." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Host de atualização inválido: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Erro ao criar pasta de atualizações!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Não é possível enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -147,152 +160,152 @@ 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:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Não foi possível deixar de ignorar o jogador!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "Tamanho de fonte Cache" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "Tamanho de cache:" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "Recursos de imagem:" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "Recurso de imagem orfão:" @@ -310,15 +323,15 @@ msgstr "Geral" msgid "Debug" msgstr "Depurador" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Screenshot salva como " -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Falha ao salvar screenshot!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "A conexão com o servidor caiu." @@ -326,19 +339,19 @@ msgstr "A conexão com o servidor caiu." msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Não foi possível carregar o mapa" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -367,37 +380,38 @@ msgstr "Comentário: %s" msgid "Bot Checker" msgstr "Analizador de bot" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nome" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Atacar" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Falar" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Mover" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Resultado" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Resetar" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Comprar" @@ -424,7 +438,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -437,12 +451,12 @@ msgid "Max" msgstr "Máximo" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Loja" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -451,16 +465,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -561,7 +575,7 @@ msgstr "Estilo do Cabelo:" msgid "Race:" msgstr "Corrida:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Criar" @@ -629,26 +643,26 @@ msgstr "Entre com a senha para apagar o personagem" msgid "Enter password:" msgstr "Entre com a senha:" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Excluir" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Escolher" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Nível %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(vazio)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "padrão" @@ -704,11 +718,12 @@ msgstr "arco-íris 2" msgid "rainbow 3" msgstr "arco-íris 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -734,14 +749,14 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Ignora" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Mapa" @@ -882,8 +897,8 @@ msgid "Did You Know?" msgstr "Você Sabia?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Fechar" @@ -900,7 +915,7 @@ msgid "Auto open this window" msgstr "Auto abrir esta janela" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "OK" @@ -908,10 +923,10 @@ msgstr "OK" msgid "Equipment" msgstr "Equipamento" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Desequipar" @@ -919,80 +934,88 @@ msgstr "Desequipar" msgid "Help" msgstr "Ajuda" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "por nome" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "por id" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "por peso" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "por quantidade" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "por tipo" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Inventário" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Slots:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Filtro:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Classificar" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "na" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "az" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Equipar" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Usar" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Descartar..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Dividir" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Roupas" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Peso:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Armazenar" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Retirar" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Descartar" @@ -1046,91 +1069,91 @@ msgstr "Peso: %s" msgid "Kill stats" msgstr "Estatísticas" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Resetar Status" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Resetar tempo" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "Nível: %d em %f%%" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "Exp: %d%d Falta: %d" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "1%% = %d ex, avg mob por 1%%: %s" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "Mortes: %s Total exp: %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "Mortes/Min: %s Exp/Min: %s" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "Velocidade de exp por %d min: %s" msgstr[1] "Velocidade de exp por %d mins: %s" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "Tempo para o próximo nível %d min: %s " msgstr[1] "Tempo para o próximo nível %d mins: %s " -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "Ultim exp por morte:" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "Tempo para próxima aparição do JackO:" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "Tempo para próximo nível: %s" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "%s %d?" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "Aparição do JackO" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "Você saiu da Guilda." @@ -1228,11 +1251,11 @@ msgid "Submit" msgstr "Enviar" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Limpar" @@ -1270,328 +1293,329 @@ msgstr "Desequipar antes" msgid "Away outfit" msgstr "Roupas de ocupado" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Negócios" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Mensagem Privada:" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Cura" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Ser amigo" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "Ser inimigo" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Apagar" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "Não ignorar" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "Ignorar completamente" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Seguir" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Imitar" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "Convidar para grupo" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "Expulsar do grupo" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "Expulsar da guilda" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "Mudar pos na Guilda" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "Convidar pra Guilda" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "Chutar Jogador" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "Nu" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Mostrar itens:" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "Despir" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "Add comentário" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "Comprar (?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "vender (?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "Chutar" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "Remover da lista de ataque" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "Adicionar na prioridade da lista de ataques" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "Adicionar a lista de ataques" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "Adicionar a lista de ignorados" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "Adicionar nome ao chat" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Pegar" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Nome no chat" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Mapa Item" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Renomear" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Remover" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "Urdidura" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Carregar velhas roupas" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Feitiços" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Carregar velhos feitiços" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Editar feitiços" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Desabilitar destaque" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Habilitar destaque" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "Não retire o nome" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "Remover o nome" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "Habilitar modo indisponível" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "Desabilitar modo indisponível" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Sair" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 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:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Renomear mapa " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Nome: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "Comentário do jogador" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "Comentário:" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "Add. na negociação" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "Add. 10 na negociação" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "Add. metade na negociação" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "Add. todos na negociação" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Guardar 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Guardar metade" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Guardar tudo" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "Descartar tudo" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Retirar 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Retirar metade" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Retirar tudo" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Carregar antigos atalhos de item" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Carregar antigos atalhos de descarte" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Ocultar" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Mostrar" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "Zerar barra amarela" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Copiar para chat" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(padrão)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Mover para cima" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Mover para baixo" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Trocar servidor" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Trocar de Personagem" @@ -1830,7 +1854,7 @@ msgstr "Tempo" msgid "Use local time" msgstr "Usar tempo local" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "Outro" @@ -1993,122 +2017,130 @@ msgstr "Desenhar caminho" msgid "Draw hotkeys on map" msgstr "Desenhar atalhos no mapa" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "Habilitar rolagem preguiçosa" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "Rolagem preguiçosa" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "Velocidade de rolagem" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "Movendo" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Auto-ajustar posição" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Atacar enquanto se move" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "Sincronizar movimento" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Movimentos loucos" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Jogador" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Mostrar minha barra de hp" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "Habilitar stats rápidos" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Alvo de jogadores em ciclo" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Mostrar mensagens de job exp" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "Mostrar popups de jogadores" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "Mensagem Ausente" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Mostrar job" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "Habilitar filtro de ataque" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "Habilitar o protocolo de aviso" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Aceitar convites de compra/venda" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Habilitar modo loja" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Salvar diálogos com NPC" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "Suporte de bots" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "Habilitar suporte ao bot de leilão" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "Habilitar ataque do lado do servidor" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Habilitar Analisador de bot" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "Habilitar proteção contra servidores com bugs" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Habilitar Depurador" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "Modo de baixo tráfego" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "Ocultar sprite de escudo" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Mostrar imagem de fundo" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "Performance" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "Melhor peformance (habilitar para melhor peformance)" @@ -2118,29 +2150,29 @@ msgid "Auto adjust perfomance" msgstr "Auto ajustar performance" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "Mostrar transparencia" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Aceleração por HW" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "Habilitar cache de opacidade (Software, pode se usar muita memória)" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "Habilitar redução de mapa (Software)" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "Melhor qualidade (desabilita para melhor performance)" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "Habilitar ajuste de canal alpha (Software, pode ficar muito lento)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "Mostrar transparencia" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "Habilitar reordenar sprites." @@ -2393,14 +2425,10 @@ msgid "FPS limit:" msgstr "Limite FPS:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Limite FPS alt: " -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Vídeo" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Texto sobrescrito como:" @@ -2419,7 +2447,7 @@ msgstr "Detalhe de partículas" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Nenhum" @@ -2529,22 +2557,22 @@ msgstr "+" msgid "Skill points available: %d" msgstr "Pontos de habilidade disponíveis: %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "Habilidade %d" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "Habilidade %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Nível: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Nível: %d (%+d)" @@ -2744,243 +2772,243 @@ msgstr "Escolha o nome do seu grupo." msgid "Specials" msgstr "Especiais" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) movimentos padrão" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "(l) inserir movimentos" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "(c) Alguns movimentos loucos" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "(C) Movimentos loucos" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) dobro normal + louco" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) mover" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "(a) movimentos loucos customizados" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "(?) Movimentos loucos" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "(0) Mover ao alvo padrão" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "(1) Mover ao alvo com distância 1" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) mover ao alvo em distância 2" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "(3) Mover ao alvo com distância 3" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "(5) Mover ao alvo com distância 5" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "(7) Mover ao alvo com distância 7" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "(A) Mover ao alvo com a distância de ataque" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?) Mover ao alvo" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "(D) Seguir em modo padrão" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "(R) Seguir em modo relativo" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "(M) Seguir em modo espelhado" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "(P) Seguir em modo animal de extimação" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "(?) Seguir em modo desconhecido" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) Ataque padrão" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) Trocar ataque sem escudo" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) Trocar ataque com escudo" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) Ataque" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) Ir e atacar" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) Ir, atacar, pegar" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) sem auto ataque" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "(S) Pequeno pegar 1x1 celulas" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "(D) Pegar padrão 2x1 células" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "(F) Pegar em frente 2x3 células" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "(3) Pegar 3x3 células" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "(g) Ir e pegar em distância 4" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "(G) Ir e pegar em distância 8" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "(A) Ir e pegar em distância mâxima" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) Pegar item" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) Visualizardor de mapa normal" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "(D) Visualizador de mapa depurador" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "(u) Visualizador de mapa ultra" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "(U) Visualizador de mapa ultra 2" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) Visualizador de mapa vazio" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b) Visualizador de mapa preto e branco" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "(?) Visualizador de mapa" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) Usar #flar para feitiço de ataque" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) Usar #chiza para feitiço de ataque" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(I) Usar #ingrav para feitiço de ataque" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) Usar #frillyar para feitiço de ataque" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) Usar #upmarmu para feitiço de ataque" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) Feitiço de ataque" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "(D) Mímica padrão" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "(O) Mímica de roupas" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) Mímica" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) No teclado" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) Ausente" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) Ausente" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "(G) Modo de jogo câmera" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "(F) Modo de jogo câmera livre" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "(D) Modo de jogo câmera design" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "Modificadores de jogo desativados" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "Modificadores de jogo desativados" @@ -3468,23 +3496,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -4156,68 +4184,68 @@ msgstr "" "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não " "comprometer a jogabilidade." -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "Você foi morto por " -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Você tentou pegar um item não existente." -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "Este item é muito pesado." -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "Item está muito longe" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "O inventário está cheio." -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "Esta pilha é muito grande." -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "Este item pertence a outra pessoa." -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 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:1439 +#: src/localplayer.cpp:1454 #, 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:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Indisponivel " -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Seguindo:" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Seguindo cancelado" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Imitando:" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "Você vê " @@ -4422,16 +4450,16 @@ msgstr "Jogador VIP." msgid "MVP player: " msgstr "Jogador VIP: " -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "Jogadores online: %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Jogo" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "Requisição de saída negada!" @@ -5493,19 +5521,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:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Imprimir '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Piscar nome" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Bolha '...' flutuante" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "Bolha Flutuante" @@ -2,16 +2,17 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # -# <reslayer@mail.ru>, 2011. -# <Necromong@inbox.ru>, 2011. -# Necromonger <Necromong@inbox.ru>, 2011. +# Translators: # Andrei Karas <akaras@inbox.ru>, 2011. +# Necromonger <Necromong@inbox.ru>, 2011. +# <Necromong@inbox.ru>, 2011. +# <reslayer@mail.ru>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:34+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:13+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/" "ru/)\n" @@ -22,57 +23,69 @@ 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:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "Видимые на карте" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "уворот" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "промах" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "О" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "Б" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Настройка" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "Производительность" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Видео" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "Темы" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "Идет подключение к серверу..." -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "Авторизация" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "Входим в игровой мир" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "Получение списка персонажей" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "Подключение к игровому серверу" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "Смена игрового сервера" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -82,63 +95,63 @@ msgstr "Смена игрового сервера" msgid "Error" msgstr "Ошибка" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "Запрос регистрационных данных" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "Изменить Пароль" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "Пароль изменен!" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "Сменить Email" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "Email изменен!" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "Регистрация удалена" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "Хорошо, возвращайтесь в любое время..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "%s не существует, и не может быть создано! Выход." -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "Некорректный сервер обновлений: %s" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "Ошибка создания директории для обновлений!" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Ошибка: %s не существует, и не может быть создан! Выход." -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "Неизвестная команда." -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "Нельзя отправлять пустые сообщения!" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -147,97 +160,97 @@ msgstr "" "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка " "уже создана, или этот игрок Вы сами." -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "Запрос на присоединение к каналу %s." -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Не указано название группы" -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "Не задано имя гильдии." -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "Пожалуйста, укажите имя" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "Enter переключает Вас на окно чата." -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "Сообщение закрывает чат." -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "Теперь Return переключает чат." -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "Теперь сообщение закрывает чат." -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "друг" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "пренебрегаемый" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "нейтральный" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "Игрок уже %s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "Игрок удачно %s!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "Игрок не может быть %s!" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "Игрок не был игнорируемым!" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "Игрок больше не игнорируется!" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "Игрок не может быть удален из списка игнорирования!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "Игрок и так уже удален!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "Игрок удален!" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "Игрок не может быть удален!" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "Время работы клиента: %s" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -245,7 +258,7 @@ msgstr[0] "%d неделя" msgstr[1] "%d недели" msgstr[2] "%d недель" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" @@ -253,7 +266,7 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дней" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -261,7 +274,7 @@ msgstr[0] "%d час" msgstr[1] "%d часа" msgstr[2] "%d часов" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -269,7 +282,7 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -277,27 +290,27 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "размер кеша шрифта" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "Размер кеша:" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "Создано:" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "Удалено:" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "Изображений:" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "Удаленных изображений:" @@ -316,15 +329,15 @@ msgstr "Общие" msgid "Debug" msgstr "Отладка" -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "Снимок экрана сохранен как " -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "Ошибка при сохранении снимка экрана!" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "Соединение с сервером потеряно." @@ -332,19 +345,19 @@ msgstr "Соединение с сервером потеряно." msgid "Network Error" msgstr "Ошибка сети" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "Игнорировать предложения о торговле" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "Принимать предложения о торговле" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "Не удалось загрузить карту" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "Ошибка во время загрузки %s" @@ -373,37 +386,38 @@ msgstr "Комментарий: %s" msgid "Bot Checker" msgstr "Окно детектора ботов" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Имя" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "Атака" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Разговор" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "Движение" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "Результат" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Сбросить" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "Купить" @@ -430,7 +444,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -443,12 +457,12 @@ msgid "Max" msgstr "Макс" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Магазин" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -457,16 +471,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -567,7 +581,7 @@ msgstr "Стрижка:" msgid "Race:" msgstr "Раса:" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Создать" @@ -635,26 +649,26 @@ msgstr "Введите пароль для удаления персонажа" msgid "Enter password:" msgstr "Введите пароль:" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "Удалить" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "Выбрать" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "Уровень: %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "(пусто)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "По умолчанию" @@ -710,11 +724,12 @@ msgstr "радуга 2" msgid "rainbow 3" msgstr "радуга 3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -740,14 +755,14 @@ msgstr "Да" msgid "No" msgstr "Нет" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "Игнорировать" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Карта" @@ -888,8 +903,8 @@ msgid "Did You Know?" msgstr "Вы знаете?" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Закрыть" @@ -906,7 +921,7 @@ msgid "Auto open this window" msgstr "Автоматически открывать это окно" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "ОК" @@ -914,10 +929,10 @@ msgstr "ОК" msgid "Equipment" msgstr "Снаряжение" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "Снять" @@ -925,80 +940,88 @@ msgstr "Снять" msgid "Help" msgstr "Помощь" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "по названию" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "по ид" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "по весу" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "по кол-ву." + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "по типу" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "Инвентарь" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "Вместимость:" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "Фильтр:" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "Сорт.:" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "нет" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "ая" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "ид" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "Надеть" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "Использовать" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "Бросить" -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "Разделить" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "Наряды" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Вес:" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "Сохранить" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "Получить" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Бросить" @@ -1052,51 +1075,51 @@ msgstr "Вес: %s" msgid "Kill stats" msgstr "Окно статистики атак" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "Сбросить стат." -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "Сбросить таймер" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "Уровень: %d на %f%%" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "Опыт: %d/%d Осталось: %d" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "Убийств: %s, опыта: %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "Средний опыт: %s, среднее кол-во мобов до след. уровня: %s" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "Убийств в минуту: %s, Опыта в минуту: %s" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" @@ -1104,7 +1127,7 @@ msgstr[0] "Опыт за %d мин.: %s" msgstr[1] "Опыт за %d мин.: %s" msgstr[2] "Опыт за %d мин.: %s" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" @@ -1112,33 +1135,33 @@ msgstr[0] "Время до следующего уровня в мин. %d: %s" msgstr[1] "Время до следующего уровня в мин. %d: %s" msgstr[2] "Время до следующего уровня в мин. %d: %s" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "Опыт за последнее убийство:" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "Время до появления jacko:" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr " Время до следующего уровня: %s" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "%s %d?" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "jacko появляется" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "Вы покинули гильдию." @@ -1236,11 +1259,11 @@ msgid "Submit" msgstr "Применить" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "Очистить" @@ -1278,328 +1301,329 @@ msgstr "Сначала снять" msgid "Away outfit" msgstr "наряд отсутствия" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Торговать" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "Приват" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "Лечить" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "Подружиться" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "Пренебречь" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "Стереть" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "Не игнорировать" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "@@ignore|Полностью игнорировать@@" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "Следовать" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "Имитировать" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "Пригласить в группу" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "Выкинуть из группы" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "Выкинуть из гильдии" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "Сменить позицию в гильдии" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "Пригласить в гильдию" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "Кикнуть игрока" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "Уничтожить" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "Показать предметы" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "Раздеть" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "Добавить коментарий" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "Купить (?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "Продать (?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "Кикнуть" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "Удалить из списка атаки" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "Добавить в приоритетный список" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "Добавить в список атаки" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "Добавить в список игнорирования" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "Добавить имя в чат" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "Поднять" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "Добавить в чат" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "Элмент карты" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "Переименовать" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "Удалить" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "Прыгнуть" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "Загрузить старые наряды" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "Заклинания" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "Загрузить старые заклинания" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "Изменить заклинание" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "Отключить уведомление" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "Включить уведомление" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "Не скрывать имя" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "Скрывать имя" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "Рарешить режим отошел" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "Запретить режим отошел" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "Покинуть" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "Сменить позицию в гильдии" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "Переименовать знак на карте" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "Имя: " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "Комментарий " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "Комментарий: " -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "Добавить к сделке" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "Добавить к сделке 10" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "Добавить к сделке половину" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "Добавить к торговле все" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "Сохранить 10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "Сохранить половину" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "Сохранить все" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "Бросить все" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "Получить 10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "Получить половину" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "Получить все" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "Загрузить старые горячие клавиши предметов" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "Загрузить старые данные" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "Спрятать" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "Показать" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "сбросить настройки" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "Скопировать в чат" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(по умолчанию)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "Передвинуть выше" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "Передвинуть ниже" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Сменить сервер" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Сменить персонажа" @@ -1838,7 +1862,7 @@ msgstr "Время" msgid "Use local time" msgstr "Использовать местное время" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "Другое" @@ -2001,122 +2025,130 @@ msgstr "Рисовать путь" msgid "Draw hotkeys on map" msgstr "Рисовать клавиши на карте" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "Включить ленивую прокрутку" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "ленивая прокрутка" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "радиус прокрутки" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "Движения" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "Авто. исправ. позиции" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "Атаковать в движении" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "Синх. движение" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "Программа для сумасшедших движений A" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "Игрок" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "Показывать свою жизнь" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "Включить быструю смену статов" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "Прокручивать прицел по игрокам" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "Показывать опыт работы." -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "Показ. всплыв. сообщения игроков" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "Ответ в режиме \"отошел\"" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "Показывать уровень работы" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "Включить фильтр атак" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "Включить режим посылки состояния" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "Принимать запросы купить/продать" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "Включить режим магазина" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "Сохранять текст NPC" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "Поддержка ботов" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "Включить поддержку бота аукционов" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "Включить поддержку гильд-бота" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "Включить серверную атаку" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "Включить детектор ботов" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "Включить защиту от сбойных серверов" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "Включить отлад. лог" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "Режим кеширования игроков" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "Спрятать картинку счита" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "Показать фон" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "Производительность" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "Улучшение производительности (включите для большей производительности)" @@ -2126,33 +2158,33 @@ msgid "Auto adjust perfomance" msgstr "Автоматически подстраивать производительность" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "Отображать прозрачность на персонажах и монстрах" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "Аппаратное ускорение" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" "Включить кеш прозрачности (программный режим, может использовать много " "памяти)" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "Включить оптимизацию карты (программный режим)" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "Улучшение качества (выключите для лучшей производительности)" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" "Включить исправление альфа канала (программный режим, может быть очень " "медленным)" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "Отображать прозрачность на персонажах и монстрах" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "Включить перестановку спрайтов" @@ -2406,14 +2438,10 @@ msgid "FPS limit:" msgstr "Ограничить кадр/с:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "Альтер. ограничить кадр/с: " -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Видео" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "Текст над головами" @@ -2432,7 +2460,7 @@ msgstr "Детализация частиц" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "Нет" @@ -2544,22 +2572,22 @@ msgstr "Верх" msgid "Skill points available: %d" msgstr "Очков навыков осталось: %d" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "Умение %d" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "Умение %d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "Уровень: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "Уровень: %d (%+d)" @@ -2759,243 +2787,243 @@ msgstr "Выберите имя будущей группы." msgid "Specials" msgstr "Особые" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "(D) движения по умолчанию" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "(I) обратное движение" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "(c) обычное движение иногда с сумашедшими движениями" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "(C) движение с сумашедшими движениями" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "(d) нормальные и сумашедшие движения" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "(?) неизвестное движение" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "(a) пользовательские сумашедшие движения" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "(?) неизвестные сумасшедшие движения" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "(0) обычное движение к цели" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "(1) движение к цели на расстояние 1" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "(2) движение к цели на расстояние 2" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "(3) движение к цели на расстояние 3" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "(5) движение к цели на расстояние 5" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "(7) движение к цели на расстояние 7" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "(A) движение к цели на расстояние атаки" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?) неизвестное движение к цели" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "(D) следование по умолчанию" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "(R) относительное следование" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "(M) зеркальное следование" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "(P) следование как животное" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "(?) неизвестное следование" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "(D) обычная атака" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "(s) переключение атаки без щита" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "(S) переключение атаки со щитом" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) неизвестная атака" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) идти и атаковать" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "(A) идти, атаковать, собирать" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "(d) без автоатаки" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "(S) поднятие в области 1x1" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "(D) поднятие из области 2x1" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "(F) поднятие из области спереди 2x3" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "(3) поднятие из области 3x3" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "(g) движение и поднятие на расстоянии 4" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "(g) движение и поднятие на расстоянии 8" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "(A) движение и поднятие на максимальном расстоянии" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?) неизвестный режим поднятия" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "(N) обычный режим карты" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "(D) отладочный режим карты" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "(u) специальный режим карты" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "(U) специальный режим карты 2" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "(e) режим пустой карты" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "(b) черно-белый режим карты" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "(?) неизвестный режим карты" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "(f) использовать #flar для атаки" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "(c) использовать #chiza для атаки" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "(I) использовать #ingrav для атаки" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "(F) использовать #frillyar для атаки" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "(U) использовать #upmarmu для атаки" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "(?) неизвестная магическая атака" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "(D) имитация по умолчанию" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "(O) имитация нарядов" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "(?) неизвестная имитация" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "(O) возле компьютера" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "(A) отошел" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "(?) неизвестный режим отошел" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "(G) игровая камера" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "(F) свободная камера" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "(D) камера в режиме разработки" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "Игровые модификаторы выключены" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "Игровые модификаторы включены" @@ -3484,23 +3512,23 @@ msgstr "Бордюр домашней позиции" msgid "Road Point" msgstr "Точка дороги" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "Кто онлайн - обновление" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "Обновить" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "Кто онлайн - " -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "Кто онлайн - ошибка" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "Кто онлайн - обновление" @@ -4173,41 +4201,41 @@ msgstr "" "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно " "вести." -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "Вы были убиты " -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "Попытка поднять несуществующий предмет." -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "Предмет слишком тяжелый." -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "Предмет слишком далеко" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "Инвентарь переполнен." -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "Слишком много предметов." -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "Предмет принадлежит кому-то еще." -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "Неизвестная проблема при поднятии предмета." #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, c-format msgid "You picked up %d [@@%d|%s@@]." msgid_plural "You picked up %d [@@%d|%s@@]." @@ -4215,27 +4243,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]." msgstr[1] "Вы подняли %d [@@%d|%s@@]." msgstr[2] "Вы подняли %d [@@%d|%s@@]." -#: src/localplayer.cpp:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "Отошел" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "Следование: " -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "Следование отменено" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "Имитация: " -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "Имитация отменена" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "Вы видите " @@ -4438,16 +4466,16 @@ msgstr "Игрок MVP." msgid "MVP player: " msgstr "Игрок MVP: " -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "Пользователей онлайн: %d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "Игра" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "Запрос на выход отклонен!" @@ -5507,19 +5535,19 @@ msgstr "Подключение к серверу прервано." msgid "%s is not in your party!" msgstr "%s не в группе!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "Печатать '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "Мигать именем" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "Плавающий '...' пузырек" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "Плавающий пузырек" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0ade28fe2..9170e805f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,14 +2,15 @@ # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. # -# <colorfullife81@gmail.com>, 2011. +# Translators: # Andrei Karas <akaras@inbox.ru>, 2011. +# <colorfullife81@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-09-02 18:27+0300\n" -"PO-Revision-Date: 2011-09-02 15:29+0000\n" +"POT-Creation-Date: 2011-09-17 16:12+0300\n" +"PO-Revision-Date: 2011-09-16 20:12+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/" "team/zh_CN/)\n" @@ -19,57 +20,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1088 msgid "Visible on map" msgstr "在地图上可见" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "dodge" msgstr "躲闪" -#: src/being.cpp:549 +#: src/being.cpp:548 msgid "miss" msgstr "小姐" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1529 +#: src/being.cpp:1527 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1534 +#: src/being.cpp:1532 msgid "I" msgstr "I" -#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 +#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "设置" -#: src/client.cpp:914 +#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "Perfomance" + +#: src/client.cpp:846 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "视频" + +#: src/client.cpp:851 +msgid "Themes" +msgstr "" + +#: src/client.cpp:932 msgid "Connecting to server" msgstr "连接到服务器" -#: src/client.cpp:945 +#: src/client.cpp:963 msgid "Logging in" msgstr "登录" -#: src/client.cpp:978 +#: src/client.cpp:996 msgid "Entering game world" msgstr "进入游戏世界" -#: src/client.cpp:1078 +#: src/client.cpp:1096 msgid "Requesting characters" msgstr "请求字符" -#: src/client.cpp:1109 +#: src/client.cpp:1127 msgid "Connecting to the game server" msgstr "连接到游戏服务器" -#: src/client.cpp:1119 +#: src/client.cpp:1137 msgid "Changing game servers" msgstr "更改游戏服务器" -#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298 +#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321 #: 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 @@ -79,210 +92,210 @@ msgstr "更改游戏服务器" msgid "Error" msgstr "错误" -#: src/client.cpp:1172 +#: src/client.cpp:1196 msgid "Requesting registration details" msgstr "申请登记的详细信息" -#: src/client.cpp:1199 +#: src/client.cpp:1222 msgid "Password Change" msgstr "密码更改" -#: src/client.cpp:1200 +#: src/client.cpp:1223 msgid "Password changed successfully!" msgstr "密码成功！" -#: src/client.cpp:1219 +#: src/client.cpp:1242 msgid "Email Change" msgstr "电子邮件变更" -#: src/client.cpp:1220 +#: src/client.cpp:1243 msgid "Email changed successfully!" msgstr "电子邮件已变更成功！" -#: src/client.cpp:1240 +#: src/client.cpp:1263 msgid "Unregister Successful" msgstr "注销成功" -#: src/client.cpp:1241 +#: src/client.cpp:1264 msgid "Farewell, come back any time..." msgstr "永别了，任何时候回来... ..." -#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502 -#: src/client.cpp:1927 src/client.cpp:1934 +#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508 +#: src/client.cpp:1933 src/client.cpp:1940 #, c-format msgid "%s doesn't exist and can't be created! Exiting." msgstr "" -#: src/client.cpp:1633 +#: src/client.cpp:1639 #, c-format msgid "Invalid update host: %s" msgstr "" -#: src/client.cpp:1667 src/client.cpp:1673 +#: src/client.cpp:1673 src/client.cpp:1679 msgid "Error creating updates directory!" msgstr "创建更新目录错误！" -#: src/client.cpp:1694 +#: src/client.cpp:1700 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:303 +#: src/commandhandler.cpp:196 msgid "Unknown command." msgstr "未知命令。" -#: src/commandhandler.cpp:403 +#: src/commandhandler.cpp:295 msgid "Cannot send empty whispers!" msgstr "无法发送空白密语！" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:309 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。" -#: src/commandhandler.cpp:437 +#: src/commandhandler.cpp:329 #, c-format msgid "Requesting to join channel %s." msgstr "请求加入频道%s。" -#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "帮会名称缺失。" -#: src/commandhandler.cpp:464 +#: src/commandhandler.cpp:356 msgid "Guild name is missing." msgstr "公会名称是缺少的。" -#: src/commandhandler.cpp:477 src/commandhandler.cpp:589 -#: src/commandhandler.cpp:630 src/commandhandler.cpp:660 +#: src/commandhandler.cpp:369 src/commandhandler.cpp:481 +#: src/commandhandler.cpp:522 src/commandhandler.cpp:552 msgid "Please specify a name." msgstr "请指定一个名称。" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:523 +#: src/commandhandler.cpp:415 msgid "Message closes chat." msgstr "讯息关闭聊天。" -#: src/commandhandler.cpp:534 +#: src/commandhandler.cpp:426 msgid "Return now toggles chat." msgstr "<回车>键现在切换聊天。" -#: src/commandhandler.cpp:540 +#: src/commandhandler.cpp:432 msgid "Message now closes chat." msgstr "讯息现在关闭聊天。" -#: src/commandhandler.cpp:568 +#: src/commandhandler.cpp:460 msgid "friend" msgstr "朋友" -#: src/commandhandler.cpp:573 +#: src/commandhandler.cpp:465 msgid "disregarded" msgstr "无视" -#: src/commandhandler.cpp:578 +#: src/commandhandler.cpp:470 msgid "neutral" msgstr "中性" -#: src/commandhandler.cpp:597 +#: src/commandhandler.cpp:489 #, c-format msgid "Player already %s!" msgstr "玩家已经%s!" -#: src/commandhandler.cpp:611 +#: src/commandhandler.cpp:503 #, c-format msgid "Player successfully %s!" msgstr "玩家成功%s!" -#: src/commandhandler.cpp:619 +#: src/commandhandler.cpp:511 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:641 +#: src/commandhandler.cpp:533 msgid "Player wasn't ignored!" msgstr "是不能忽视的！" -#: src/commandhandler.cpp:648 +#: src/commandhandler.cpp:540 msgid "Player no longer ignored!" msgstr "玩家不再被忽略！" -#: src/commandhandler.cpp:650 +#: src/commandhandler.cpp:542 msgid "Player could not be unignored!" msgstr "玩家不能被忽略!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:559 msgid "Player already erased!" msgstr "玩家已经被删除!" -#: src/commandhandler.cpp:678 +#: src/commandhandler.cpp:570 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:680 +#: src/commandhandler.cpp:572 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026 +#: src/commandhandler.cpp:872 src/commandhandler.cpp:918 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:990 +#: src/commandhandler.cpp:882 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:999 +#: src/commandhandler.cpp:891 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:1007 +#: src/commandhandler.cpp:899 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:1015 +#: src/commandhandler.cpp:907 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:1023 +#: src/commandhandler.cpp:915 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1102 +#: src/commandhandler.cpp:994 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1114 +#: src/commandhandler.cpp:1006 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1118 +#: src/commandhandler.cpp:1010 msgid "Created:" msgstr "创建于：" -#: src/commandhandler.cpp:1120 +#: src/commandhandler.cpp:1012 msgid "Deleted:" msgstr "删除：" -#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174 +#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176 +#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068 msgid "Resource orphaned images:" msgstr "" @@ -299,15 +312,15 @@ msgstr "常规" msgid "Debug" msgstr "调试 " -#: src/game.cpp:511 +#: src/game.cpp:513 msgid "Screenshot saved as " msgstr "截图保存为" -#: src/game.cpp:519 +#: src/game.cpp:521 msgid "Saving screenshot failed!" msgstr "保存屏幕快照失败！" -#: src/game.cpp:559 +#: src/game.cpp:560 msgid "The connection to the server was lost." msgstr "服务器的连接丢失。" @@ -315,19 +328,19 @@ msgstr "服务器的连接丢失。" msgid "Network Error" msgstr "网络错误" -#: src/game.cpp:1236 +#: src/game.cpp:1320 msgid "Ignoring incoming trade requests" msgstr "忽略新进的交易请求" -#: src/game.cpp:1243 +#: src/game.cpp:1330 msgid "Accepting incoming trade requests" msgstr "接受传入的交易请求" -#: src/game.cpp:1629 +#: src/game.cpp:1729 msgid "Could Not Load Map" msgstr "不能加载地图" -#: src/game.cpp:1630 +#: src/game.cpp:1730 #, c-format msgid "Error while loading %s" msgstr "加载%s时出现错误" @@ -356,37 +369,38 @@ msgstr "评论: %s" msgid "Bot Checker" msgstr "机器人检查" -#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64 +#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "姓名" -#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133 -#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646 +#: 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 msgid "Attack" msgstr "攻击" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "说话" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263 -#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703 +#: 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 msgid "Move" msgstr "移动" -#: src/gui/botcheckerwindow.cpp:299 +#: src/gui/botcheckerwindow.cpp:300 msgid "Result" msgstr "结果" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "重置" #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278 -#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 +#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654 msgid "Buy" msgstr "购买" @@ -413,7 +427,7 @@ msgid "-" msgstr "-" #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47 -#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 #: src/keyboardconfig.cpp:290 msgid "Quit" @@ -426,12 +440,12 @@ msgid "Max" msgstr "最大" #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "商店" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280 -#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257 +#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 #: src/gui/selldialog.cpp:93 msgid "Sell" @@ -440,16 +454,16 @@ 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:354 -#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489 -#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540 -#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573 -#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814 -#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762 -#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861 -#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936 -#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023 -#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: 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/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/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 #: src/gui/updaterwindow.cpp:161 @@ -550,7 +564,7 @@ msgstr "发型：" msgid "Race:" msgstr "" -#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478 +#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480 #: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "建立" @@ -618,26 +632,26 @@ msgstr "删除字符输入的密码" msgid "Enter password:" msgstr "输入密码：" -#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298 +#: 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 msgid "Delete" msgstr "删除" -#: src/gui/charselectdialog.cpp:466 +#: src/gui/charselectdialog.cpp:468 msgid "Choose" msgstr "选择" -#: src/gui/charselectdialog.cpp:469 +#: src/gui/charselectdialog.cpp:471 #, c-format msgid "Level %d" msgstr "等级 %d" -#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481 +#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483 msgid "(empty)" msgstr "()" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" msgstr "默认" @@ -693,11 +707,12 @@ msgstr "彩虹2" msgid "rainbow 3" msgstr "彩虹3" -#: src/gui/chatwindow.cpp:142 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_theme.cpp:127 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +#: 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_theme.cpp:127 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "？？？" @@ -723,14 +738,14 @@ msgstr "是" msgid "No" msgstr "否" -#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149 -#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402 -#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661 -#: src/gui/popupmenu.cpp:669 +#: 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 msgid "Ignore" msgstr "忽略" -#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 #: src/gui/setup_other.cpp:64 msgid "Map" msgstr "地图" @@ -871,8 +886,8 @@ msgid "Did You Know?" msgstr "你知道吗？" #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 -#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113 +#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "关闭" @@ -889,7 +904,7 @@ msgid "Auto open this window" msgstr "自动打开这个窗口" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "确定" @@ -897,10 +912,10 @@ msgstr "确定" msgid "Equipment" msgstr "装备" -#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131 -#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521 -#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788 -#: src/gui/popupmenu.cpp:1833 +#: 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 msgid "Unequip" msgstr "卸下装备" @@ -908,80 +923,88 @@ msgstr "卸下装备" msgid "Help" msgstr "帮助" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "" + +#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76 #: src/inventory.cpp:249 msgid "Inventory" msgstr "物品栏" -#: src/gui/inventorywindow.cpp:105 +#: src/gui/inventorywindow.cpp:136 msgid "Slots:" msgstr "槽：" -#: src/gui/inventorywindow.cpp:116 +#: src/gui/inventorywindow.cpp:148 msgid "Filter:" msgstr "过滤器：" -#: src/gui/inventorywindow.cpp:117 +#: src/gui/inventorywindow.cpp:149 msgid "Sort:" msgstr "排序：" -#: src/gui/inventorywindow.cpp:123 -msgid "na" -msgstr "na" - -#: src/gui/inventorywindow.cpp:124 -msgid "az" -msgstr "az" - -#: src/gui/inventorywindow.cpp:125 -msgid "id" -msgstr "id" - -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695 -#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835 +#: 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 msgid "Equip" msgstr "装备" -#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515 -#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698 -#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794 -#: src/gui/popupmenu.cpp:1838 +#: 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 msgid "Use" msgstr "使用" -#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620 -#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799 -#: src/gui/popupmenu.cpp:1842 +#: 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 msgid "Drop..." msgstr "掉落... ..." -#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711 -#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676 +#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813 msgid "Split" msgstr "分离" -#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60 -#: src/gui/popupmenu.cpp:549 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:519 msgid "Outfits" msgstr "装具" -#: src/gui/inventorywindow.cpp:149 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "重量：" -#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611 -#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811 -#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73 +#: 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 msgid "Store" msgstr "存储" -#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718 +#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683 msgid "Retrieve" msgstr "取回" -#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847 +#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672 +#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "丢弃" @@ -1035,89 +1058,89 @@ msgstr "重量：%s" msgid "Kill stats" msgstr "杀敌统计" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:67 msgid "Reset stats" msgstr "复位统计" -#: src/gui/killstats.cpp:66 +#: src/gui/killstats.cpp:68 msgid "Reset timer" msgstr "复位定时器" -#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" msgstr "等级:%d 在 %f%%" -#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" msgstr "" -#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217 -#: src/gui/killstats.cpp:226 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" msgstr "" -#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143 -#: src/gui/killstats.cpp:235 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" msgstr "" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 -#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" msgstr "" -#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163 -#: src/gui/killstats.cpp:238 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" msgstr "" -#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 -#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306 -#: src/gui/killstats.cpp:324 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" msgstr[0] "" -#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" msgstr[0] "" -#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" msgstr "最后EXP：" -#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356 -#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368 -#: src/gui/killstats.cpp:373 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" msgstr "" -#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302 -#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319 -#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" msgstr "" -#: src/gui/killstats.cpp:362 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" msgstr "%s %d?" -#: src/gui/killstats.cpp:368 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" msgstr "" -#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439 +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439 msgid "You have left the guild." msgstr "你已经离开工会." @@ -1215,11 +1238,11 @@ msgid "Submit" msgstr "提交" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:142 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558 msgid "Clear" msgstr "清除" @@ -1257,328 +1280,329 @@ msgstr "" msgid "Away outfit" msgstr "" -#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "交易" -#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363 msgid "Whisper" msgstr "密语" -#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600 msgid "Heal" msgstr "愈合" -#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399 -#: src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369 +#: src/gui/popupmenu.cpp:606 msgid "Be friend" msgstr "是朋友" -#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156 -#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426 -#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667 -#: src/gui/popupmenu.cpp:691 +#: 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 msgid "Disregard" msgstr "" -#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160 -#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176 -#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409 -#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670 -#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684 +#: 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 msgid "Erase" msgstr "" -#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174 -#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425 -#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683 -#: src/gui/popupmenu.cpp:689 +#: 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 msgid "Unignore" msgstr "" -#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185 -#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428 -#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693 -#: src/playerrelations.cpp:400 +#: 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 msgid "Completely ignore" msgstr "完全忽略" -#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436 -#: src/gui/popupmenu.cpp:701 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403 +#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719 msgid "Follow" msgstr "按照" -#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404 +#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720 msgid "Imitation" msgstr "" -#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673 msgid "Invite to party" msgstr "" -#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415 +#: src/gui/popupmenu.cpp:678 msgid "Kick from party" msgstr "踢从党" -#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237 -#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220 +#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695 msgid "Kick from guild" msgstr "踢从公会" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242 -#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225 +#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700 msgid "Change pos in guild" msgstr "" -#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474 -#: src/gui/popupmenu.cpp:776 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445 +#: src/gui/popupmenu.cpp:709 msgid "Invite to guild" msgstr "" -#: src/gui/popupmenu.cpp:260 +#: src/gui/popupmenu.cpp:241 msgid "Kick player" msgstr "踢球员" -#: src/gui/popupmenu.cpp:262 +#: src/gui/popupmenu.cpp:243 msgid "Nuke" msgstr "" -#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643 +#: src/gui/popupmenu.cpp:732 msgid "Show Items" msgstr "显示项目" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705 -#: src/gui/popupmenu.cpp:2020 +#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644 +#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966 msgid "Undress" msgstr "" -#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304 -#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707 -#: src/gui/popupmenu.cpp:786 +#: 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 msgid "Add comment" msgstr "发表评论" -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453 +#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739 msgid "Buy (?)" msgstr "购买(?)" -#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483 -#: src/gui/popupmenu.cpp:726 +#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454 +#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740 msgid "Sell (?)" msgstr "出售(?)" -#: src/gui/popupmenu.cpp:316 +#: src/gui/popupmenu.cpp:288 msgid "Kick" msgstr "" -#: src/gui/popupmenu.cpp:327 +#: src/gui/popupmenu.cpp:299 msgid "Remove from attack list" msgstr "" -#: src/gui/popupmenu.cpp:333 +#: src/gui/popupmenu.cpp:304 msgid "Add to priority attack list" msgstr "优先攻击列表" -#: src/gui/popupmenu.cpp:335 +#: src/gui/popupmenu.cpp:306 msgid "Add to attack list" msgstr "加入攻击清单" -#: src/gui/popupmenu.cpp:338 +#: src/gui/popupmenu.cpp:308 msgid "Add to ignore list" msgstr "" -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486 +#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457 msgid "Add name to chat" msgstr "" -#: src/gui/popupmenu.cpp:512 +#: src/gui/popupmenu.cpp:482 msgid "Pick up" msgstr "拾取" -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732 -#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855 +#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692 +#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817 msgid "Add to chat" msgstr "加入聊天" -#: src/gui/popupmenu.cpp:530 +#: src/gui/popupmenu.cpp:500 msgid "Map Item" msgstr "地图项" -#: src/gui/popupmenu.cpp:531 +#: src/gui/popupmenu.cpp:501 msgid "Rename" msgstr "重命名" -#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973 -#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996 +#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927 +#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942 msgid "Remove" msgstr "" -#: src/gui/popupmenu.cpp:537 +#: src/gui/popupmenu.cpp:507 msgid "Warp" msgstr "" -#: src/gui/popupmenu.cpp:551 +#: src/gui/popupmenu.cpp:520 msgid "Load old outfits" msgstr "" -#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96 msgid "Spells" msgstr "法术" -#: src/gui/popupmenu.cpp:569 +#: src/gui/popupmenu.cpp:537 msgid "Load old spells" msgstr "" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:538 msgid "Edit spell" msgstr "" -#: src/gui/popupmenu.cpp:596 +#: src/gui/popupmenu.cpp:562 msgid "Disable highlight" msgstr "禁用" -#: src/gui/popupmenu.cpp:601 +#: src/gui/popupmenu.cpp:564 msgid "Enable highlight" msgstr "启用突出" -#: src/gui/popupmenu.cpp:606 +#: src/gui/popupmenu.cpp:566 msgid "Don't remove name" msgstr "" -#: src/gui/popupmenu.cpp:611 +#: src/gui/popupmenu.cpp:568 msgid "Remove name" msgstr "" -#: src/gui/popupmenu.cpp:616 +#: src/gui/popupmenu.cpp:570 msgid "Enable away" msgstr "启用远" -#: src/gui/popupmenu.cpp:621 +#: src/gui/popupmenu.cpp:572 msgid "Disable away" msgstr "" -#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141 +#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141 msgid "Leave" msgstr "留下" -#: src/gui/popupmenu.cpp:798 +#: src/gui/popupmenu.cpp:753 msgid "Change guild position" msgstr "更改公会的立场" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1234 +#: src/gui/popupmenu.cpp:1205 msgid "Rename map sign " msgstr "重命名的地图标志" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1236 +#: src/gui/popupmenu.cpp:1207 msgid "Name: " msgstr "名称：" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1286 +#: src/gui/popupmenu.cpp:1257 msgid "Player comment " msgstr "玩家评论" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1288 +#: src/gui/popupmenu.cpp:1259 msgid "Comment: " msgstr "评论：" -#: src/gui/popupmenu.cpp:1657 +#: src/gui/popupmenu.cpp:1630 msgid "Add to trade" msgstr "" -#: src/gui/popupmenu.cpp:1663 +#: src/gui/popupmenu.cpp:1634 msgid "Add to trade 10" msgstr "" -#: src/gui/popupmenu.cpp:1666 +#: src/gui/popupmenu.cpp:1635 msgid "Add to trade half" msgstr "" -#: src/gui/popupmenu.cpp:1668 +#: src/gui/popupmenu.cpp:1636 msgid "Add to trade all" msgstr "" -#: src/gui/popupmenu.cpp:1680 +#: src/gui/popupmenu.cpp:1646 msgid "Store 10" msgstr "商店10" -#: src/gui/popupmenu.cpp:1683 +#: src/gui/popupmenu.cpp:1647 msgid "Store half" msgstr "商店的一半" -#: src/gui/popupmenu.cpp:1685 +#: src/gui/popupmenu.cpp:1648 msgid "Store all" msgstr "商店所有" -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800 -#: src/gui/popupmenu.cpp:1843 +#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760 +#: src/gui/popupmenu.cpp:1805 msgid "Drop all" msgstr "所有" -#: src/gui/popupmenu.cpp:1724 +#: src/gui/popupmenu.cpp:1687 msgid "Retrieve 10" msgstr "拿出10" -#: src/gui/popupmenu.cpp:1727 +#: src/gui/popupmenu.cpp:1688 msgid "Retrieve half" msgstr "拿出一半" -#: src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1689 msgid "Retrieve all" msgstr "检索所有" -#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816 +#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776 msgid "Load old item shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1859 +#: src/gui/popupmenu.cpp:1821 msgid "Load old drop shortcuts" msgstr "" -#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920 +#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882 msgid "Hide" msgstr "隐藏" -#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888 msgid "Show" msgstr "显示" -#: src/gui/popupmenu.cpp:1933 +#: src/gui/popupmenu.cpp:1894 msgid "Reset yellow bar" msgstr "" -#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241 +#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241 msgid "Copy to chat" msgstr "" -#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958 +#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" msgstr "(默认)" -#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983 +#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935 msgid "Move up" msgstr "x" -#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988 +#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937 msgid "Move down" msgstr "" -#: src/gui/quitdialog.cpp:51 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "交换服务器" -#: src/gui/quitdialog.cpp:52 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "交换角色" @@ -1816,7 +1840,7 @@ msgstr "时间" msgid "Use local time" msgstr "使用本地时间" -#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157 +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 msgid "Other" msgstr "其他" @@ -1979,122 +2003,130 @@ msgstr "绘制路径" msgid "Draw hotkeys on map" msgstr "" -#: src/gui/setup_other.cpp:88 +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "" + +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "" + +#: src/gui/setup_other.cpp:97 msgid "Moving" msgstr "移动" -#: src/gui/setup_other.cpp:90 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" msgstr "自动修复的位置" -#: src/gui/setup_other.cpp:93 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" msgstr "攻击的同时移动" -#: src/gui/setup_other.cpp:96 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" msgstr "同步播放移动" -#: src/gui/setup_other.cpp:99 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" msgstr "疯狂的举动的程序" -#: src/gui/setup_other.cpp:103 +#: src/gui/setup_other.cpp:112 msgid "Player" msgstr "玩家" -#: src/gui/setup_other.cpp:105 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" msgstr "显示自己的HP栏" -#: src/gui/setup_other.cpp:108 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" msgstr "启用快速统计" -#: src/gui/setup_other.cpp:111 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" msgstr "" -#: src/gui/setup_other.cpp:114 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" msgstr "显示工作EXP消息" -#: src/gui/setup_other.cpp:117 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" msgstr "显示球员弹出窗口" -#: src/gui/setup_other.cpp:120 +#: src/gui/setup_other.cpp:129 msgid "Afk message" msgstr "" -#: src/gui/setup_other.cpp:123 +#: src/gui/setup_other.cpp:132 msgid "Show job" msgstr "显示工作" -#: src/gui/setup_other.cpp:126 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" msgstr "启用攻击过滤器" -#: src/gui/setup_other.cpp:129 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" msgstr "" -#: src/gui/setup_other.cpp:135 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" msgstr "接受出售/购买请求" -#: src/gui/setup_other.cpp:138 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" msgstr "启用店模式" -#: src/gui/setup_other.cpp:144 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" msgstr "NPC对话" -#: src/gui/setup_other.cpp:148 +#: src/gui/setup_other.cpp:157 msgid "Bots support" msgstr "" -#: src/gui/setup_other.cpp:150 +#: src/gui/setup_other.cpp:159 msgid "Enable auction bot support" msgstr "" -#: src/gui/setup_other.cpp:153 +#: src/gui/setup_other.cpp:162 msgid "Enable guild bot support and disable native guild support" msgstr "" -#: src/gui/setup_other.cpp:159 +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" msgstr "启用服务器端的攻击" -#: src/gui/setup_other.cpp:162 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" msgstr "启用BOT检查" -#: src/gui/setup_other.cpp:165 +#: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection" msgstr "启用BUG保护" -#: src/gui/setup_other.cpp:168 +#: src/gui/setup_other.cpp:177 msgid "Enable debug log" msgstr "启用调试日志" -#: src/gui/setup_other.cpp:171 +#: src/gui/setup_other.cpp:180 msgid "Low traffic mode" msgstr "低流量模式" -#: src/gui/setup_other.cpp:174 +#: src/gui/setup_other.cpp:183 msgid "Hide shield sprite" msgstr "" -#: src/gui/setup_other.cpp:177 +#: src/gui/setup_other.cpp:186 msgid "Show background" msgstr "显示背景" -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "Perfomance" - #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" msgstr "" @@ -2104,29 +2136,29 @@ msgid "Auto adjust perfomance" msgstr "自动调整" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" msgstr "硬件加速" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" msgstr "" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" msgstr "" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" msgstr "" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" msgstr "" +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "" + #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." msgstr "" @@ -2379,14 +2411,10 @@ msgid "FPS limit:" msgstr "FPS限制：" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " msgstr "" -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "视频" - #: src/gui/setup_video.cpp:321 msgid "Overhead text" msgstr "头顶文字" @@ -2405,7 +2433,7 @@ msgstr "l" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" msgstr "w" @@ -2511,22 +2539,22 @@ msgstr "升级" msgid "Skill points available: %d" msgstr "技能点：%d个" -#: src/gui/skilldialog.cpp:418 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" msgstr "" -#: src/gui/skilldialog.cpp:430 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" msgstr "技能为%d" -#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" msgstr "等级: %d" -#: src/gui/skilldialog.cpp:542 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" msgstr "等级: %d（%+d）" @@ -2726,243 +2754,243 @@ msgstr "选择n的名称。" msgid "Specials" msgstr "特价商品" -#: src/gui/statuspopup.cpp:198 +#: src/gui/statuspopup.cpp:197 msgid "(D) default moves" msgstr "" -#: src/gui/statuspopup.cpp:203 +#: src/gui/statuspopup.cpp:202 msgid "(I) invert moves" msgstr "" -#: src/gui/statuspopup.cpp:208 +#: src/gui/statuspopup.cpp:207 msgid "(c) moves with some crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:213 +#: src/gui/statuspopup.cpp:212 msgid "(C) moves with crazy moves" msgstr "" -#: src/gui/statuspopup.cpp:218 +#: src/gui/statuspopup.cpp:217 msgid "(d) double normal + crazy" msgstr "" -#: src/gui/statuspopup.cpp:223 +#: src/gui/statuspopup.cpp:222 msgid "(?) move" msgstr "" -#: src/gui/statuspopup.cpp:241 +#: src/gui/statuspopup.cpp:240 msgid "(a) custom crazy move" msgstr "" -#: src/gui/statuspopup.cpp:245 +#: src/gui/statuspopup.cpp:244 msgid "(?) crazy move" msgstr "" -#: src/gui/statuspopup.cpp:255 +#: src/gui/statuspopup.cpp:254 msgid "(0) default moves to target" msgstr "" -#: src/gui/statuspopup.cpp:260 +#: src/gui/statuspopup.cpp:259 msgid "(1) moves to target in distance 1" msgstr "" -#: src/gui/statuspopup.cpp:265 +#: src/gui/statuspopup.cpp:264 msgid "(2) moves to target in distance 2" msgstr "" -#: src/gui/statuspopup.cpp:270 +#: src/gui/statuspopup.cpp:269 msgid "(3) moves to target in distance 3" msgstr "" -#: src/gui/statuspopup.cpp:275 +#: src/gui/statuspopup.cpp:274 msgid "(5) moves to target in distance 5" msgstr "" -#: src/gui/statuspopup.cpp:280 +#: src/gui/statuspopup.cpp:279 msgid "(7) moves to target in distance 7" msgstr "" -#: src/gui/statuspopup.cpp:285 +#: src/gui/statuspopup.cpp:284 msgid "(A) moves to target in attack range" msgstr "" -#: src/gui/statuspopup.cpp:290 +#: src/gui/statuspopup.cpp:289 msgid "(?) move to target" msgstr "(?)移动到目标" -#: src/gui/statuspopup.cpp:298 +#: src/gui/statuspopup.cpp:297 msgid "(D) default follow" msgstr "" -#: src/gui/statuspopup.cpp:302 +#: src/gui/statuspopup.cpp:301 msgid "(R) relative follow" msgstr "" -#: src/gui/statuspopup.cpp:306 +#: src/gui/statuspopup.cpp:305 msgid "(M) mirror follow" msgstr "" -#: src/gui/statuspopup.cpp:310 +#: src/gui/statuspopup.cpp:309 msgid "(P) pet follow" msgstr "" -#: src/gui/statuspopup.cpp:314 +#: src/gui/statuspopup.cpp:313 msgid "(?) unknown follow" msgstr "" -#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346 +#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 msgid "(D) default attack" msgstr "" -#: src/gui/statuspopup.cpp:328 +#: src/gui/statuspopup.cpp:327 msgid "(s) switch attack without shield" msgstr "" -#: src/gui/statuspopup.cpp:333 +#: src/gui/statuspopup.cpp:332 msgid "(S) switch attack with shield" msgstr "" -#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362 +#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 msgid "(?) attack" msgstr "(?) 攻击" -#: src/gui/statuspopup.cpp:350 +#: src/gui/statuspopup.cpp:349 msgid "(G) go and attack" msgstr "(G) 去攻击" -#: src/gui/statuspopup.cpp:354 +#: src/gui/statuspopup.cpp:353 msgid "(A) go, attack, pickup" msgstr "" -#: src/gui/statuspopup.cpp:358 +#: src/gui/statuspopup.cpp:357 msgid "(d) without auto attack" msgstr "" -#: src/gui/statuspopup.cpp:376 +#: src/gui/statuspopup.cpp:375 msgid "(S) small pick up 1x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:380 +#: src/gui/statuspopup.cpp:379 msgid "(D) default pick up 2x1 cells" msgstr "" -#: src/gui/statuspopup.cpp:384 +#: src/gui/statuspopup.cpp:383 msgid "(F) forward pick up 2x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:388 +#: src/gui/statuspopup.cpp:387 msgid "(3) pick up 3x3 cells" msgstr "" -#: src/gui/statuspopup.cpp:392 +#: src/gui/statuspopup.cpp:391 msgid "(g) go and pick up in distance 4" msgstr "" -#: src/gui/statuspopup.cpp:396 +#: src/gui/statuspopup.cpp:395 msgid "(G) go and pick up in distance 8" msgstr "" -#: src/gui/statuspopup.cpp:400 +#: src/gui/statuspopup.cpp:399 msgid "(A) go and pick up in max distance" msgstr "" -#: src/gui/statuspopup.cpp:404 +#: src/gui/statuspopup.cpp:403 msgid "(?) pick up" msgstr "(?)拿起" -#: src/gui/statuspopup.cpp:413 +#: src/gui/statuspopup.cpp:412 msgid "(N) normal map view" msgstr "" -#: src/gui/statuspopup.cpp:417 +#: src/gui/statuspopup.cpp:416 msgid "(D) debug map view" msgstr "" -#: src/gui/statuspopup.cpp:421 +#: src/gui/statuspopup.cpp:420 msgid "(u) ultra map view" msgstr "" -#: src/gui/statuspopup.cpp:425 +#: src/gui/statuspopup.cpp:424 msgid "(U) ultra map view 2" msgstr "" -#: src/gui/statuspopup.cpp:429 +#: src/gui/statuspopup.cpp:428 msgid "(e) empty map view" msgstr "" -#: src/gui/statuspopup.cpp:433 +#: src/gui/statuspopup.cpp:432 msgid "(b) black & white map view" msgstr "" -#: src/gui/statuspopup.cpp:437 +#: src/gui/statuspopup.cpp:436 msgid "(?) map view" msgstr "" -#: src/gui/statuspopup.cpp:445 +#: src/gui/statuspopup.cpp:444 msgid "(f) use #flar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:450 +#: src/gui/statuspopup.cpp:449 msgid "(c) use #chiza for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:455 +#: src/gui/statuspopup.cpp:454 msgid "(I) use #ingrav for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:460 +#: src/gui/statuspopup.cpp:459 msgid "(F) use #frillyar for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:465 +#: src/gui/statuspopup.cpp:464 msgid "(U) use #upmarmu for magic attack" msgstr "" -#: src/gui/statuspopup.cpp:469 +#: src/gui/statuspopup.cpp:468 msgid "(?) magic attack" msgstr "" -#: src/gui/statuspopup.cpp:478 +#: src/gui/statuspopup.cpp:477 msgid "(D) default imitation" msgstr "" -#: src/gui/statuspopup.cpp:482 +#: src/gui/statuspopup.cpp:481 msgid "(O) outfits imitation" msgstr "" -#: src/gui/statuspopup.cpp:486 +#: src/gui/statuspopup.cpp:485 msgid "(?) imitation" msgstr "" -#: src/gui/statuspopup.cpp:495 +#: src/gui/statuspopup.cpp:494 msgid "(O) on keyboard" msgstr "" -#: src/gui/statuspopup.cpp:498 +#: src/gui/statuspopup.cpp:497 msgid "(A) away" msgstr "" -#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521 +#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 msgid "(?) away" msgstr "" -#: src/gui/statuspopup.cpp:509 +#: src/gui/statuspopup.cpp:508 msgid "(G) game camera mode" msgstr "" -#: src/gui/statuspopup.cpp:513 +#: src/gui/statuspopup.cpp:512 msgid "(F) free camera mode" msgstr "" -#: src/gui/statuspopup.cpp:517 +#: src/gui/statuspopup.cpp:516 msgid "(D) design camera mode" msgstr "" -#: src/gui/statuspopup.cpp:528 +#: src/gui/statuspopup.cpp:527 msgid "Game modifiers are disabled" msgstr "" -#: src/gui/statuspopup.cpp:533 +#: src/gui/statuspopup.cpp:532 msgid "Game modifiers are enabled" msgstr "" @@ -3449,23 +3477,23 @@ msgstr "家居广场边界" msgid "Road Point" msgstr "路点" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472 +#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474 msgid "Who Is Online - Updating" msgstr "谁在线 - 更新" -#: src/gui/whoisonline.cpp:102 +#: src/gui/whoisonline.cpp:104 msgid "Update" msgstr "更新" -#: src/gui/whoisonline.cpp:295 +#: src/gui/whoisonline.cpp:297 msgid "Who Is Online - " msgstr "谁在线 -" -#: src/gui/whoisonline.cpp:486 +#: src/gui/whoisonline.cpp:488 msgid "Who Is Online - error" msgstr "谁在线 - 错误" -#: src/gui/whoisonline.cpp:517 +#: src/gui/whoisonline.cpp:519 msgid "Who Is Online - Update" msgstr "谁在线 - 更新" @@ -4133,67 +4161,67 @@ msgid "" "strange behaviour." msgstr "" -#: src/localplayer.cpp:370 +#: src/localplayer.cpp:377 msgid "You were killed by " msgstr "你被打死" -#: src/localplayer.cpp:1401 +#: src/localplayer.cpp:1416 msgid "Tried to pick up nonexistent item." msgstr "" -#: src/localplayer.cpp:1403 +#: src/localplayer.cpp:1418 msgid "Item is too heavy." msgstr "项目是太重了。" -#: src/localplayer.cpp:1405 +#: src/localplayer.cpp:1420 msgid "Item is too far away." msgstr "物品太远了。" -#: src/localplayer.cpp:1407 +#: src/localplayer.cpp:1422 msgid "Inventory is full." msgstr "" -#: src/localplayer.cpp:1409 +#: src/localplayer.cpp:1424 msgid "Stack is too big." msgstr "" -#: src/localplayer.cpp:1412 +#: src/localplayer.cpp:1427 msgid "Item belongs to someone else." msgstr "" -#: src/localplayer.cpp:1415 +#: src/localplayer.cpp:1430 msgid "Unknown problem picking up item." msgstr "" #. TRANSLATORS: %d is number, #. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1439 +#: src/localplayer.cpp:1454 #, 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:3173 +#: src/localplayer.cpp:3168 msgid "Away" msgstr "距离" -#: src/localplayer.cpp:3474 +#: src/localplayer.cpp:3468 msgid "Follow: " msgstr "跟随:" -#: src/localplayer.cpp:3476 src/localplayer.cpp:3491 +#: src/localplayer.cpp:3470 src/localplayer.cpp:3485 msgid "Follow canceled" msgstr "" -#: src/localplayer.cpp:3483 +#: src/localplayer.cpp:3477 msgid "Imitation: " msgstr "" -#: src/localplayer.cpp:3485 src/localplayer.cpp:3493 +#: src/localplayer.cpp:3479 src/localplayer.cpp:3487 msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3845 +#: src/localplayer.cpp:3832 msgid "You see " msgstr "你看" @@ -4394,16 +4422,16 @@ msgstr "MVP球员。" msgid "MVP player: " msgstr "MVP球员：" -#: src/net/ea/gamehandler.cpp:86 +#: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" msgstr "在线用户数：%d" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Game" msgstr "游戏" -#: src/net/ea/gamehandler.cpp:98 +#: src/net/ea/gamehandler.cpp:99 msgid "Request to quit denied!" msgstr "" @@ -5451,19 +5479,19 @@ msgstr "连接到服务器终止。" msgid "%s is not in your party!" msgstr "%s不在你的帮会中！" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:432 msgid "Print '...'" msgstr "" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:452 msgid "Blink name" msgstr "" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:496 msgid "Floating '...' bubble" msgstr "" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:499 msgid "Floating bubble" msgstr "流动的泡沫" diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index 2b133eca5..6155bb7af 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -68,9 +68,10 @@ ActorSprite::~ActorSprite() // Notify listeners of the destruction. for (ActorSpriteListenerIterator iter = mActorSpriteListeners.begin(), - end = mActorSpriteListeners.end(); iter != end; ++iter) + e = mActorSpriteListeners.end(); iter != e; ++iter) { - (*iter)->actorSpriteDestroyed(*this); + if (*iter) + (*iter)->actorSpriteDestroyed(*this); } } @@ -113,7 +114,7 @@ void ActorSprite::logic() if (mMustResetParticles) { mMustResetParticles = false; - for (std::set<int>::iterator it = mStatusEffects.begin(); + for (std::set<int>::const_iterator it = mStatusEffects.begin(); it != mStatusEffects.end(); ++it) { const StatusEffect *effect @@ -330,7 +331,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display, } // Ensure that something is shown, if desired - if (size() == 0 && forceDisplay) + if (empty() && forceDisplay) { if (display.image.empty()) { @@ -366,11 +367,12 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display, //setup particle effects if (Particle::enabled && particleEngine) { - std::vector<std::string>::const_iterator it, it_end; - for (it = display.particles.begin(), it_end = display.particles.end(); - it != it_end; ++it) + std::vector<std::string>::const_iterator itr, itr_end; + for (itr = display.particles.begin(), + itr_end = display.particles.end(); + itr != itr_end; ++itr) { - Particle *p = particleEngine->addEffect(*it, 0, 0); + Particle *p = particleEngine->addEffect(*itr, 0, 0); controlParticle(p); } } @@ -435,7 +437,7 @@ static const char *cursorSize(int size) void ActorSprite::initTargetCursor() { - static std::string targetCursor = "graphics/target-cursor-%s-%s.png"; + static std::string targetCursorFile = "graphics/target-cursor-%s-%s.png"; static int targetWidths[NUM_TC] = {44, 62, 82}; static int targetHeights[NUM_TC] = {35, 44, 60}; @@ -444,9 +446,9 @@ void ActorSprite::initTargetCursor() { for (int type = TCT_NORMAL; type < NUM_TCT; type++) { - loadTargetCursor(strprintf(targetCursor.c_str(), cursorType(type), - cursorSize(size)), targetWidths[size], - targetHeights[size], type, size); + loadTargetCursor(strprintf(targetCursorFile.c_str(), + cursorType(type), cursorSize(size)), targetWidths[size], + targetHeights[size], type, size); } } } diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index e8244bc30..03418a857 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -105,9 +105,9 @@ class SortBeingFunctor { int w1 = defaultPriorityIndex; int w2 = defaultPriorityIndex; - std::map<std::string, int>::iterator it1 + std::map<std::string, int>::const_iterator it1 = priorityBeings->find(being1->getName()); - std::map<std::string, int>::iterator it2 + std::map<std::string, int>::const_iterator it2 = priorityBeings->find(being2->getName()); if (it1 != priorityBeings->end()) w1 = (*it1).second; @@ -144,9 +144,9 @@ class SortBeingFunctor { int w1 = defaultAttackIndex; int w2 = defaultAttackIndex; - std::map<std::string, int>::iterator it1 + std::map<std::string, int>::const_iterator it1 = attackBeings->find(being1->getName()); - std::map<std::string, int>::iterator it2 + std::map<std::string, int>::const_iterator it2 = attackBeings->find(being2->getName()); if (it1 != attackBeings->end()) w1 = (*it1).second; @@ -257,7 +257,6 @@ void ActorSpriteManager::undelete(ActorSprite *actor) for (it = mDeleteActors.begin(), it_end = mDeleteActors.end(); it != it_end; ++it) { - ActorSprite *actor = *it; if (*it == actor) { mDeleteActors.erase(*it); @@ -301,11 +300,14 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y, return NULL; bool targetDead = mTargetDeadPlayers; - const int xtol = 16; - const int uptol = 32; + Being *tempBeing = 0; + bool noBeing(false); for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -319,17 +321,29 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y, && (allPlayers || being != player_node)) { - if ((being->getPixelX() - xtol <= x) && - (being->getPixelX() + xtol > x) && - (being->getPixelY() - uptol <= y) && + if ((being->getPixelX() - 16 <= x) && + (being->getPixelX() + 16 > x) && + (being->getPixelY() - 32 <= y) && (being->getPixelY() > y)) { return being; } + else if (!noBeing && (being->getPixelX() - 32 <= x) && + (being->getPixelX() + 32 > x) && + (being->getPixelY() - 64 <= y) && + (being->getPixelY() + 16 > y)) + { + if (tempBeing) + noBeing = true; + else + tempBeing = being; + } } } - return NULL; + if (noBeing) + return 0; + return tempBeing; } void ActorSpriteManager::findBeingsByPixel(std::vector<Being*> &beings, @@ -344,6 +358,9 @@ void ActorSpriteManager::findBeingsByPixel(std::vector<Being*> &beings, for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -375,6 +392,9 @@ Being *ActorSpriteManager::findPortalByTile(int x, int y) const for_actors { + if (!*it) + continue; + if ((*it)->getType() != ActorSprite::PORTAL) continue; @@ -391,6 +411,9 @@ FloorItem *ActorSpriteManager::findItem(int id) const { for_actors { + if (!*it) + continue; + if ((*it)->getId() == id && (*it)->getType() == ActorSprite::FLOOR_ITEM) { @@ -405,6 +428,9 @@ FloorItem *ActorSpriteManager::findItem(int x, int y) const { for_actors { + if (!*it) + continue; + if ((*it)->getTileX() == x && (*it)->getTileY() == y && (*it)->getType() == ActorSprite::FLOOR_ITEM) { @@ -426,6 +452,9 @@ bool ActorSpriteManager::pickUpAll(int x1, int y1, int x2, int y2, { for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM && ((*it)->getTileX() >= x1 && (*it)->getTileX() <= x2) && ((*it)->getTileY() >= y1 && (*it)->getTileY() <= y2)) @@ -441,6 +470,9 @@ bool ActorSpriteManager::pickUpAll(int x1, int y1, int x2, int y2, unsigned cnt = 65535; for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM && ((*it)->getTileX() >= x1 && (*it)->getTileX() <= x2) && ((*it)->getTileY() >= y1 && (*it)->getTileY() <= y2)) @@ -476,6 +508,9 @@ bool ActorSpriteManager::pickUpNearest(int x, int y, int maxdist) for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM) { FloorItem *item = static_cast<FloorItem*>(*it); @@ -503,6 +538,9 @@ Being *ActorSpriteManager::findBeingByName(const std::string &name, { for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -534,6 +572,9 @@ Being *ActorSpriteManager::findNearestByName(const std::string &name, for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -572,7 +613,10 @@ const ActorSprites &ActorSpriteManager::getAll() const void ActorSpriteManager::logic() { for_actors - (*it)->logic(); + { + if (*it) + (*it)->logic(); + } if (mDeleteActors.empty()) return; @@ -580,6 +624,9 @@ void ActorSpriteManager::logic() for (it = mDeleteActors.begin(), it_end = mDeleteActors.end(); it != it_end; ++it) { + if (!*it) + continue; + if ((*it) && (*it)->getType() == Being::PLAYER) { Being *being = static_cast<Being*>(*it); @@ -693,7 +740,8 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, beingSorter.priorityBeings = &priorityMobsMap; if (ignoreAttackMobs.find("") != ignoreAttackMobs.end()) ignoreDefault = true; - std::map<std::string, int>::iterator itr = attackMobsMap.find(""); + std::map<std::string, int>::const_iterator + itr = attackMobsMap.find(""); if (itr != attackMobsMap.end()) defaultAttackIndex = (*itr).second; itr = priorityMobsMap.find(""); @@ -709,6 +757,9 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, i_end = mActors.end(); i != i_end; ++i) { + if (!*i) + continue; + if ((*i)->getType() == ActorSprite::FLOOR_ITEM || (*i)->getType() == ActorSprite::PORTAL) { @@ -791,6 +842,9 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, i_end = mActors.end(); i != i_end; ++i) { + if (!*i) + continue; + if ((*i)->getType() == ActorSprite::FLOOR_ITEM || (*i)->getType() == ActorSprite::PORTAL) { @@ -843,7 +897,7 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, int w2 = defaultPriorityIndex; if (closestBeing) { - std::map<std::string, int>::iterator it2 + std::map<std::string, int>::const_iterator it2 = priorityMobsMap.find(being->getName()); if (it2 != priorityMobsMap.end()) w2 = (*it2).second; @@ -868,7 +922,7 @@ Being *ActorSpriteManager::findNearestLivingBeing(Being *aroundBeing, { dist = d; closestBeing = being; - std::map<std::string, int>::iterator it1 + std::map<std::string, int>::const_iterator it1 = priorityMobsMap.find(being->getName()); if (it1 != priorityMobsMap.end()) index = (*it1).second; @@ -893,15 +947,15 @@ bool ActorSpriteManager::validateBeing(Being *aroundBeing, Being* being, || player_node->isReachable(being, maxCost)); } -void ActorSpriteManager::healTarget(LocalPlayer* player_node) +void ActorSpriteManager::healTarget() { if (!player_node) return; - heal(player_node, player_node->getTarget()); + heal(player_node->getTarget()); } -void ActorSpriteManager::heal(LocalPlayer* player_node, Being* target) +void ActorSpriteManager::heal(Being* target) { if (!player_node || !chatWindow || !player_node->isAlive() || !Net::getPlayerHandler()->canUseMagic()) @@ -1042,9 +1096,12 @@ void ActorSpriteManager::printBeingsToChat(ActorSprites beings, debugChatTab->chatLog("---------------------------------------"); debugChatTab->chatLog(header); - std::set<ActorSprite*>::iterator it; + std::set<ActorSprite*>::const_iterator it; for (it = beings.begin(); it != beings.end(); ++it) { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM) continue; @@ -1067,9 +1124,12 @@ void ActorSpriteManager::printBeingsToChat(std::vector<Being*> beings, debugChatTab->chatLog("---------------------------------------"); debugChatTab->chatLog(header); - std::vector<Being*>::iterator i; + std::vector<Being*>::const_iterator i; for (i = beings.begin(); i != beings.end(); ++i) { + if (!*i) + continue; + const Being *being = *i; debugChatTab->chatLog(being->getName() @@ -1087,6 +1147,9 @@ void ActorSpriteManager::getPlayerNames(std::vector<std::string> &names, for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -1109,6 +1172,9 @@ void ActorSpriteManager::getMobNames(std::vector<std::string> &names) for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -1125,6 +1191,9 @@ void ActorSpriteManager::updatePlayerNames() { for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -1142,6 +1211,9 @@ void ActorSpriteManager::updatePlayerColors() { for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -1158,6 +1230,9 @@ void ActorSpriteManager::updatePlayerGuild() { for_actors { + if (!*it) + continue; + if ((*it)->getType() == ActorSprite::FLOOR_ITEM || (*it)->getType() == ActorSprite::PORTAL) { @@ -1286,7 +1361,7 @@ void ActorSpriteManager::addIgnoreAttackMob(std::string name) void ActorSpriteManager::rebuildPriorityAttackMobs() { mPriorityAttackMobsMap.clear(); - std::list<std::string>::iterator i = mPriorityAttackMobs.begin(); + std::list<std::string>::const_iterator i = mPriorityAttackMobs.begin(); int cnt = 0; while (i != mPriorityAttackMobs.end()) { @@ -1299,7 +1374,7 @@ void ActorSpriteManager::rebuildPriorityAttackMobs() void ActorSpriteManager::rebuildAttackMobs() { mAttackMobsMap.clear(); - std::list<std::string>::iterator i = mAttackMobs.begin(); + std::list<std::string>::const_iterator i = mAttackMobs.begin(); int cnt = 0; while (i != mAttackMobs.end()) { @@ -1311,7 +1386,8 @@ void ActorSpriteManager::rebuildAttackMobs() int ActorSpriteManager::getPriorityAttackMobIndex(std::string name) { - std::map<std::string, int>::iterator i = mPriorityAttackMobsMap.find(name); + std::map<std::string, int>::const_iterator + i = mPriorityAttackMobsMap.find(name); if (i == mPriorityAttackMobsMap.end()) return -1; @@ -1320,7 +1396,7 @@ int ActorSpriteManager::getPriorityAttackMobIndex(std::string name) int ActorSpriteManager::getAttackMobIndex(std::string name) { - std::map<std::string, int>::iterator i = mAttackMobsMap.find(name); + std::map<std::string, int>::const_iterator i = mAttackMobsMap.find(name); if (i == mAttackMobsMap.end()) return -1; @@ -1332,7 +1408,7 @@ void ActorSpriteManager::loadAttackList() bool empty = false; std::list<std::string> list = unpackList( serverConfig.getValue("attackPriorityMobs", "")); - std::list<std::string>::iterator i = list.begin(); + std::list<std::string>::const_iterator i = list.begin(); while (i != list.end()) { if (*i == "") diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index 91503e1c3..bd2ae79fb 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -164,9 +164,9 @@ class ActorSpriteManager: public ConfigListener // void HealAllTargets(Being *aroundBeing, int maxdist, // Being::Type type) const; - void healTarget(LocalPlayer* player_node); + void healTarget(); - void heal(LocalPlayer* player_node, Being* target); + void heal(Being* target); void itenplz(); diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 27be02e36..fedcd8de2 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -154,8 +154,8 @@ bool AnimatedSprite::updateCurrentAnimation(unsigned int time) mFrameIndex = 0; mFrame = mAnimation->getFrame(mFrameIndex); - - if (mFrame->type == Frame::LABEL && !mFrame->nextAction.empty()) + if (!mFrame || (mFrame->type == Frame::LABEL + && !mFrame->nextAction.empty())) { fail = true; } diff --git a/src/auctionmanager.cpp b/src/auctionmanager.cpp index b360279ba..900d47e29 100644 --- a/src/auctionmanager.cpp +++ b/src/auctionmanager.cpp @@ -64,7 +64,8 @@ void AuctionManager::init() void AuctionManager::send(std::string msg) { - Net::getChatHandler()->privateMessage("AuctionBot", msg); + if (Net::getChatHandler()) + Net::getChatHandler()->privateMessage("AuctionBot", msg); } bool AuctionManager::processAuctionMessage(std::string msg) @@ -85,5 +86,6 @@ void AuctionManager::reload() void AuctionManager::sendMail(std::string mail) { - Net::getChatHandler()->privateMessage("AuctionBot", "!mail " + mail); + if (Net::getChatHandler()) + Net::getChatHandler()->privateMessage("AuctionBot", "!mail " + mail); } diff --git a/src/being.cpp b/src/being.cpp index b4c97f15d..532e6e2cf 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -275,6 +275,8 @@ Being::Being(int id, Type type, Uint16 subtype, Map *map): config.addListener("visiblenames", this); + mEnableReorderSprites = config.getBoolValue("enableReorderSprites"); + if (mType == NPC) setShowName(true); else @@ -393,21 +395,18 @@ void Being::setPosition(const Vector &pos) void Being::setDestination(int dstX, int dstY) { + // We can't calculate anything without a map anyway. + if (!mMap) + return; + #ifdef MANASERV_SUPPORT if (Net::getNetworkType() != ServerInfo::MANASERV) #endif { - if (mMap) - setPath(mMap->findPath(mX, mY, dstX, dstY, getWalkMask())); + setPath(mMap->findPath(mX, mY, dstX, dstY, getWalkMask())); return; } - // Manaserv's part: - - // We can't calculate anything without a map anyway. - if (!mMap) - return; - // Don't handle flawed destinations from server... if (dstX == 0 || dstY == 0) return; @@ -494,13 +493,13 @@ void Being::setSpeech(const std::string &text, int time) // Check for links std::string::size_type start = mSpeech.find('['); - std::string::size_type end = mSpeech.find(']', start); + std::string::size_type e = mSpeech.find(']', start); - while (start != std::string::npos && end != std::string::npos) + while (start != std::string::npos && e != std::string::npos) { // Catch multiple embeds and ignore them so it doesn't crash the client. while ((mSpeech.find('[', start + 1) != std::string::npos) && - (mSpeech.find('[', start + 1) < end)) + (mSpeech.find('[', start + 1) < e)) { start = mSpeech.find('[', start + 1); } @@ -508,7 +507,7 @@ void Being::setSpeech(const std::string &text, int time) std::string::size_type position = mSpeech.find('|'); if (mSpeech[start + 1] == '@' && mSpeech[start + 2] == '@') { - mSpeech.erase(end, 1); + mSpeech.erase(e, 1); mSpeech.erase(start, (position - start) + 1); } position = mSpeech.find('@'); @@ -520,7 +519,7 @@ void Being::setSpeech(const std::string &text, int time) } start = mSpeech.find('[', start + 1); - end = mSpeech.find(']', start); + e = mSpeech.find(']', start); } if (!mSpeech.empty()) @@ -715,6 +714,8 @@ void Being::handleAttack(Being *victim, int damage, if (dir) setDirection(dir); } + if (damage && victim->mType == PLAYER && victim->mAction == SIT) + victim->setAction(STAND); sound.playSfx(mInfo->getSound((damage > 0) ? SOUND_EVENT_HIT : SOUND_EVENT_MISS), mX, mY); @@ -761,7 +762,6 @@ void Being::setGuildName(const std::string &name) void Being::setGuildPos(const std::string &pos A_UNUSED) { -// logger->log("Got guild position \"%s\" for being %s(%i)", pos.c_str(), mName.c_str(), mId); } void Being::addGuild(Guild *guild) @@ -770,7 +770,6 @@ void Being::addGuild(Guild *guild) return; mGuilds[guild->getId()] = guild; -// guild->addMember(mId, 0, mName); if (this == player_node && socialWindow) socialWindow->addTab(guild); @@ -887,10 +886,10 @@ void Being::updateGuild() void Being::setGuild(Guild *guild) { - if (guild == getGuild()) + Guild *old = getGuild(); + if (guild == old) return; - Guild *old = getGuild(); clearGuilds(); addGuild(guild); @@ -1115,7 +1114,6 @@ Uint8 Being::calcDirection(int dstX, int dstY) const return dir; } -/** TODO: Used by eAthena only */ void Being::nextTile() { if (mPath.empty()) @@ -1131,7 +1129,7 @@ void Being::nextTile() if (dir) setDirection(static_cast<Uint8>(dir)); - if (!mMap->getWalk(pos.x, pos.y, getWalkMask())) + if (!mMap || !mMap->getWalk(pos.x, pos.y, getWalkMask())) { setAction(STAND); return; @@ -1273,7 +1271,7 @@ void Being::logic() case ATTACK: { - std::string particleEffect = ""; + std::string particleEffect(""); if (!mActionTime) break; @@ -1368,7 +1366,10 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) const int emotionIndex = mEmotion - 1; if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast()) - EmoteDB::getAnimation(emotionIndex)->draw(graphics, px, py); + { + if (EmoteDB::getAnimation(emotionIndex)) + EmoteDB::getAnimation(emotionIndex)->draw(graphics, px, py); + } } void Being::drawSpeech(int offsetX, int offsetY) @@ -1389,17 +1390,16 @@ void Being::drawSpeech(int offsetX, int offsetY) else if (mSpeechTime > 0 && (speech == NAME_IN_BUBBLE || speech == NO_NAME_IN_BUBBLE)) { - const bool showName = (speech == NAME_IN_BUBBLE); + const bool isShowName = (speech == NAME_IN_BUBBLE); delete mText; mText = 0; - mSpeechBubble->setCaption(showName ? mName : "", mTextColor); + mSpeechBubble->setCaption(isShowName ? mName : "", mTextColor); - mSpeechBubble->setText(mSpeech, showName); + mSpeechBubble->setText(mSpeech, isShowName); mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() / 2), - py - getHeight() - - (mSpeechBubble->getHeight())); + py - getHeight() - (mSpeechBubble->getHeight())); mSpeechBubble->setVisible(true); } else if (mSpeechTime > 0 && speech == TEXT_OVERHEAD) @@ -1408,11 +1408,9 @@ void Being::drawSpeech(int offsetX, int offsetY) if (!mText && userPalette) { - mText = new Text(mSpeech, - getPixelX(), getPixelY() - getHeight(), - gcn::Graphics::CENTER, - &userPalette->getColor(UserPalette::PARTICLE), - true); + mText = new Text(mSpeech, getPixelX(), getPixelY() - getHeight(), + gcn::Graphics::CENTER, &userPalette->getColor( + UserPalette::PARTICLE), true); } } else if (speech == NO_SPEECH) @@ -1740,7 +1738,7 @@ void Being::load() while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != paths.getStringValue("spriteErrorFile")) { - hairstyles++; + hairstyles ++; } mNumberOfHairstyles = hairstyles; @@ -1863,6 +1861,9 @@ BeingCacheEntry* Being::getCacheEntry(int id) for (std::list<BeingCacheEntry*>::iterator i = beingInfoCache.begin(); i != beingInfoCache.end(); ++i) { + if (!*i) + continue; + if (id == (*i)->getId()) { // Raise priority: move it to front @@ -1976,8 +1977,7 @@ bool Being::drawSpriteAt(Graphics *graphics, int x, int y) const graphics->setColor(userPalette-> getColorWithAlpha(UserPalette::PORTAL_HIGHLIGHT)); - graphics->fillRectangle(gcn::Rectangle( - x, y, 32, 32)); + graphics->fillRectangle(gcn::Rectangle(x, y, 32, 32)); if (mDrawHotKeys && !mName.empty()) { @@ -2008,7 +2008,7 @@ bool Being::drawSpriteAt(Graphics *graphics, int x, int y) const { // show hp bar here int maxHP = mMaxHP; - if (!maxHP) + if (!maxHP && mInfo) maxHP = mInfo->getMaxHP(); drawHpBar(graphics, maxHP, mHP, mDamageTaken, @@ -2153,28 +2153,28 @@ void Being::recalcSpritesOrder() if (spriteToItems) { - SpriteToItemMap::iterator it; + SpriteToItemMap::const_iterator itr; - for (it = spriteToItems->begin(); - it != spriteToItems->end(); ++it) + for (itr = spriteToItems->begin(); + itr != spriteToItems->end(); ++itr) { - int removeSprite = it->first; - std::map<int, int> &itemReplacer = it->second; + int remSprite = itr->first; + const std::map<int, int> &itemReplacer = itr->second; if (itemReplacer.empty()) { - mSpriteHide[removeSprite] = 1; + mSpriteHide[remSprite] = 1; } else { - std::map<int, int>::iterator repIt - = itemReplacer.find(mSpriteIDs[removeSprite]); + std::map<int, int>::const_iterator repIt + = itemReplacer.find(mSpriteIDs[remSprite]); if (repIt != itemReplacer.end()) { - mSpriteHide[removeSprite] = repIt->second; + mSpriteHide[remSprite] = repIt->second; if (repIt->second != 1) { - setSprite(removeSprite, repIt->second, - mSpriteColors[removeSprite], + setSprite(remSprite, repIt->second, + mSpriteColors[remSprite], 1, false, true); } } @@ -2186,7 +2186,8 @@ void Being::recalcSpritesOrder() if (info.mDrawBefore[dir] > 0) { int id2 = mSpriteIDs[info.mDrawBefore[dir]]; - std::map<int, int>::iterator orderIt = itemSlotRemap.find(id2); + std::map<int, int>::const_iterator + orderIt = itemSlotRemap.find(id2); if (orderIt != itemSlotRemap.end()) { // logger->log("found duplicate (before)"); @@ -2209,7 +2210,8 @@ void Being::recalcSpritesOrder() else if (info.mDrawAfter[dir] > 0) { int id2 = mSpriteIDs[info.mDrawAfter[dir]]; - std::map<int, int>::iterator orderIt = itemSlotRemap.find(id2); + std::map<int, int>::const_iterator + orderIt = itemSlotRemap.find(id2); if (orderIt != itemSlotRemap.end()) { // logger->log("found duplicate (after)"); @@ -2254,7 +2256,8 @@ void Being::recalcSpritesOrder() int idx1 = -1; // logger->log("item %d, id=%d", slot, id); int reorder = 0; - std::map<int, int>::iterator orderIt = itemSlotRemap.find(id); + std::map<int, int>::const_iterator + orderIt = itemSlotRemap.find(id); if (orderIt != itemSlotRemap.end()) reorder = orderIt->second; @@ -2445,7 +2448,7 @@ void Being::saveComment(const std::string &name, return; } dir += stringToHexPath(name); - logger->log("save to: %s", dir.c_str()); +// logger->log("save to: %s", dir.c_str()); ResourceManager *resman = ResourceManager::getInstance(); resman->saveTextFile(dir, "comment.txt", name + "\n" + comment); } diff --git a/src/client.cpp b/src/client.cpp index ab176c00b..d0348dec5 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -140,11 +140,11 @@ Configuration config; /**< XML file configuration reader */ Configuration serverConfig; /**< XML file server configuration reader */ Configuration branding; /**< XML branding information reader */ Configuration paths; /**< XML default paths information reader */ -Logger *logger; /**< Log object */ -ChatLogger *chatLogger; /**< Chat log object */ +Logger *logger = 0; /**< Log object */ +ChatLogger *chatLogger = 0; /**< Chat log object */ KeyboardConfig keyboard; -UserPalette *userPalette; -Graphics *graphics; +UserPalette *userPalette = 0; +Graphics *mainGraphics = 0; Sound sound; @@ -196,16 +196,16 @@ Uint32 nextSecond(Uint32 interval, void *param A_UNUSED) * @return the elapsed time in milliseconds * between two tick values. */ -int get_elapsed_time(int start_time) +int get_elapsed_time(int startTime) { - if (start_time <= tick_time) + if (startTime <= tick_time) { - return (tick_time - start_time) * MILLISECONDS_IN_A_TICK; + return (tick_time - startTime) * MILLISECONDS_IN_A_TICK; } else { - return (tick_time + (MAX_TICK_VALUE - start_time)) - * MILLISECONDS_IN_A_TICK; + return (tick_time + (MAX_TICK_VALUE - startTime)) + * MILLISECONDS_IN_A_TICK; } } @@ -247,6 +247,9 @@ Client::Client(const Options &options): mQuitDialog(0), mDesktop(0), mSetupButton(0), + mVideoButton(0), + mThemesButton(0), + mPerfomanceButton(0), mState(STATE_CHOOSE_SERVER), mOldState(STATE_START), mIcon(0), @@ -440,20 +443,20 @@ Client::Client(const Options &options): switch(useOpenGL) { case 0: - graphics = new Graphics; + mainGraphics = new Graphics; break; case 1: default: - graphics = new OpenGLGraphics; + mainGraphics = new OpenGLGraphics; break; case 2: - graphics = new OpenGL1Graphics; + mainGraphics = new OpenGL1Graphics; break; }; #else // Create the graphics context - graphics = new Graphics; + mainGraphics = new Graphics; #endif runCounters = config.getBoolValue("packetcounters"); @@ -465,7 +468,7 @@ Client::Client(const Options &options): const bool hwaccel = config.getBoolValue("hwaccel"); // Try to set the desired video mode - if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel)) + if (!mainGraphics->setVideoMode(width, height, bpp, fullscreen, hwaccel)) { logger->log(strprintf("Couldn't set %dx%dx%d video mode: %s", width, height, bpp, SDL_GetError())); @@ -482,7 +485,7 @@ Client::Client(const Options &options): config.setValueInt("screenwidth", oldWidth); config.setValueInt("screenheight", oldHeight); config.setValue("screen", oldFullscreen); - if (!graphics->setVideoMode(oldWidth, oldHeight, bpp, + if (!mainGraphics->setVideoMode(oldWidth, oldHeight, bpp, oldFullscreen, hwaccel)) { logger->error(strprintf("Couldn't restore %dx%dx%d " @@ -493,7 +496,7 @@ Client::Client(const Options &options): } // Initialize for drawing - graphics->_beginDraw(); + mainGraphics->_beginDraw(); Theme::selectSkin(); // Theme::prepareThemePath(); @@ -507,7 +510,7 @@ Client::Client(const Options &options): // Initialize the drop shortcuts. dropShortcut = new DropShortcut; - gui = new Gui(graphics); + gui = new Gui(mainGraphics); // Initialize sound engine try @@ -645,8 +648,8 @@ Client::~Client() logger->log1("Quitting3"); - delete graphics; - graphics = 0; + delete mainGraphics; + mainGraphics = 0; logger->log1("Quitting4"); @@ -760,7 +763,7 @@ int Client::exec() frame_count++; if (gui) gui->draw(); - graphics->updateScreen(); + mainGraphics->updateScreen(); // logger->log("active"); } else @@ -828,11 +831,30 @@ int Client::exec() mDesktop = new Desktop; top->add(mDesktop); + int x = top->getWidth(); mSetupButton = new Button(_("Setup"), "Setup", this); - mSetupButton->setPosition(top->getWidth() - - mSetupButton->getWidth() - 3, 3); + x -= mSetupButton->getWidth() + 3; + mSetupButton->setPosition(x, 3); top->add(mSetupButton); +#ifndef WIN32 + mPerfomanceButton = new Button( + _("Perfomance"), "Perfomance", this); + x -= mPerfomanceButton->getWidth() + 6; + mPerfomanceButton->setPosition(x, 3); + top->add(mPerfomanceButton); + + mVideoButton = new Button(_("Video"), "Video", this); + x -= mVideoButton->getWidth() + 6; + mVideoButton->setPosition(x, 3); + top->add(mVideoButton); + + mThemesButton = new Button(_("Themes"), "Themes", this); + x -= mThemesButton->getWidth() + 6; + mThemesButton->setPosition(x, 3); + top->add(mThemesButton); +#endif + int screenWidth = config.getIntValue("screenwidth"); int screenHeight = config.getIntValue("screenheight"); @@ -844,12 +866,10 @@ int Client::exec() if (mState != mOldState) { - { - Mana::Event event(EVENT_STATECHANGE); - event.setInt("oldState", mOldState); - event.setInt("newState", mState); - Mana::Event::trigger(CHANNEL_CLIENT, event); - } + Mana::Event evt(EVENT_STATECHANGE); + evt.setInt("oldState", mOldState); + evt.setInt("newState", mState); + Mana::Event::trigger(CHANNEL_CLIENT, evt); if (mOldState == STATE_GAME) { @@ -1046,10 +1066,10 @@ int Client::exec() if (!BeingInfo::unknown) BeingInfo::unknown = new BeingInfo; - Mana::Event event(EVENT_STATECHANGE); - event.setInt("newState", STATE_LOAD_DATA); - event.setInt("oldState", mOldState); - Mana::Event::trigger(CHANNEL_CLIENT, event); + Mana::Event evt2(EVENT_STATECHANGE); + evt2.setInt("newState", STATE_LOAD_DATA); + evt2.setInt("oldState", mOldState); + Mana::Event::trigger(CHANNEL_CLIENT, evt2); // Load XML databases ColorDB::load(); @@ -1140,6 +1160,12 @@ int Client::exec() delete mSetupButton; mSetupButton = 0; + delete mVideoButton; + mVideoButton = 0; + delete mThemesButton; + mThemesButton = 0; + delete mPerfomanceButton; + mPerfomanceButton = 0; delete mDesktop; mDesktop = 0; @@ -1190,8 +1216,7 @@ int Client::exec() case STATE_CHANGEPASSWORD_ATTEMPT: logger->log1("State: CHANGE PASSWORD ATTEMPT"); Net::getLoginHandler()->changePassword(loginData.username, - loginData.password, - loginData.newPassword); + loginData.password, loginData.newPassword); break; case STATE_CHANGEPASSWORD_SUCCESS: @@ -1332,16 +1357,28 @@ void Client::optionChanged(const std::string &name) void Client::action(const gcn::ActionEvent &event) { - Window *window = 0; + std::string tab; if (event.getId() == "Setup") - window = setupWindow; + tab = ""; + else if (event.getId() == "Video") + tab = "Video"; + else if (event.getId() == "Themes") + tab = "Theme"; + else if (event.getId() == "Perfomance") + tab = "Perfomance"; + else + return; - if (window) + if (setupWindow) { - window->setVisible(!window->isVisible()); - if (window->isVisible()) - window->requestMoveToTop(); + setupWindow->setVisible(!setupWindow->isVisible()); + if (setupWindow->isVisible()) + { + if (!tab.empty()) + setupWindow->activateTab(tab); + setupWindow->requestMoveToTop(); + } } } @@ -1458,35 +1495,6 @@ void Client::initHomeDir() logger->error(strprintf(_("%s doesn't exist and can't be created! " "Exiting."), mConfigDir.c_str())); } - - struct stat statbuf; - std::string newConfigFile = mConfigDir + "/config.xml"; - if (stat(newConfigFile.c_str(), &statbuf)) - { - std::string oldConfigFile = std::string(PHYSFS_getUserDir()) + - "/.mana/config.xml"; - if (mRootDir.empty() && !stat(oldConfigFile.c_str(), &statbuf) - && S_ISREG(statbuf.st_mode)) - { - std::ifstream oldConfig; - std::ofstream newConfig; - logger->log1("Copying old TMW settings."); - - oldConfig.open(oldConfigFile.c_str(), std::ios::binary); - newConfig.open(newConfigFile.c_str(), std::ios::binary); - - if (!oldConfig.is_open() || !newConfig.is_open()) - { - logger->log1("Unable to copy old settings."); - } - else - { - newConfig << oldConfig.rdbuf(); - newConfig.close(); - oldConfig.close(); - } - } - } } /** @@ -1731,27 +1739,27 @@ void Client::initScreenshotDir() } } -void Client::accountLogin(LoginData *loginData) +void Client::accountLogin(LoginData *data) { - if (!loginData) + if (!data) return; - logger->log("Username is %s", loginData->username.c_str()); + logger->log("Username is %s", data->username.c_str()); // Send login infos - if (loginData->registerLogin) - Net::getLoginHandler()->registerAccount(loginData); + if (data->registerLogin) + Net::getLoginHandler()->registerAccount(data); else - Net::getLoginHandler()->loginAccount(loginData); + Net::getLoginHandler()->loginAccount(data); // Clear the password, avoids auto login when returning to login - loginData->password = ""; + data->password = ""; // TODO This is not the best place to save the config, but at least better // than the login gui window - if (loginData->remember) - serverConfig.setValue("username", loginData->username); - serverConfig.setValue("remember", loginData->remember); + if (data->remember) + serverConfig.setValue("username", data->username); + serverConfig.setValue("remember", data->remember); } bool Client::copyFile(std::string &configPath, std::string &oldConfigPath) @@ -1803,7 +1811,7 @@ void Client::storeSafeParameters() int width; int height; std::string font; - std::string boldFont; + std::string bFont; std::string particleFont; std::string helpFont; std::string secureFont; @@ -1831,7 +1839,7 @@ void Client::storeSafeParameters() height = config.getIntValue("screenheight"); font = config.getStringValue("font"); - boldFont = config.getStringValue("boldFont"); + bFont = config.getStringValue("boldFont"); particleFont = config.getStringValue("particleFont"); helpFont = config.getStringValue("helpFont"); secureFont = config.getStringValue("secureFont"); @@ -1876,7 +1884,7 @@ void Client::storeSafeParameters() config.setValue("screenwidth", width); config.setValue("screenheight", height); config.setValue("font", font); - config.setValue("boldFont", boldFont); + config.setValue("boldFont", bFont); config.setValue("particleFont", particleFont); config.setValue("helpFont", helpFont); config.setValue("secureFont", secureFont); @@ -2189,8 +2197,8 @@ void Client::closeDialogs() bool Client::isTmw() { if (getServerName() == "server.themanaworld.org" - || Client::getServerName() == "themanaworld.org" - || Client::getServerName() == "81.161.192.4") + || getServerName() == "themanaworld.org" + || getServerName() == "81.161.192.4") { return true; } diff --git a/src/client.h b/src/client.h index 3edf12674..08bc1ecbf 100644 --- a/src/client.h +++ b/src/client.h @@ -78,7 +78,7 @@ extern LoginData loginData; /** * Returns elapsed time. (Warning: supposes the delay is always < 100 seconds) */ -int get_elapsed_time(int start_time); +int get_elapsed_time(int startTime); /** * All client states. @@ -291,7 +291,7 @@ private: bool copyFile(std::string &configPath, std::string &oldConfigPath); bool createConfig(std::string &configPath); - void accountLogin(LoginData *loginData); + void accountLogin(LoginData *data); void storeSafeParameters(); @@ -317,6 +317,9 @@ private: QuitDialog *mQuitDialog; Desktop *mDesktop; Button *mSetupButton; + Button *mVideoButton; + Button *mThemesButton; + Button *mPerfomanceButton; State mState; State mOldState; diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index dc962a17d..189485461 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -87,221 +87,113 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab) args = trim(args); if (command == "closeall") - { handleCloseAll(args, tab); - } else if (type == "ignoreall") - { handleIgnoreAll(args, tab); - } else if (type == "help") // Do help before tabs so they can't override it - { handleHelp(args, tab); - } else if (type == "announce") - { handleAnnounce(args, tab); - } else if (type == "where") - { handleWhere(args, tab); - } else if (type == "who") - { handleWho(args, tab); - } else if (type == "msg" || type == "whisper" || type == "w") - { handleMsg(args, tab); - } else if (type == "query" || type == "q") - { handleQuery(args, tab); - } else if (type == "ignore") - { handleIgnore(args, tab); - } else if (type == "unignore") - { handleUnignore(args, tab); - } else if (type == "friend" || type == "befriend") - { handleFriend(args, tab); - } else if (type == "disregard") - { handleDisregard(args, tab); - } else if (type == "neutral") - { handleNeutral(args, tab); - } else if (type == "erase") - { handleErase(args, tab); - } else if (type == "join") - { handleJoin(args, tab); - } else if (type == "list") - { handleListChannels(args, tab); - } else if (type == "clear") - { handleClear(args, tab); - } else if (type == "createparty") - { handleCreateParty(args, tab); - } else if (type == "createguild") - { handleCreateGuild(args, tab); - } else if (type == "party") - { handleParty(args, tab); - } else if (type == "me") - { handleMe(args, tab); - } else if (type == "toggle") - { handleToggle(args, tab); - } else if (type == "present") - { handlePresent(args, tab); - } else if (type == "quit") - { handleQuit(args, tab); - } else if (type == "all") - { handleShowAll(args, tab); - } else if (type == "move") - { handleMove(args, tab); - } else if (type == "target") - { handleTarget(args, tab); - } else if (type == "outfit") - { handleOutfit(args, tab); - } else if (type == "emote") - { handleEmote(args, tab); - } else if (type == "away") - { handleAway(args, tab); - } else if (type == "follow") - { handleFollow(args, tab); - } else if (type == "heal") - { handleHeal(args, tab); - } else if (type == "navigate") - { handleNavigate(args, tab); - } else if (type == "imitation") - { handleImitation(args, tab); - } else if (type == "mail") - { handleMail(args, tab); - } else if (type == "trade") - { handleTrade(args, tab); - } else if (type == "priceload") - { handlePriceLoad(args, tab); - } else if (type == "pricesave") - { handlePriceSave(args, tab); - } else if (type == "cacheinfo") - { handleCacheInfo(args, tab); - } else if (type == "disconnect") - { handleDisconnect(args, tab); - } else if (type == "undress") - { handleUndress(args, tab); - } else if (type == "attack") - { handleAttack(args, tab); - } else if (type == "dirs") - { handleDirs(args, tab); - } else if (type == "info") - { handleInfo(args, tab); - } else if (type == "wait") - { handleWait(args, tab); - } else if (type == "uptime") - { handleUptime(args, tab); - } else if (type == "addpriorityattack") - { handleAddPriorityAttack(args, tab); - } else if (type == "addattack") - { handleAddAttack(args, tab); - } else if (type == "removeattack" || type == "removeignoreattack") - { handleRemoveAttack(args, tab); - } else if (type == "addignoreattack") - { handleAddIgnoreAttack(args, tab); - } else if (type == "dump") - { handleDump(args, tab); - } else if (tab->handleCommand(type, args)) - { - // Nothing to do - } + ; else if (type == "hack") - { handleHack(args, tab); - } else - { tab->chatLog(_("Unknown command.")); - } } char CommandHandler::parseBoolean(const std::string &value) @@ -355,8 +247,8 @@ void CommandHandler::handleWho(const std::string &args A_UNUSED, void CommandHandler::handleMsg(const std::string &args, ChatTab *tab) { - std::string recvnick = ""; - std::string msg = ""; + std::string recvnick(""); + std::string msg(""); if (args.substr(0, 1) == "\"") { @@ -397,7 +289,7 @@ void CommandHandler::handleMsg(const std::string &args, ChatTab *tab) if (tempNick.compare(playerName) == 0 || args.empty()) return; - chatWindow->whisper(recvnick, msg, BY_PLAYER); + chatWindow->addWhisper(recvnick, msg, BY_PLAYER); } else tab->chatLog(_("Cannot send empty whispers!"), BY_SERVER); @@ -851,11 +743,11 @@ void CommandHandler::handleHeal(const std::string &args, ChatTab *tab A_UNUSED) Being *being = actorSpriteManager->findBeingByName( args, Being::PLAYER); if (being) - actorSpriteManager->heal(player_node, being); + actorSpriteManager->heal(being); } else { - actorSpriteManager->heal(player_node, player_node); + actorSpriteManager->heal(player_node); } } diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index c6921b2e8..ceab9a149 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -461,7 +461,7 @@ void CompoundSprite::updateImages() const bool CompoundSprite::updateFromCache() const { ImagesCache::iterator it = imagesCache.begin(); - ImagesCache::iterator it_end = imagesCache.end(); + ImagesCache::const_iterator it_end = imagesCache.end(); // static int hits = 0; // static int miss = 0; @@ -491,8 +491,8 @@ bool CompoundSprite::updateFromCache() const bool fail(false); SpriteConstIterator it1 = begin(); SpriteConstIterator it1_end = end(); - VectorPointers::iterator it2 = ic->data.begin(); - VectorPointers::iterator it2_end = ic->data.end(); + VectorPointers::const_iterator it2 = ic->data.begin(); + VectorPointers::const_iterator it2_end = ic->data.end(); for (; it1 != it1_end && it2 != it2_end; ++ it1, ++ it2) { diff --git a/src/compoundsprite.h b/src/compoundsprite.h index 2211cb80c..d1b019057 100644 --- a/src/compoundsprite.h +++ b/src/compoundsprite.h @@ -85,6 +85,9 @@ public: size_t size() const { return std::vector<Sprite*>::size(); } + bool empty() const + { return std::vector<Sprite*>::empty(); } + void addSprite(Sprite* sprite); void setSprite(int layer, Sprite* sprite); diff --git a/src/configuration.cpp b/src/configuration.cpp index 2524d6b93..a0167b9b0 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -194,11 +194,32 @@ int Configuration::getIntValue(const std::string &key) const { DefaultsData::const_iterator itdef = mDefaultsData->find(key); - if (itdef != mDefaultsData->end() && itdef->second - && itdef->second->getType() == Mana::VariableData::DATA_INT) + if (itdef != mDefaultsData->end() && itdef->second) { - defaultValue = (static_cast<Mana::IntData*>( - itdef->second))->getData(); + if (itdef->second->getType() == Mana::VariableData::DATA_INT) + { + defaultValue = (static_cast<Mana::IntData*>( + itdef->second))->getData(); + } + else if (itdef->second->getType() + == Mana::VariableData::DATA_STRING) + { + defaultValue = atoi((static_cast<Mana::StringData*>( + itdef->second))->getData().c_str()); + } + else if (itdef->second->getType() + == Mana::VariableData::DATA_BOOL) + { + if ((static_cast<Mana::BoolData*>( + itdef->second))->getData()) + { + defaultValue = 1; + } + else + { + defaultValue = 0; + } + } } else { @@ -241,7 +262,7 @@ int Configuration::resetIntValue(const std::string &key) std::string Configuration::getStringValue(const std::string &key) const { GETLOG(); - std::string defaultValue = ""; + std::string defaultValue(""); Options::const_iterator iter = mOptions.find(key); if (iter == mOptions.end()) { @@ -249,11 +270,33 @@ std::string Configuration::getStringValue(const std::string &key) const { DefaultsData::const_iterator itdef = mDefaultsData->find(key); - if (itdef != mDefaultsData->end() && itdef->second - && itdef->second->getType() == Mana::VariableData::DATA_STRING) + if (itdef != mDefaultsData->end() && itdef->second) { - defaultValue = (static_cast<Mana::StringData*>( - itdef->second))->getData(); + if (itdef->second->getType() + == Mana::VariableData::DATA_STRING) + { + defaultValue = (static_cast<Mana::StringData*>( + itdef->second))->getData(); + } + else if (itdef->second->getType() + == Mana::VariableData::DATA_BOOL) + { + if ((static_cast<Mana::BoolData*>( + itdef->second))->getData()) + { + defaultValue = "1"; + } + else + { + defaultValue = "0"; + } + } + else if (itdef->second->getType() + == Mana::VariableData::DATA_INT) + { + defaultValue = toString((static_cast<Mana::IntData*>( + itdef->second))->getData()); + } } else { @@ -312,11 +355,39 @@ bool Configuration::getBoolValue(const std::string &key) const { DefaultsData::const_iterator itdef = mDefaultsData->find(key); - if (itdef != mDefaultsData->end() && itdef->second - && itdef->second->getType() == Mana::VariableData::DATA_BOOL) + if (itdef != mDefaultsData->end() && itdef->second) { - defaultValue = (static_cast<Mana::BoolData*>( - itdef->second))->getData(); + if (itdef->second->getType() == Mana::VariableData::DATA_BOOL) + { + defaultValue = (static_cast<Mana::BoolData*>( + itdef->second))->getData(); + } + else if (itdef->second->getType() + == Mana::VariableData::DATA_INT) + { + if ((static_cast<Mana::IntData*>( + itdef->second))->getData() != 0) + { + defaultValue = true; + } + else + { + defaultValue = false; + } + } + else if (itdef->second->getType() + == Mana::VariableData::DATA_STRING) + { + if ((static_cast<Mana::StringData*>( + itdef->second))->getData() != "0") + { + defaultValue = true; + } + else + { + defaultValue = false; + } + } } else { @@ -514,4 +585,4 @@ void Configuration::removeListener( const std::string &key, ConfigListener *listener) { mListenerMap[key].remove(listener); -}
\ No newline at end of file +} diff --git a/src/configuration.h b/src/configuration.h index 2e694002d..1f03b7387 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -179,6 +179,9 @@ class ConfigurationObject ConfigurationList *list = &(mContainerOptions[name]); CONT container = empty; + if (!manager) + return container; + for (ConfigurationList::const_iterator it = list->begin(); it != list->end(); it++) { diff --git a/src/defaults.cpp b/src/defaults.cpp index 7c0d8148c..4a82a83a9 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -217,6 +217,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "enableReorderSprites", true); AddDEF(configData, "showip", false); AddDEF(configData, "seflMouseHeal", true); + AddDEF(configData, "enableLazyScrolling", true); return configData; } diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp index 48eed92bc..79f895490 100644 --- a/src/dropshortcut.cpp +++ b/src/dropshortcut.cpp @@ -150,6 +150,10 @@ void DropShortcut::dropItems(int cnt) bool DropShortcut::dropItem(int cnt) { + const Inventory *inv = PlayerInfo::getInventory(); + if (!inv) + return false; + int itemId = 0; unsigned char itemColor = 1; while (mLastDropIndex < DROP_SHORTCUT_ITEMS && itemId < 1) @@ -160,7 +164,7 @@ bool DropShortcut::dropItem(int cnt) } if (itemId > 0) { - Item *item = PlayerInfo::getInventory()->findItem(itemId, itemColor); + Item *item = inv->findItem(itemId, itemColor); if (item && item->getQuantity() > 0) { Net::getInventoryHandler()->dropItem(item, cnt); @@ -180,8 +184,7 @@ bool DropShortcut::dropItem(int cnt) } if (itemId > 0) { - Item *item = PlayerInfo::getInventory()->findItem( - itemId, itemColor); + Item *item = inv->findItem(itemId, itemColor); if (item && item->getQuantity() > 0) { Net::getInventoryHandler()->dropItem(item, cnt); @@ -210,6 +213,9 @@ void DropShortcut::setItemSelected(Item *item) void DropShortcut::setItem(int index) { + if (index < 0 || index >= DROP_SHORTCUT_ITEMS) + return; + mItems[index] = mItemSelected; mItemColors[index] = mItemColorSelected; save(); diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 36e7aac16..55bf692cd 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -67,7 +67,7 @@ bool EffectManager::trigger(int id, Being* being) return false; bool rValue = false; - for (std::vector<EffectDescription>::iterator i = mEffects.begin(); + for (std::vector<EffectDescription>::const_iterator i = mEffects.begin(); i != mEffects.end(); ++i) { if ((*i).id == id) @@ -92,7 +92,7 @@ bool EffectManager::trigger(int id, int x, int y) return false; bool rValue = false; - for (std::vector<EffectDescription>::iterator i = mEffects.begin(); + for (std::vector<EffectDescription>::const_iterator i = mEffects.begin(); i != mEffects.end(); ++i) { if ((*i).id == id) diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp index 00d7264a4..352c373b5 100644 --- a/src/emoteshortcut.cpp +++ b/src/emoteshortcut.cpp @@ -34,7 +34,6 @@ EmoteShortcut *emoteShortcut; EmoteShortcut::EmoteShortcut(): mEmoteSelected(0) { -// load(); for (int i = 0; i < SHORTCUT_EMOTES; i++) mEmotes[i] = 0; } @@ -57,16 +56,6 @@ void EmoteShortcut::load() j ++; } } - -/* - for (int i = 0; i < SHORTCUT_EMOTES; i++) - { - unsigned char emoteId = static_cast<unsigned char>( - serverConfig.getValue("emoteshortcut" + toString(i), i + 1)); - mEmotes[i] = emoteId; -// mEmotes[i] = i + 1; - } -*/ } void EmoteShortcut::save() diff --git a/src/event.cpp b/src/event.cpp index 8660f6b94..7eaf8aea6 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -56,7 +56,7 @@ int Event::getInt(const std::string &key) const throw (BadEvent) if (it == mData.end()) throw BAD_KEY; - if (it->second->getType() != VariableData::DATA_INT) + if (!it->second || it->second->getType() != VariableData::DATA_INT) throw BAD_VALUE; return static_cast<IntData *>(it->second)->getData(); @@ -78,7 +78,7 @@ const std::string &Event::getString(const std::string &key) if (it == mData.end()) throw BAD_KEY; - if (it->second->getType() != VariableData::DATA_STRING) + if (!it->second || it->second->getType() != VariableData::DATA_STRING) throw BAD_VALUE; return static_cast<StringData *>(it->second)->getData(); @@ -99,7 +99,7 @@ double Event::getFloat(const std::string &key) const throw (BadEvent) if (it == mData.end()) throw BAD_KEY; - if (it->second->getType() != VariableData::DATA_FLOAT) + if (!it->second || it->second->getType() != VariableData::DATA_FLOAT) throw BAD_VALUE; return static_cast<FloatData *>(it->second)->getData(); @@ -107,17 +107,18 @@ double Event::getFloat(const std::string &key) const throw (BadEvent) void Event::trigger(Channels channel, const Event &event) { - ListenMap::iterator it = mBindings.find(channel); + ListenMap::const_iterator it = mBindings.find(channel); // Make sure something is listening if (it == mBindings.end()) return; // Loop though all listeners - ListenerSet::iterator lit = it->second.begin(); + ListenerSet::const_iterator lit = it->second.begin(); while (lit != it->second.end()) { - (*lit)->event(channel, event); + if (*lit) + (*lit)->processEvent(channel, event); ++lit; } } diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 63112511e..9b11bdc9c 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -50,14 +50,13 @@ FloorItem::FloorItem(int id, mX(x), mY(y), mMap(map), -// mAlpha(1.0f), + mDropTime(cur_time), mAmount(amount), mPickupCount(0), mColor(color), - mShowMsg(true) + mShowMsg(true), + mHighlight(config.getBoolValue("floorItemsHighlight")) { - mDropTime = cur_time; - setMap(map); if (map) { @@ -99,9 +98,8 @@ bool FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const const int x = mX * mMap->getTileWidth() + offsetX; const int y = mY * mMap->getTileHeight() + offsetY; gcn::Font *font = 0; - const bool highl = config.getBoolValue("floorItemsHighlight"); - if (highl) + if (mHighlight) { int curTime = cur_time; font = gui->getFont(); @@ -118,7 +116,7 @@ bool FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const { graphics->setColor(gcn::Color(200, 80, 20, 80 + 10 * (curTime - mDropTime - 18))); - graphics->fillRectangle(gcn::Rectangle( + graphics->fillRectangle(gcn::Rectangle( x, y, dx, dy)); } else if (curTime > mDropTime && curTime < mDropTime + 20) @@ -133,7 +131,7 @@ bool FloorItem::draw(Graphics *graphics, int offsetX, int offsetY) const const bool res = ActorSprite::draw(graphics, offsetX, offsetY); - if (highl) + if (mHighlight) { if (font && mAmount > 1) { diff --git a/src/flooritem.h b/src/flooritem.h index dd1db1b35..fb929268a 100644 --- a/src/flooritem.h +++ b/src/flooritem.h @@ -100,6 +100,7 @@ class FloorItem : public ActorSprite unsigned mPickupCount; unsigned char mColor; bool mShowMsg; + bool mHighlight; }; #endif diff --git a/src/game.cpp b/src/game.cpp index 5a372a6bd..d82f13913 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -216,7 +216,7 @@ static void createGuiWindows() minimap = new Minimap; helpWindow = new HelpWindow; debugWindow = new DebugWindow; - itemShortcutWindow = new ShortcutWindow("ItemShortcut"); + itemShortcutWindow = new ShortcutWindow("ItemShortcut", "items.xml"); for (int f = 0; f < SHORTCUT_TABS; f ++) { itemShortcutWindow->addTab(toString(f + 1), @@ -230,13 +230,13 @@ static void createGuiWindows() } emoteShortcutWindow = new ShortcutWindow("EmoteShortcut", - new EmoteShortcutContainer); + new EmoteShortcutContainer, "emotes.xml"); outfitWindow = new OutfitWindow(); specialsWindow = new SpecialsWindow(); dropShortcutWindow = new ShortcutWindow("DropShortcut", - new DropShortcutContainer); + new DropShortcutContainer, "drops.xml"); - spellShortcutWindow = new ShortcutWindow("SpellShortcut", + spellShortcutWindow = new ShortcutWindow("SpellShortcut", "spells.xml", 265, 328); for (int f = 0; f < SPELL_SHORTCUT_TABS; f ++) { @@ -371,8 +371,8 @@ Game::Game(): // Create the viewport viewport = new Viewport; - viewport->setDimension(gcn::Rectangle(0, 0, graphics->mWidth, - graphics->mHeight)); + viewport->setDimension(gcn::Rectangle(0, 0, mainGraphics->mWidth, + mainGraphics->mHeight)); gcn::Container *top = static_cast<gcn::Container*>(gui->getTop()); top->add(viewport); @@ -383,12 +383,14 @@ Game::Game(): windowMenu = new WindowMenu; // mWindowMenu = windowMenu; - windowContainer->add(windowMenu); + if (windowContainer) + windowContainer->add(windowMenu); initEngines(); // Initialize beings - actorSpriteManager->setPlayer(player_node); + if (actorSpriteManager) + actorSpriteManager->setPlayer(player_node); /* * To prevent the server from sending data before the client @@ -459,14 +461,14 @@ static bool saveScreenshot() if (!config.getBoolValue("showip")) { - graphics->setSecure(true); + mainGraphics->setSecure(true); gui->draw(); - screenshot = graphics->getScreenshot(); - graphics->setSecure(false); + screenshot = mainGraphics->getScreenshot(); + mainGraphics->setSecure(false); } else { - screenshot = graphics->getScreenshot(); + screenshot = mainGraphics->getScreenshot(); } if (!screenshot) @@ -551,14 +553,12 @@ void Game::logic() // Handle network stuff if (!Net::getGameHandler()->isConnected()) { - if (Client::getState() == STATE_CHANGE_MAP) return; // Not a problem here if (Client::getState() != STATE_ERROR) errorMessage = _("The connection to the server was lost."); - if (!disconnectedDialog) { if (viewport) @@ -785,7 +785,8 @@ void Game::handleInput() && !chatWindow->isInputFocused() && !setupWindow->isVisible() && !player_node->getAwayMode() - && !NpcDialog::isAnyInputFocused()) + && !NpcDialog::isAnyInputFocused() + && !InventoryWindow::isAnyInputFocused()) { bool wearOutfit = false; bool copyOutfit = false; @@ -829,7 +830,7 @@ void Game::handleInput() } } - if (!chatWindow->isInputFocused() + if ((!chatWindow || !chatWindow->isInputFocused()) && !gui->getFocusHandler()->getModalFocused() && !player_node->getAwayMode()) { @@ -846,10 +847,14 @@ void Game::handleInput() else if (dialog) dialog->action(gcn::ActionEvent(NULL, "ok")); } - if (keyboard.isKeyActive(keyboard.KEY_TOGGLE_CHAT)) + if (chatWindow && keyboard.isKeyActive( + keyboard.KEY_TOGGLE_CHAT)) { - if (chatWindow->requestChatFocus()) - used = true; + if (!InventoryWindow::isAnyInputFocused()) + { + if (chatWindow->requestChatFocus()) + used = true; + } } if (dialog) { @@ -860,9 +865,10 @@ void Game::handleInput() } } - if ((!chatWindow->isInputFocused() && - !NpcDialog::isAnyInputFocused()) - || (event.key.keysym.mod & KMOD_ALT)) + if (chatWindow && ((!chatWindow->isInputFocused() && + !NpcDialog::isAnyInputFocused() && + !InventoryWindow::isAnyInputFocused()) + || (event.key.keysym.mod & KMOD_ALT))) { if (keyboard.isKeyActive(keyboard.KEY_PREV_CHAT_TAB)) { @@ -895,14 +901,14 @@ void Game::handleInput() switch (tKey) { case KeyboardConfig::KEY_SCROLL_CHAT_UP: - if (chatWindow->isVisible()) + if (chatWindow && chatWindow->isVisible()) { chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL); used = true; } break; case KeyboardConfig::KEY_SCROLL_CHAT_DOWN: - if (chatWindow->isVisible()) + if (chatWindow && chatWindow->isVisible()) { chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL); used = true; @@ -911,21 +917,23 @@ void Game::handleInput() break; case KeyboardConfig::KEY_WINDOW_HELP: // In-game Help - if (helpWindow->isVisible()) - helpWindow->setVisible(false); - else + if (helpWindow) { - helpWindow->loadHelp("index"); - helpWindow->requestMoveToTop(); + if (helpWindow->isVisible()) + { + helpWindow->setVisible(false); + } + else + { + helpWindow->loadHelp("index"); + helpWindow->requestMoveToTop(); + } } used = true; break; - - - // Quitting confirmation dialog case KeyboardConfig::KEY_QUIT: - if (!chatWindow->isInputFocused()) + if (!chatWindow || !chatWindow->isInputFocused()) { if (viewport && viewport->isPopupMenuVisible()) { @@ -943,30 +951,38 @@ void Game::handleInput() break; } - if (keyboard.isEnabled() && !chatWindow->isInputFocused() + if (keyboard.isEnabled() && (!chatWindow + || !chatWindow->isInputFocused()) && !gui->getFocusHandler()->getModalFocused() && mValidSpeed - && !setupWindow->isVisible() - && !player_node->getAwayMode() - && !NpcDialog::isAnyInputFocused()) + && (!setupWindow || !setupWindow->isVisible()) + && (!player_node || !player_node->getAwayMode()) + && !NpcDialog::isAnyInputFocused() + && !InventoryWindow::isAnyInputFocused()) { switch (tKey) { case KeyboardConfig::KEY_QUICK_DROP: - dropShortcut->dropFirst(); + if (dropShortcut) + dropShortcut->dropFirst(); break; case KeyboardConfig::KEY_QUICK_DROPN: - dropShortcut->dropItems(); + if (dropShortcut) + dropShortcut->dropItems(); break; case KeyboardConfig::KEY_SWITCH_QUICK_DROP: - if (!player_node->getDisableGameModifiers()) - player_node->changeQuickDropCounter(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changeQuickDropCounter(); + } break; case KeyboardConfig::KEY_MAGIC_INMA1: - actorSpriteManager->healTarget(player_node); + if (actorSpriteManager) + actorSpriteManager->healTarget(); setValidSpeed(); break; @@ -980,85 +996,125 @@ void Game::handleInput() break; case KeyboardConfig::KEY_CRAZY_MOVES: - player_node->crazyMove(); + if (player_node) + player_node->crazyMove(); break; case KeyboardConfig::KEY_CHANGE_CRAZY_MOVES_TYPE: - if (!player_node->getDisableGameModifiers()) - player_node->changeCrazyMoveType(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changeCrazyMoveType(); + } break; case KeyboardConfig::KEY_CHANGE_PICKUP_TYPE: - if (!player_node->getDisableGameModifiers()) - player_node->changePickUpType(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changePickUpType(); + } break; case KeyboardConfig::KEY_MOVE_TO_TARGET: - if (!keyboard.isKeyActive(keyboard.KEY_TARGET_ATTACK) - && !keyboard.isKeyActive(keyboard.KEY_ATTACK)) + if (player_node) { - player_node->moveToTarget(); + if (!keyboard.isKeyActive( + keyboard.KEY_TARGET_ATTACK) + && !keyboard.isKeyActive(keyboard.KEY_ATTACK)) + { + player_node->moveToTarget(); + } } break; case KeyboardConfig::KEY_MOVE_TO_HOME: - if (!keyboard.isKeyActive(keyboard.KEY_TARGET_ATTACK) - && !keyboard.isKeyActive(keyboard.KEY_ATTACK)) + if (player_node) { - player_node->moveToHome(); + if (!keyboard.isKeyActive( + keyboard.KEY_TARGET_ATTACK) + && !keyboard.isKeyActive(keyboard.KEY_ATTACK)) + { + player_node->moveToHome(); + } + setValidSpeed(); } - setValidSpeed(); break; case KeyboardConfig::KEY_SET_HOME: - player_node->setHome(); + if (player_node) + player_node->setHome(); break; case KeyboardConfig::KEY_INVERT_DIRECTION: - if (!player_node->getDisableGameModifiers()) - player_node->invertDirection(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->invertDirection(); + } break; case KeyboardConfig::KEY_CHANGE_ATTACK_WEAPON_TYPE: - if (!player_node->getDisableGameModifiers()) - player_node->changeAttackWeaponType(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changeAttackWeaponType(); + } break; case KeyboardConfig::KEY_CHANGE_ATTACK_TYPE: - if (!player_node->getDisableGameModifiers()) - player_node->changeAttackType(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changeAttackType(); + } break; case KeyboardConfig::KEY_CHANGE_FOLLOW_MODE: - if (!player_node->getDisableGameModifiers()) - player_node->changeFollowMode(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changeFollowMode(); + } break; case KeyboardConfig::KEY_CHANGE_IMITATION_MODE: - if (!player_node->getDisableGameModifiers()) - player_node->changeImitationMode(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changeImitationMode(); + } break; case KeyboardConfig::KEY_MAGIC_ATTACK: - player_node->magicAttack(); + if (player_node) + player_node->magicAttack(); break; case KeyboardConfig::KEY_SWITCH_MAGIC_ATTACK: - if (!player_node->getDisableGameModifiers()) - player_node->switchMagicAttack(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->switchMagicAttack(); + } break; case KeyboardConfig::KEY_CHANGE_MOVE_TO_TARGET: - if (!player_node->getDisableGameModifiers()) - player_node->changeMoveToTargetType(); + if (player_node) + { + if (!player_node->getDisableGameModifiers()) + player_node->changeMoveToTargetType(); + } break; case KeyboardConfig::KEY_COPY_EQUIPED_OUTFIT: - outfitWindow->copyFromEquiped(); + if (outfitWindow) + outfitWindow->copyFromEquiped(); break; case KeyboardConfig::KEY_DISABLE_GAME_MODIFIERS: - player_node->switchGameModifiers(); + if (player_node) + player_node->switchGameModifiers(); break; case KeyboardConfig::KEY_CHANGE_AUDIO: @@ -1066,14 +1122,20 @@ void Game::handleInput() break; case KeyboardConfig::KEY_AWAY: - player_node->changeAwayMode(); - setValidSpeed(); + if (player_node) + { + player_node->changeAwayMode(); + setValidSpeed(); + } break; case KeyboardConfig::KEY_CAMERA: - if (!player_node->getDisableGameModifiers()) - viewport->toggleCameraMode(); - setValidSpeed(); + if (player_node && viewport) + { + if (!player_node->getDisableGameModifiers()) + viewport->toggleCameraMode(); + setValidSpeed(); + } break; default: @@ -1082,14 +1144,15 @@ void Game::handleInput() } if (keyboard.isEnabled() - && !chatWindow->isInputFocused() + && (!chatWindow || !chatWindow->isInputFocused()) && !NpcDialog::isAnyInputFocused() - && !player_node->getAwayMode() - && !keyboard.isKeyActive(keyboard.KEY_TARGET)) + && (!player_node || !player_node->getAwayMode()) + && !keyboard.isKeyActive(keyboard.KEY_TARGET) + && !InventoryWindow::isAnyInputFocused()) { - const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); +// const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); - if (setupWindow->isVisible()) + if (setupWindow && setupWindow->isVisible()) { if (tKey == KeyboardConfig::KEY_WINDOW_SETUP) { @@ -1100,7 +1163,8 @@ void Game::handleInput() else { // Do not activate shortcuts if tradewindow is visible - if (itemShortcutWindow && !tradeWindow->isVisible() + if (itemShortcutWindow && tradeWindow + && !tradeWindow->isVisible() && !setupWindow->isVisible()) { int num = itemShortcutWindow->getTabIndex(); @@ -1124,34 +1188,51 @@ void Game::handleInput() switch (tKey) { case KeyboardConfig::KEY_PICKUP: - player_node->pickUpItems(); + if (player_node) + player_node->pickUpItems(); used = true; break; case KeyboardConfig::KEY_SIT: // Player sit action - if (keyboard.isKeyActive(keyboard.KEY_EMOTE)) - player_node->updateSit(); - else - player_node->toggleSit(); + if (player_node) + { + if (keyboard.isKeyActive(keyboard.KEY_EMOTE)) + player_node->updateSit(); + else + player_node->toggleSit(); + } used = true; break; case KeyboardConfig::KEY_HIDE_WINDOWS: // Hide certain windows - if (!chatWindow->isInputFocused()) + if (!chatWindow || !chatWindow->isInputFocused()) { - statusWindow->setVisible(false); - inventoryWindow->setVisible(false); - shopWindow->setVisible(false); - skillDialog->setVisible(false); - setupWindow->setVisible(false); - equipmentWindow->setVisible(false); - helpWindow->setVisible(false); - debugWindow->setVisible(false); - outfitWindow->setVisible(false); - dropShortcutWindow->setVisible(false); - spellShortcutWindow->setVisible(false); - botCheckerWindow->setVisible(false); - socialWindow->setVisible(false); + if (statusWindow) + statusWindow->setVisible(false); + if (inventoryWindow) + inventoryWindow->setVisible(false); + if (shopWindow) + shopWindow->setVisible(false); + if (skillDialog) + skillDialog->setVisible(false); + if (setupWindow) + setupWindow->setVisible(false); + if (equipmentWindow) + equipmentWindow->setVisible(false); + if (helpWindow) + helpWindow->setVisible(false); + if (debugWindow) + debugWindow->setVisible(false); + if (outfitWindow) + outfitWindow->setVisible(false); + if (dropShortcutWindow) + dropShortcutWindow->setVisible(false); + if (spellShortcutWindow) + spellShortcutWindow->setVisible(false); + if (botCheckerWindow) + botCheckerWindow->setVisible(false); + if (socialWindow) + socialWindow->setVisible(false); } break; case KeyboardConfig::KEY_WINDOW_STATUS: @@ -1215,7 +1296,8 @@ void Game::handleInput() break; case KeyboardConfig::KEY_PATHFIND: // Find path to mouse (debug purpose) - if (!player_node->getDisableGameModifiers()) + if (!player_node || !player_node-> + getDisableGameModifiers()) { if (viewport) viewport->toggleDebugPath(); @@ -1232,16 +1314,22 @@ void Game::handleInput() unsigned int deflt = player_relations.getDefault(); if (deflt & PlayerRelation::TRADE) { - localChatTab->chatLog( - _("Ignoring incoming trade requests"), - BY_SERVER); + if (localChatTab) + { + localChatTab->chatLog( + _("Ignoring incoming trade requests"), + BY_SERVER); + } deflt &= ~PlayerRelation::TRADE; } else { - localChatTab->chatLog( - _("Accepting incoming trade requests"), - BY_SERVER); + if (localChatTab) + { + localChatTab->chatLog( + _("Accepting incoming trade requests"), + BY_SERVER); + } deflt |= PlayerRelation::TRADE; } @@ -1277,10 +1365,11 @@ void Game::handleInput() if (event.active.gain) { // window restore Client::setIsMinimized(false); - if (player_node && !player_node->getAwayMode()) + if (!player_node && !player_node->getAwayMode()) { fpsLimit = config.getIntValue("fpslimit"); - player_node->setHalfAway(false); + if (player_node) + player_node->setHalfAway(false); } } else @@ -1302,7 +1391,7 @@ void Game::handleInput() if (event.active.state & SDL_APPMOUSEFOCUS) Client::setMouseFocused(event.active.gain); - if (player_node->getAwayMode()) + if (player_node && player_node->getAwayMode()) { if (Client::getInputFocused() || Client::getMouseFocused()) fpsLimit = config.getIntValue("fpslimit"); @@ -1310,6 +1399,11 @@ void Game::handleInput() fpsLimit = config.getIntValue("altfpslimit"); Client::setFramerate(fpsLimit); } + else + { + fpsLimit = config.getIntValue("fpslimit"); + Client::setFramerate(fpsLimit); + } } // Quit event else if (event.type == SDL_QUIT) @@ -1322,7 +1416,8 @@ void Game::handleInput() { try { - guiInput->pushInput(event); + if (guiInput) + guiInput->pushInput(event); } catch (const gcn::Exception &e) { @@ -1334,12 +1429,12 @@ void Game::handleInput() } // End while // If the user is configuring the keys then don't respond. - if (!keyboard.isEnabled() || player_node->getAwayMode()) + if (!player_node || !keyboard.isEnabled() || player_node->getAwayMode()) return; if (keyboard.isKeyActive(keyboard.KEY_WEAR_OUTFIT) || keyboard.isKeyActive(keyboard.KEY_COPY_OUTFIT) - || setupWindow->isVisible()) + || (setupWindow && setupWindow->isVisible())) { return; } @@ -1348,7 +1443,7 @@ void Game::handleInput() if (player_node->isAlive() && (!Being::isTalking() || keyboard.getKeyIndex(event.key.keysym.sym) == KeyboardConfig::KEY_TALK) - && !chatWindow->isInputFocused() && !quitDialog) + && chatWindow && !chatWindow->isInputFocused() && !quitDialog) { // Get the state of the keyboard keys keyboard.refreshActiveKeys(); @@ -1595,19 +1690,24 @@ void Game::changeMap(const std::string &mapPath) resetAdjustLevel(); // Clean up floor items, beings and particles - actorSpriteManager->clear(); + if (actorSpriteManager) + actorSpriteManager->clear(); // Close the popup menu on map change so that invalid options can't be // executed. - viewport->closePopupMenu(); - viewport->cleanHoverItems(); + if (viewport) + { + viewport->closePopupMenu(); + viewport->cleanHoverItems(); + } // Unset the map of the player so that its particles are cleared before // being deleted in the next step if (player_node) player_node->setMap(0); - particleEngine->clear(); + if (particleEngine) + particleEngine->clear(); mMapName = mapPath; @@ -1640,10 +1740,14 @@ void Game::changeMap(const std::string &mapPath) socialWindow->setMap(newMap); // Notify the minimap and actorSpriteManager about the map change - minimap->setMap(newMap); - actorSpriteManager->setMap(newMap); - particleEngine->setMap(newMap); - viewport->setMap(newMap); + if (minimap) + minimap->setMap(newMap); + if (actorSpriteManager) + actorSpriteManager->setMap(newMap); + if (particleEngine) + particleEngine->setMap(newMap); + if (viewport) + viewport->setMap(newMap); // Initialize map-based particle effects if (newMap) @@ -1676,7 +1780,7 @@ void Game::changeMap(const std::string &mapPath) void Game::updateHistory(SDL_Event &event) { - if (!player_node->getAttackType()) + if (!player_node || !player_node->getAttackType()) return; bool old = false; @@ -1731,7 +1835,7 @@ void Game::checkKeys() const int timeRange = 120; const int cntInTime = 130; - if (!player_node->getAttackType()) + if (!player_node || !player_node->getAttackType()) return; for (int f = 0; f < MAX_LASTKEYS; f ++) diff --git a/src/graphics.cpp b/src/graphics.cpp index abd7341e2..efa1058a6 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -97,13 +97,14 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel) logger->log1("Using video driver: unknown"); mDoubleBuffer = ((mTarget->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF); - logger->log("Double buffer mode: %s", - mDoubleBuffer ? "yes" : "no"); + logger->log("Double buffer mode: %s", mDoubleBuffer ? "yes" : "no"); if (mTarget->format) logger->log("Bits per pixel: %d", mTarget->format->BytesPerPixel); const SDL_VideoInfo *vi = SDL_GetVideoInfo(); + if (!vi) + return false; logger->log("Possible to create hardware surfaces: %s", ((vi->hw_available) ? "yes" : "no")); @@ -259,7 +260,8 @@ void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h) const int iw = image->mBounds.w; const int ih = image->mBounds.h; - if (iw == 0 || ih == 0) return; + if (iw == 0 || ih == 0) + return; for (int py = 0; py < h; py += ih) // Y position on pattern plane { @@ -346,8 +348,6 @@ void Graphics::drawImageRect(int x, int y, int w, int h, Image *bottom, Image *left, Image *center) { - pushClipArea(gcn::Rectangle(x, y, w, h)); - const bool drawMain = center && topLeft && topRight && bottomLeft && bottomRight; @@ -355,7 +355,7 @@ void Graphics::drawImageRect(int x, int y, int w, int h, if (center && drawMain) { drawImagePattern(center, - topLeft->getWidth(), topLeft->getHeight(), + topLeft->getWidth() + x, topLeft->getHeight() + y, w - topLeft->getWidth() - topRight->getWidth(), h - topLeft->getHeight() - bottomLeft->getHeight()); } @@ -364,18 +364,18 @@ void Graphics::drawImageRect(int x, int y, int w, int h, if (top && left && bottom && right) { drawImagePattern(top, - left->getWidth(), 0, + x + left->getWidth(), y, w - left->getWidth() - right->getWidth(), top->getHeight()); drawImagePattern(bottom, - left->getWidth(), h - bottom->getHeight(), + x + left->getWidth(), h - bottom->getHeight() + y, w - left->getWidth() - right->getWidth(), bottom->getHeight()); drawImagePattern(left, - 0, top->getHeight(), + x, y + top->getHeight(), left->getWidth(), h - top->getHeight() - bottom->getHeight()); drawImagePattern(right, - w - right->getWidth(), top->getHeight(), + x + w - right->getWidth(), top->getHeight() + y, right->getWidth(), h - top->getHeight() - bottom->getHeight()); } @@ -383,15 +383,13 @@ void Graphics::drawImageRect(int x, int y, int w, int h, // Draw the corners if (drawMain) { - drawImage(topLeft, 0, 0); - drawImage(topRight, w - topRight->getWidth(), 0); - drawImage(bottomLeft, 0, h - bottomLeft->getHeight()); + drawImage(topLeft, x, y); + drawImage(topRight, x + w - topRight->getWidth(), y); + drawImage(bottomLeft, x, h - bottomLeft->getHeight() + y); drawImage(bottomRight, - w - bottomRight->getWidth(), - h - bottomRight->getHeight()); + x + w - bottomRight->getWidth(), + y + h - bottomRight->getHeight()); } - - popClipArea(); } void Graphics::drawImageRect(int x, int y, int w, int h, @@ -453,7 +451,7 @@ void Graphics::drawImagePattern2(GraphicsVertexes *vert, Image *img) // here not checking input parameters std::vector<DoubleRect*> *arr = vert->getRectsSDL(); - std::vector<DoubleRect*>::iterator it; + std::vector<DoubleRect*>::const_iterator it; for (it = arr->begin(); it != arr->end(); ++it) SDL_LowerBlit(img->mSDLSurface, &(*it)->src, mTarget, &(*it)->dst); @@ -601,10 +599,11 @@ void Graphics::calcTile(ImageVertexes *vert, int x, int y) void Graphics::drawTile(ImageVertexes *vert) { + // vert and img must be != 0 Image *img = vert->image; DoubleRects *rects = &vert->sdl; - DoubleRects::iterator it = rects->begin(); - DoubleRects::iterator it_end = rects->end(); + DoubleRects::const_iterator it = rects->begin(); + DoubleRects::const_iterator it_end = rects->end(); while (it != it_end) { SDL_LowerBlit(img->mSDLSurface, &(*it)->src, mTarget, &(*it)->dst); @@ -668,8 +667,8 @@ bool Graphics::calcWindow(GraphicsVertexes* vert, imgRect.grid[4]); } -int Graphics::SDL_FakeUpperBlit (SDL_Surface *src, SDL_Rect *srcrect, - SDL_Surface *dst, SDL_Rect *dstrect) +int Graphics::SDL_FakeUpperBlit(SDL_Surface *src, SDL_Rect *srcrect, + SDL_Surface *dst, SDL_Rect *dstrect) { SDL_Rect fulldst; int srcx, srcy, w, h; diff --git a/src/graphics.h b/src/graphics.h index a2e25b5a8..f3e0bd05d 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -279,8 +279,8 @@ class Graphics : public gcn::SDLGraphics int mHeight; protected: - int SDL_FakeUpperBlit (SDL_Surface *src, SDL_Rect *srcrect, - SDL_Surface *dst, SDL_Rect *dstrect); + int SDL_FakeUpperBlit(SDL_Surface *src, SDL_Rect *srcrect, + SDL_Surface *dst, SDL_Rect *dstrect); int mBpp; bool mFullscreen; @@ -292,6 +292,6 @@ class Graphics : public gcn::SDLGraphics bool mSecure; }; -extern Graphics *graphics; +extern Graphics *mainGraphics; #endif diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index 8d7b26c1b..98df1ca9a 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -39,8 +39,8 @@ #include "debug.h" -BeingPopup::BeingPopup(): - Popup("BeingPopup") +BeingPopup::BeingPopup() : + Popup("BeingPopup", "beingpopup.xml") { // Being Name mBeingName = new Label("A"); diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index 7c0339ead..34293e59d 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -263,12 +263,13 @@ protected: BotCheckerWindow::BotCheckerWindow(): - Window(_("Bot Checker")), + Window(_("Bot Checker"), false, 0, "botchecker.xml"), mEnabled(false) { int w = 500; int h = 250; + setSaveVisible(true); mLastUpdateTime = 0; mNeedUpdate = false; diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp index 8c1ad62ce..8628afc6e 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/buydialog.cpp @@ -53,14 +53,14 @@ BuyDialog::DialogList BuyDialog::instances; BuyDialog::BuyDialog(int npcId): - Window(_("Buy")), + Window(_("Buy"), false, 0, "buy.xml"), mNpcId(npcId), mMoney(0), mAmountItems(0), mMaxItems(0), mNick("") { init(); } BuyDialog::BuyDialog(std::string nick): - Window(_("Buy")), + Window(_("Buy"), false, 0, "buy.xml"), mNpcId(-1), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(nick) { init(); @@ -111,18 +111,18 @@ void BuyDialog::init() mSlider->addActionListener(this); mShopItemList->addSelectionListener(this); - ContainerPlacer place; - place = getPlacer(0, 0); + ContainerPlacer placer; + placer = getPlacer(0, 0); - place(0, 0, mScrollArea, 8, 5).setPadding(3); - place(0, 5, mDecreaseButton); - place(1, 5, mSlider, 3); - place(4, 5, mIncreaseButton); - place(5, 5, mQuantityLabel, 2); - place(7, 5, mAddMaxButton); - place(0, 6, mMoneyLabel, 8); - place(6, 7, mBuyButton); - place(7, 7, mQuitButton); + placer(0, 0, mScrollArea, 8, 5).setPadding(3); + placer(0, 5, mDecreaseButton); + placer(1, 5, mSlider, 3); + placer(4, 5, mIncreaseButton); + placer(5, 5, mQuantityLabel, 2); + placer(7, 5, mAddMaxButton); + placer(0, 6, mMoneyLabel, 8); + placer(6, 7, mBuyButton); + placer(7, 7, mQuitButton); Layout &layout = getLayout(); layout.setRowHeight(0, Layout::AUTO_SET); @@ -317,8 +317,8 @@ void BuyDialog::setVisible(bool visible) void BuyDialog::closeAll() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp index 14dcb0bc1..e1063192a 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/buyselldialog.cpp @@ -37,7 +37,7 @@ BuySellDialog::DialogList BuySellDialog::instances; BuySellDialog::BuySellDialog(int npcId): - Window(_("Shop")), + Window(_("Shop"), false, 0, "buysell.xml"), mNpcId(npcId), mNick(""), mBuyButton(0) @@ -46,7 +46,7 @@ BuySellDialog::BuySellDialog(int npcId): } BuySellDialog::BuySellDialog(std::string nick): - Window(_("Shop")), + Window(_("Shop"), false, 0, "buysell.xml"), mNpcId(-1), mNick(nick), mBuyButton(0) @@ -129,8 +129,8 @@ void BuySellDialog::action(const gcn::ActionEvent &event) void BuySellDialog::closeAll() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index c24624bc2..384ebf07f 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -44,10 +44,10 @@ #include "debug.h" -ChangeEmailDialog::ChangeEmailDialog(LoginData *loginData): - Window(_("Change Email Address"), true), +ChangeEmailDialog::ChangeEmailDialog(LoginData *data): + Window(_("Change Email Address"), true, 0, "changeemail.xml"), mWrongDataNoticeListener(new WrongDataNoticeListener), - mLoginData(loginData) + mLoginData(data) { gcn::Label *accountLabel = new Label(strprintf(_("Account: %s"), mLoginData->username.c_str())); @@ -120,7 +120,7 @@ void ChangeEmailDialog::action(const gcn::ActionEvent &event) logger->log("ChangeEmailDialog::Email change, Username is %s", username.c_str()); - std::stringstream errorMessage; + std::stringstream errorMsg; int error = 0; unsigned int min = Net::getLoginHandler()->getMinPasswordLength(); @@ -129,21 +129,21 @@ void ChangeEmailDialog::action(const gcn::ActionEvent &event) if (newFirstEmail.length() < min) { // First email address too short - errorMessage << strprintf(_("The new email address needs to be at " - "least %d characters long."), min); + errorMsg << strprintf(_("The new email address needs to be at " + "least %d characters long."), min); error = 1; } else if (newFirstEmail.length() > max - 1 ) { // First email address too long - errorMessage << strprintf(_("The new email address needs to be " - "less than %d characters long."), max); + errorMsg << strprintf(_("The new email address needs to be " + "less than %d characters long."), max); error = 1; } else if (newFirstEmail != newSecondEmail) { // Second Pass mismatch - errorMessage << _("The email address entries mismatch."); + errorMsg << _("The email address entries mismatch."); error = 2; } @@ -154,7 +154,7 @@ void ChangeEmailDialog::action(const gcn::ActionEvent &event) else if (error == 2) mWrongDataNoticeListener->setTarget(this->mSecondEmailField); - OkDialog *dlg = new OkDialog(_("Error"), errorMessage.str()); + OkDialog *dlg = new OkDialog(_("Error"), errorMsg.str()); if (dlg) dlg->addActionListener(mWrongDataNoticeListener); } diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index e130a9074..fccb5cb1c 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -46,7 +46,7 @@ class ChangeEmailDialog : public Window, public gcn::ActionListener * * @see Window::Window */ - ChangeEmailDialog(LoginData *loginData); + ChangeEmailDialog(LoginData *data); /** * Destructor. diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index 30012ae52..7a67279b6 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -46,10 +46,10 @@ #include "debug.h" -ChangePasswordDialog::ChangePasswordDialog(LoginData *loginData): - Window(_("Change Password"), true), +ChangePasswordDialog::ChangePasswordDialog(LoginData *data): + Window(_("Change Password"), true, 0, "changepassword.xml"), mWrongDataNoticeListener(new WrongDataNoticeListener), - mLoginData(loginData) + mLoginData(data) { gcn::Label *accountLabel = new Label( strprintf(_("Account: %s"), mLoginData->username.c_str())); @@ -101,7 +101,7 @@ void ChangePasswordDialog::action(const gcn::ActionEvent &event) logger->log("ChangePasswordDialog::Password change, Username is %s", username.c_str()); - std::stringstream errorMessage; + std::stringstream errorMsg; int error = 0; unsigned int min = Net::getLoginHandler()->getMinPasswordLength(); @@ -111,27 +111,27 @@ void ChangePasswordDialog::action(const gcn::ActionEvent &event) if (oldPassword.empty()) { // No old password - errorMessage << _("Enter the old password first."); + errorMsg << _("Enter the old password first."); error = 1; } else if (newFirstPass.length() < min) { // First password too short - errorMessage << strprintf(_("The new password needs to be at least" - " %d characters long."), min); + errorMsg << strprintf(_("The new password needs to be at least" + " %d characters long."), min); error = 2; } else if (newFirstPass.length() > max - 1 ) { // First password too long - errorMessage << strprintf(_("The new password needs to be less " - "than %d characters long."), max); + errorMsg << strprintf(_("The new password needs to be less " + "than %d characters long."), max); error = 2; } else if (newFirstPass != newSecondPass) { // Second Pass mismatch - errorMessage << _("The new password entries mismatch."); + errorMsg << _("The new password entries mismatch."); error = 3; } @@ -144,7 +144,7 @@ void ChangePasswordDialog::action(const gcn::ActionEvent &event) else if (error == 3) mWrongDataNoticeListener->setTarget(this->mSecondPassField); - OkDialog *dlg = new OkDialog(_("Error"), errorMessage.str()); + OkDialog *dlg = new OkDialog(_("Error"), errorMsg.str()); dlg->addActionListener(mWrongDataNoticeListener); } else diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index 3b0626922..fca8b4946 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -46,7 +46,7 @@ class ChangePasswordDialog : public Window, public gcn::ActionListener * * @see Window::Window */ - ChangePasswordDialog(LoginData *loginData); + ChangePasswordDialog(LoginData *data); /** * Destructor diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index d1773e7f3..efe7e804f 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -55,7 +55,7 @@ #include "debug.h" CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot): - Window(_("Create Character"), true, parent), + Window(_("Create Character"), true, parent, "charcreate.xml"), mCharSelectDialog(parent), mRace(0), mSlot(slot) diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 1942ebaeb..00cae41e6 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -121,54 +121,54 @@ class CharacterDisplay : public Container Button *mDelete; }; -CharSelectDialog::CharSelectDialog(LoginData *loginData): - Window(_("Account and Character Management")), +CharSelectDialog::CharSelectDialog(LoginData *data): + Window(_("Account and Character Management"), false, 0, "char.xml"), mLocked(false), mUnregisterButton(0), mChangeEmailButton(0), mCharacterEntries(0), - mLoginData(loginData), + mLoginData(data), mCharHandler(Net::getCharHandler()), mDeleteDialog(0), mDeleteIndex(-1) { setCloseButton(false); - mAccountNameLabel = new Label(loginData->username); + mAccountNameLabel = new Label(mLoginData->username); mSwitchLoginButton = new Button(_("Switch Login"), "switch", this); mChangePasswordButton = new Button(_("Change Password"), "change_password", this); int optionalActions = Net::getLoginHandler()->supportedOptionalActions(); - ContainerPlacer place; - place = getPlacer(0, 0); + ContainerPlacer placer; + placer = getPlacer(0, 0); - place(0, 0, mAccountNameLabel, 2); - place(0, 1, mSwitchLoginButton); + placer(0, 0, mAccountNameLabel, 2); + placer(0, 1, mSwitchLoginButton); if (optionalActions & Net::LoginHandler::Unregister) { mUnregisterButton = new Button(_("Unregister"), "unregister", this); - place(3, 1, mUnregisterButton); + placer(3, 1, mUnregisterButton); } - place(0, 2, mChangePasswordButton); + placer(0, 2, mChangePasswordButton); if (optionalActions & Net::LoginHandler::ChangeEmail) { mChangeEmailButton = new Button(_("Change Email"), "change_email", this); - place(3, 2, mChangeEmailButton); + placer(3, 2, mChangeEmailButton); } - place = getPlacer(0, 1); + placer = getPlacer(0, 1); for (int i = 0; i < static_cast<int>(mLoginData->characterSlots); i++) { mCharacterEntries.push_back(new CharacterDisplay(this)); - place(i % SLOTS_PER_ROW, static_cast<int>(i) / SLOTS_PER_ROW, + placer(i % SLOTS_PER_ROW, static_cast<int>(i) / SLOTS_PER_ROW, mCharacterEntries[i]); } @@ -309,10 +309,12 @@ void CharSelectDialog::attemptCharacterSelect(int index) void CharSelectDialog::setCharacters(const Net::Characters &characters) { // Reset previous characters - std::vector<CharacterDisplay*>::iterator iter, iter_end; + std::vector<CharacterDisplay*>::const_iterator iter, iter_end; for (iter = mCharacterEntries.begin(), iter_end = mCharacterEntries.end(); iter != iter_end; ++iter) + { (*iter)->setCharacter(0); + } Net::Characters::const_iterator i, i_end = characters.end(); for (i = characters.begin(); i != i_end; ++i) @@ -371,7 +373,7 @@ void CharSelectDialog::setLocked(bool locked) } bool CharSelectDialog::selectByName(const std::string &name, - SelectAction action) + SelectAction selAction) { if (mLocked) return false; @@ -385,7 +387,7 @@ bool CharSelectDialog::selectByName(const std::string &name, { if (mCharacterEntries[i]) mCharacterEntries[i]->requestFocus(); - if (action == Choose) + if (selAction == Choose) attemptCharacterSelect(i); return true; } @@ -408,14 +410,14 @@ CharacterDisplay::CharacterDisplay(CharSelectDialog *charSelectDialog): mDelete = new Button(_("Delete"), "delete", charSelectDialog); LayoutHelper h(this); - ContainerPlacer place = h.getPlacer(0, 0); - - place(0, 0, mPlayerBox, 3, 5); - place(0, 5, mName, 3); - place(0, 6, mLevel, 3); - place(0, 7, mMoney, 3); - place(0, 8, mButton, 3); - place(0, 9, mDelete, 3); + ContainerPlacer placer = h.getPlacer(0, 0); + + placer(0, 0, mPlayerBox, 3, 5); + placer(0, 5, mName, 3); + placer(0, 6, mLevel, 3); + placer(0, 7, mMoney, 3); + placer(0, 8, mButton, 3); + placer(0, 9, mDelete, 3); update(); diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index bcbbb7679..0dfe90733 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -60,7 +60,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener, /** * Constructor. */ - CharSelectDialog(LoginData *loginData); + CharSelectDialog(LoginData *data); ~CharSelectDialog(); diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 784fb812a..82d6c2ff5 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -149,7 +149,7 @@ public: ChatWindow::ChatWindow(): - Window(_("Chat")), + Window(_("Chat"), false, 0, "chat.xml"), mTmpVisible(false), mChatHistoryIndex(0) { @@ -666,8 +666,8 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event) { int newX = std::max(0, getX() + event.getX() - mDragOffsetX); int newY = std::max(0, getY() + event.getY() - mDragOffsetY); - newX = std::min(graphics->mWidth - getWidth(), newX); - newY = std::min(graphics->mHeight - getHeight(), newY); + newX = std::min(mainGraphics->mWidth - getWidth(), newX); + newY = std::min(mainGraphics->mHeight - getHeight(), newY); setPosition(newX, newY); } } @@ -754,7 +754,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event) mChatHistoryIndex --; } - std::list<std::string>::iterator it; + std::list<std::string>::const_iterator it; unsigned int f = 0; for (it = tab->getRows().begin(); it != tab->getRows().end(); ++it, f++) @@ -788,7 +788,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event) mChatHistoryIndex = 0; } - std::list<std::string>::iterator it; + std::list<std::string>::const_iterator it; unsigned int f = 0; for (it = tab->getRows().begin(); it != tab->getRows().end(); ++it, f++) @@ -822,7 +822,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event) addInputText(Temp, false); } -void ChatWindow::event(Mana::Channels channel, const Mana::Event &event) +void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event) { if (channel == Mana::CHANNEL_NOTICES) { @@ -907,9 +907,9 @@ void ChatWindow::addItemText(const std::string &item) addInputText(text.str()); } -void ChatWindow::setVisible(bool isVisible) +void ChatWindow::setVisible(bool visible) { - Window::setVisible(isVisible); + Window::setVisible(visible); /* * For whatever reason, if setVisible is called, the mTmpVisible effect @@ -918,8 +918,8 @@ void ChatWindow::setVisible(bool isVisible) mTmpVisible = false; } -void ChatWindow::whisper(const std::string &nick, - const std::string &mes, Own own) +void ChatWindow::addWhisper(const std::string &nick, + const std::string &mes, Own own) { if (mes.empty() || !player_node) return; @@ -1074,7 +1074,7 @@ std::string ChatWindow::addColors(std::string &msg) return msg; } - std::string newMsg = ""; + std::string newMsg(""); int cMap[] = {1, 4, 5, 2, 3, 6, 7, 9, 0, 8}; // rainbow @@ -1179,7 +1179,7 @@ void ChatWindow::autoComplete() std::string ChatWindow::autoComplete(std::vector<std::string> &names, std::string partName) const { - std::vector<std::string>::iterator i = names.begin(); + std::vector<std::string>::const_iterator i = names.begin(); toLower(partName); std::string newName(""); @@ -1195,8 +1195,7 @@ std::string ChatWindow::autoComplete(std::vector<std::string> &names, { if (newName != "") { - toLower(newName); - newName = findSameSubstring(name, newName); + newName = findSameSubstringI(*i, newName); } else { @@ -1215,7 +1214,7 @@ std::string ChatWindow::autoComplete(std::string partName, History *words) if (!words) return ""; - Commands::iterator i = words->begin(); + Commands::const_iterator i = words->begin(); std::vector<std::string> nameList; while (i != words->end()) @@ -1243,7 +1242,7 @@ void ChatWindow::moveTabRight(ChatTab *tab) std::string ChatWindow::autoCompleteHistory(std::string partName) { - History::iterator i = mHistory.begin(); + History::const_iterator i = mHistory.begin(); std::vector<std::string> nameList; while (i != mHistory.end()) @@ -1344,7 +1343,7 @@ void ChatWindow::initTradeFilter() void ChatWindow::updateOnline(std::set<std::string> &onlinePlayers) { - TabMap::iterator iter; + TabMap::const_iterator iter; const Party *party = 0; const Guild *guild = 0; if (player_node) @@ -1429,7 +1428,7 @@ void ChatWindow::loadState() void ChatWindow::saveState() { int num = 0; - TabMap::iterator iter; + TabMap::const_iterator iter; for (iter = mWhispers.begin(); iter != mWhispers.end() && num < 50; ++iter) { if (!iter->second) diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 6e1d548a3..1ad468a3b 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -196,7 +196,7 @@ class ChatWindow : public Window, */ void mousePressed(gcn::MouseEvent &event); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); /** * Scrolls the chat window @@ -222,8 +222,8 @@ class ChatWindow : public Window, void doPresent(); - void whisper(const std::string &nick, const std::string &mes, - Own own = BY_OTHER); + void addWhisper(const std::string &nick, const std::string &mes, + Own own = BY_OTHER); ChatTab *addWhisperTab(const std::string &nick, bool switchTo = false); diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp index 661168dd9..f7f81bd2f 100644 --- a/src/gui/confirmdialog.cpp +++ b/src/gui/confirmdialog.cpp @@ -37,7 +37,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg, bool ignore, bool modal, Window *parent): - Window(title, modal, parent) + Window(title, modal, parent, "confirm.xml") { mTextBox = new TextBox; mTextBox->setEditable(false); diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index dc540a782..83e9791ef 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -51,7 +51,7 @@ #include "debug.h" DebugWindow::DebugWindow(): - Window(_("Debug")) + Window(_("Debug"), false, 0, "debug.xml") { setWindowName("Debug"); if (setupWindow) diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index d62417fc4..df15e6ebd 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -44,7 +44,7 @@ static const int minTip = 1; static const int maxTip = 14; DidYouKnowWindow::DidYouKnowWindow(): - Window(_("Did You Know?")) + Window(_("Did You Know?"), false, 0, "didyouknow.xml") { setMinWidth(300); setMinHeight(250); diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp index da1d98e81..84f4f6ddf 100644 --- a/src/gui/editdialog.cpp +++ b/src/gui/editdialog.cpp @@ -37,7 +37,7 @@ EditDialog::EditDialog(const std::string &title, const std::string &msg, std::string eventOk, int width, Window *parent, bool modal): - Window(title, modal, parent) + Window(title, modal, parent, "edit.xml") { mTextField = new TextField; mTextField->setText(msg); diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp index 348a97952..6d2bf7be2 100644 --- a/src/gui/emotepopup.cpp +++ b/src/gui/emotepopup.cpp @@ -48,7 +48,8 @@ const int EmotePopup::gridHeight = 36; // emote icon height + 4 static const int MAX_COLUMNS = 6; -EmotePopup::EmotePopup(): +EmotePopup::EmotePopup() : + Popup("EmotePopup", "emotepopup.xml"), mSelectedEmoteIndex(-1), mHoveredEmoteIndex(-1), mRowCount(1), diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 0375d096f..f423cddf0 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -58,7 +58,7 @@ static const int BOX_HEIGHT = 36; EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being, bool foring): - Window(_("Equipment")), + Window(_("Equipment"), false, 0, "equipment.xml"), mEquipment(equipment), mSelected(-1), mForing(foring) diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 7d38b1025..658d65769 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -394,7 +394,7 @@ void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button, = widget->_getMouseListeners(); // Send the event to all mouse listeners of the widget. - for (std::list<gcn::MouseListener*>::iterator + for (std::list<gcn::MouseListener*>::const_iterator it = mouseListeners.begin(); it != mouseListeners.end(); ++ it) { diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index b772ea36a..019baf503 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -40,7 +40,7 @@ #include "debug.h" HelpWindow::HelpWindow(): - Window(_("Help")) + Window(_("Help"), false, 0, "help.xml") { setMinWidth(300); setMinHeight(250); diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index d0454c4e1..cd02a6732 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -22,6 +22,7 @@ #include "gui/inventorywindow.h" +#include "configuration.h" #include "inventory.h" #include "item.h" #include "units.h" @@ -38,6 +39,7 @@ #include "gui/widgets/button.h" #include "gui/widgets/container.h" +#include "gui/widgets/dropdown.h" #include "gui/widgets/inventoryfilter.h" #include "gui/widgets/itemcontainer.h" #include "gui/widgets/label.h" @@ -45,6 +47,7 @@ #include "gui/widgets/progressbar.h" #include "gui/widgets/radiobutton.h" #include "gui/widgets/scrollarea.h" +#include "gui/widgets/textfield.h" #include "net/inventoryhandler.h" #include "net/net.h" @@ -62,10 +65,38 @@ #include "debug.h" +const char *SORT_NAME[6] = +{ + N_("default"), + N_("by name"), + N_("by id"), + N_("by weight"), + N_("by amount"), + N_("by type") +}; + +class SortListModel : public gcn::ListModel +{ +public: + virtual ~SortListModel() + { } + + virtual int getNumberOfElements() + { return 6; } + + virtual std::string getElementAt(int i) + { + if (i >= getNumberOfElements() || i < 0) + return _("???"); + + return gettext(SORT_NAME[i]); + } +}; + InventoryWindow::WindowList InventoryWindow::instances; InventoryWindow::InventoryWindow(Inventory *inventory): - Window(), + Window("Inventory", false, 0, "inventory.xml"), mInventory(inventory), mDropButton(0), mSplit(false) @@ -105,25 +136,23 @@ InventoryWindow::InventoryWindow(Inventory *inventory): mSlotsLabel = new Label(_("Slots:")); mSlotsBar = new ProgressBar(0.0f, 100, 20, Theme::PROG_INVY_SLOTS); - mFilter = new InventoryFilter("filter_" + getWindowName(), 20, 5); + int size = config.getIntValue("fontSize"); + mFilter = new InventoryFilter("filter_" + getWindowName(), size, 0); mFilter->addActionListener(this); mFilter->setActionEventId("tag_"); - mSorter = new InventoryFilter("sorter_" + getWindowName(), 20, 0); - mSorter->addActionListener(this); - mSorter->setActionEventId("sort_"); + mSortModel = new SortListModel(); + mSortDropDown = new DropDown(mSortModel, this, "sort"); + mSortDropDown->setSelected(0); mFilterLabel = new Label(_("Filter:")); mSorterLabel = new Label(_("Sort:")); + mNameFilter = new TextField("", true, this, "namefilter", true); std::vector<std::string> tags = ItemDB::getTags(); for (unsigned f = 0; f < tags.size(); f ++) mFilter->addButton(tags[f]); - mSorter->addButton(_("na"), "na"); - mSorter->addButton(_("az"), "az"); - mSorter->addButton(_("id"), "id"); - if (isMainInventory()) { std::string equip = _("Equip"); @@ -154,10 +183,11 @@ InventoryWindow::InventoryWindow(Inventory *inventory): place(4, 0, mSlotsLabel, 1).setPadding(3); place(5, 0, mSlotsBar, 2); place(7, 0, mSorterLabel, 1); - place(8, 0, mSorter, 3); + place(8, 0, mSortDropDown, 3); place(0, 1, mFilterLabel, 1).setPadding(3); - place(1, 1, mFilter, 10).setPadding(3); + place(1, 1, mFilter, 7).setPadding(3); + place(8, 1, mNameFilter, 3); place(0, 2, invenScroll, 11).setPadding(3); place(0, 3, mUseButton); @@ -176,12 +206,13 @@ InventoryWindow::InventoryWindow(Inventory *inventory): mCloseButton = new Button(_("Close"), "close", this); place(0, 0, mSlotsLabel).setPadding(3); - place(1, 0, mSlotsBar, 3); - place(4, 0, mSorterLabel, 1); - place(5, 0, mSorter, 2); + place(1, 0, mSlotsBar, 4); + place(5, 0, mSorterLabel, 1); + place(6, 0, mSortDropDown, 1); place(0, 1, mFilterLabel, 1).setPadding(3); - place(1, 1, mFilter, 6).setPadding(3); + place(1, 1, mFilter, 5).setPadding(3); + place(6, 1, mNameFilter, 1); place(0, 2, invenScroll, 7, 4); place(0, 6, mStoreButton); @@ -219,6 +250,8 @@ InventoryWindow::~InventoryWindow() mInventory->removeInventoyListener(this); if (!instances.empty()) instances.front()->updateDropButton(); + delete mSortModel; + mSortModel = 0; } void InventoryWindow::action(const gcn::ActionEvent &event) @@ -258,22 +291,21 @@ void InventoryWindow::action(const gcn::ActionEvent &event) ItemAmountWindow::showWindow(ItemAmountWindow::StoreAdd, this, item); } + else if (event.getId() == "sort") + { + mItems->setSortType(mSortDropDown->getSelected()); + return; + } + else if (event.getId() == "namefilter") + { + mItems->setName(mNameFilter->getText()); + mItems->updateMatrix(); + } else if (!event.getId().find("tag_") && mItems) { std::string tagName = event.getId().substr(4); mItems->setFilter(ItemDB::getTagId(tagName)); - } - else if (!event.getId().find("sort_") && mItems) - { - int sortType = 0; - std::string str = event.getId().substr(5).c_str(); - if (str == "na") - sortType = 0; - else if (str == "az") - sortType = 1; - else if (str == "id") - sortType = 2; - mItems->setSortType(sortType); + return; } Item *item = mItems->getSelectedItem(); @@ -330,17 +362,12 @@ void InventoryWindow::action(const gcn::ActionEvent &event) else if (event.getId() == "split") { ItemAmountWindow::showWindow(ItemAmountWindow::ItemSplit, this, item, - (item->getQuantity() - 1)); + (item->getQuantity() - 1)); } else if (event.getId() == "retrieve") { - Item *item = mItems->getSelectedItem(); - - if (!item) - return; - - ItemAmountWindow::showWindow(ItemAmountWindow::StoreRemove, this, - item); + ItemAmountWindow::showWindow(ItemAmountWindow::StoreRemove, + this, item); } } @@ -532,7 +559,6 @@ void InventoryWindow::updateButtons(Item *item) else mSplitButton->setEnabled(false); } - } void InventoryWindow::setSplitAllowed(bool allowed) @@ -553,8 +579,8 @@ void InventoryWindow::close() } } -void InventoryWindow::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void InventoryWindow::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) { @@ -622,3 +648,21 @@ void InventoryWindow::updateDropButton() mDropButton->setCaption(_("Drop")); } } + +bool InventoryWindow::isInputFocused() const +{ + return mNameFilter && mNameFilter->isFocused(); +} + +bool InventoryWindow::isAnyInputFocused() +{ + WindowList::const_iterator it = instances.begin(); + WindowList::const_iterator it_end = instances.end(); + + for (; it != it_end; ++it) + { + if ((*it) && (*it)->isInputFocused()) + return true; + } + return false; +} diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 503423ad3..c32fd8905 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -41,11 +41,14 @@ #define A_UNUSED #endif +class DropDown; class Item; class ItemContainer; class InventoryFilter; class ProgressBar; -class TextBox; +class SortListModel; +//class TextBox; +class TextField; /** * Inventory dialog. @@ -124,10 +127,14 @@ class InventoryWindow : public Window, void updateDropButton(); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); void updateButtons(Item *item = 0); + bool isInputFocused() const; + + static bool isAnyInputFocused(); + private: /** * Updates the weight bar. @@ -151,7 +158,9 @@ class InventoryWindow : public Window, ProgressBar *mWeightBar, *mSlotsBar; InventoryFilter *mFilter; - InventoryFilter *mSorter; + DropDown *mSortDropDown; + SortListModel *mSortModel; + TextField *mNameFilter; bool mSplit; }; diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp index 059f3d785..7c5b19415 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/itemamountwindow.cpp @@ -53,11 +53,11 @@ class ItemsModal : public gcn::ListModel public: ItemsModal() { - std::map<int, ItemInfo*> info = ItemDB::getItemInfos(); + std::map<int, ItemInfo*> items = ItemDB::getItemInfos(); std::list<std::string> tempStrings; for (std::map<int, ItemInfo*>::const_iterator - i = info.begin(), i_end = info.end(); + i = items.begin(), i_end = items.end(); i != i_end; ++i) { if (i->first < 0) @@ -137,7 +137,7 @@ void ItemAmountWindow::finish(Item *item, int amount, int price, Usage usage) ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item, int maxRange): - Window("", true, parent), + Window("", true, parent, "amount.xml"), mItemPriceTextField(0), mGPLabel(0), mItem(item), @@ -213,21 +213,21 @@ ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item, minusAmountButton->setWidth(plusAmountButton->getWidth()); // Set positions - ContainerPlacer place; - place = getPlacer(0, 0); + ContainerPlacer placer; + placer = getPlacer(0, 0); int n = 0; if (mUsage == ShopBuyAdd) { - place(0, n, mItemDropDown, 8); + placer(0, n, mItemDropDown, 8); n++; } - place(1, n, minusAmountButton); - place(2, n, mItemAmountTextField, 3); - place(5, n, plusAmountButton); - place(6, n, addAllButton); + placer(1, n, minusAmountButton); + placer(2, n, mItemAmountTextField, 3); + placer(5, n, plusAmountButton); + placer(6, n, addAllButton); - place(0, n, mItemIcon, 1, 3); - place(1, n + 1, mItemAmountSlide, 7); + placer(0, n, mItemIcon, 1, 3); + placer(1, n + 1, mItemAmountSlide, 7); if (mUsage == ShopBuyAdd || mUsage == ShopSellAdd) { @@ -236,19 +236,19 @@ ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item, minusPriceButton->adjustSize(); minusPriceButton->setWidth(plusPriceButton->getWidth()); - place(1, n + 2, minusPriceButton); - place(2, n + 2, mItemPriceTextField, 3); - place(5, n + 2, plusPriceButton); - place(6, n + 2, mGPLabel); + placer(1, n + 2, minusPriceButton); + placer(2, n + 2, mItemPriceTextField, 3); + placer(5, n + 2, plusPriceButton); + placer(6, n + 2, mGPLabel); - place(1, n + 3, mItemPriceSlide, 7); - place(4, n + 5, cancelButton); - place(5, n + 5, okButton); + placer(1, n + 3, mItemPriceSlide, 7); + placer(4, n + 5, cancelButton); + placer(5, n + 5, okButton); } else { - place(4, n + 2, cancelButton); - place(5, n + 2, okButton); + placer(4, n + 2, cancelButton); + placer(5, n + 2, okButton); } reflowLayout(225, 0); diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 4d401a627..b05d7fe28 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -49,7 +49,7 @@ #include "debug.h" ItemPopup::ItemPopup(): - Popup("ItemPopup"), + Popup("ItemPopup", "itempopup.xml"), mIcon(0), mLastName(""), mLastColor(1) diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index b9ce7c2a7..4bcab0a09 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -43,7 +43,8 @@ #include "debug.h" KillStats::KillStats(): - Window(_("Kill stats")), mKillCounter(0), mExpCounter(0), + Window(_("Kill stats"), false, 0, "killstats.xml"), + mKillCounter(0), mExpCounter(0), mKillTCounter(0), mExpTCounter(0), mKillTimer(0), m1minExpTime(0), m1minExpNum(0), m1minSpeed(0), m5minExpTime(0), m5minExpNum(0), m5minSpeed(0), @@ -55,6 +56,7 @@ KillStats::KillStats(): setWindowName("Kill stats"); setCloseButton(true); setResizable(true); + setSaveVisible(true); setStickyButtonLock(true); setDefaultSize(250, 250, 350, 300); @@ -436,8 +438,8 @@ void KillStats::validateJacko() } } -void KillStats::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void KillStats::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) { diff --git a/src/gui/killstats.h b/src/gui/killstats.h index ff2a8f010..8562e67a4 100644 --- a/src/gui/killstats.h +++ b/src/gui/killstats.h @@ -78,8 +78,8 @@ class KillStats : public Window, gcn::ActionListener, public Mana::Listener void addLog(std::string str); - void event(Mana::Channels channel A_UNUSED, - const Mana::Event &event); + void processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event); private: void validateJacko(); diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index ab5dc7401..136a01b37 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -50,8 +50,8 @@ static const int LOGIN_DIALOG_WIDTH = 300; static const int LOGIN_DIALOG_HEIGHT = 140; static const int FIELD_WIDTH = LOGIN_DIALOG_WIDTH - 70; -std::string LoginDialog::savedPassword = ""; -std::string LoginDialog::savedPasswordKey = ""; +std::string LoginDialog::savedPassword(""); +std::string LoginDialog::savedPasswordKey(""); const char *UPDATE_TYPE_TEXT[3] = @@ -81,10 +81,10 @@ public: } }; -LoginDialog::LoginDialog(LoginData *loginData, std::string serverName, +LoginDialog::LoginDialog(LoginData *data, std::string serverName, std::string *updateHost): - Window(_("Login")), - mLoginData(loginData), + Window(_("Login"), false, 0, "login.xml"), + mLoginData(data), mUpdateHost(updateHost), mServerName(serverName) { @@ -94,7 +94,7 @@ LoginDialog::LoginDialog(LoginData *loginData, std::string serverName, gcn::Label *userLabel = new Label(_("Name:")); gcn::Label *passLabel = new Label(_("Password:")); mCustomUpdateHost = new CheckBox(_("Custom update host"), - loginData->updateType & LoginData::Upd_Custom, this, "customhost"); + mLoginData->updateType & LoginData::Upd_Custom, this, "customhost"); mUpdateHostText = new TextField(serverConfig.getValue( "customUpdateHost", "")); @@ -112,7 +112,7 @@ LoginDialog::LoginDialog(LoginData *loginData, std::string serverName, mUpdateTypeModel = new UpdateTypeModel(); mUpdateTypeDropDown = new DropDown(mUpdateTypeModel); mUpdateTypeDropDown->setActionEventId("updatetype"); - mUpdateTypeDropDown->setSelected((loginData->updateType + mUpdateTypeDropDown->setSelected((mLoginData->updateType | LoginData::Upd_Custom) ^ LoginData::Upd_Custom); if (!mCustomUpdateHost->isSelected()) diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h index e464c6f24..0696bc680 100644 --- a/src/gui/logindialog.h +++ b/src/gui/logindialog.h @@ -49,7 +49,7 @@ class LoginDialog : public Window, public gcn::ActionListener, * * @see Window::Window */ - LoginDialog(LoginData *loginData, std::string serverName, + LoginDialog(LoginData *data, std::string serverName, std::string *updateHost); ~LoginDialog(); diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index c3a4417f6..e42f12336 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -47,11 +47,13 @@ bool Minimap::mShow = true; Minimap::Minimap(): - Window(_("Map")), + Window(_("Map"), false, 0, "map.xml"), mMapImage(0), mWidthProportion(0.5), mHeightProportion(0.5), - mCustomMapImage(false) + mCustomMapImage(false), + mMapOriginX(0), + mMapOriginY(0) { setWindowName("Minimap"); mShow = config.getValueBool(getWindowName() + "Show", true); @@ -87,7 +89,7 @@ Minimap::~Minimap() void Minimap::setMap(Map *map) { - std::string caption = ""; + std::string caption(""); std::string minimapName; if (map) @@ -215,8 +217,11 @@ void Minimap::draw(gcn::Graphics *graphics) graphics->pushClipArea(a); - int mapOriginX = 0; - int mapOriginY = 0; + if (!actorSpriteManager) + return; + + mMapOriginX = 0; + mMapOriginY = 0; if (mMapImage) { @@ -224,33 +229,30 @@ void Minimap::draw(gcn::Graphics *graphics) mMapImage->mBounds.h > a.height) { const Vector &p = player_node->getPosition(); - mapOriginX = ((a.width) / 2) - static_cast<int>((p.x + mMapOriginX = ((a.width) / 2) - static_cast<int>((p.x + viewport->getCameraRelativeX()) * static_cast<int>( mWidthProportion)) / 32; - mapOriginY = ((a.height) / 2) - static_cast<int>((p.y + mMapOriginY = ((a.height) / 2) - static_cast<int>((p.y + viewport->getCameraRelativeX()) * static_cast<int>( mHeightProportion)) / 32; const int minOriginX = a.width - mMapImage->mBounds.w; const int minOriginY = a.height - mMapImage->mBounds.h; - if (mapOriginX < minOriginX) - mapOriginX = minOriginX; - if (mapOriginY < minOriginY) - mapOriginY = minOriginY; - if (mapOriginX > 0) - mapOriginX = 0; - if (mapOriginY > 0) - mapOriginY = 0; + if (mMapOriginX < minOriginX) + mMapOriginX = minOriginX; + if (mMapOriginY < minOriginY) + mMapOriginY = minOriginY; + if (mMapOriginX > 0) + mMapOriginX = 0; + if (mMapOriginY > 0) + mMapOriginY = 0; } - graph->drawImage(mMapImage, mapOriginX, mapOriginY); + graph->drawImage(mMapImage, mMapOriginX, mMapOriginY); } - if (!actorSpriteManager) - return; - const ActorSprites &actors = actorSpriteManager->getAll(); for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end(); @@ -313,9 +315,9 @@ void Minimap::draw(gcn::Graphics *graphics) graphics->fillRectangle(gcn::Rectangle( static_cast<int>(pos.x * mWidthProportion) / 32 - + mapOriginX - offsetWidth, + + mMapOriginX - offsetWidth, static_cast<int>(pos.y * mHeightProportion) / 32 - + mapOriginY - offsetHeight, + + mMapOriginY - offsetHeight, dotSize, dotSize)); } @@ -351,9 +353,9 @@ void Minimap::draw(gcn::Graphics *graphics) graphics->fillRectangle(gcn::Rectangle( static_cast<int>(member->getX() - * mWidthProportion) + mapOriginX - offsetWidth, + * mWidthProportion) + mMapOriginX - offsetWidth, static_cast<int>(member->getY() - * mHeightProportion) + mapOriginY - offsetHeight, + * mHeightProportion) + mMapOriginY - offsetHeight, 2, 2)); } ++ it; @@ -367,10 +369,10 @@ void Minimap::draw(gcn::Graphics *graphics) int x = static_cast<int>((pos.x - (graph->getWidth() / 2) + viewport->getCameraRelativeX()) - * mWidthProportion) / 32 + mapOriginX; + * mWidthProportion) / 32 + mMapOriginX; int y = static_cast<int>((pos.y - (graph->getHeight() / 2) + viewport->getCameraRelativeY()) - * mHeightProportion) / 32 + mapOriginY; + * mHeightProportion) / 32 + mMapOriginY; const int w = static_cast<int>(static_cast<float>( graph->getWidth()) * mWidthProportion / 32); @@ -396,3 +398,22 @@ void Minimap::draw(gcn::Graphics *graphics) graphics->drawRectangle(gcn::Rectangle(x, y, w, h)); graphics->popClipArea(); } + +void Minimap::mouseReleased(gcn::MouseEvent &event) +{ + gcn::Window::mouseReleased(event); + + if (!player_node) + return; + + if (event.getButton() == gcn::MouseEvent::LEFT) + { + const gcn::Rectangle a = getChildrenArea(); + const int x = event.getX() - a.x; + const int y = event.getY() - a.y; + + player_node->navigateTo((x - mMapOriginX + mWidthProportion) + / mWidthProportion, (y - mMapOriginY + mHeightProportion) + / mHeightProportion); + } +} diff --git a/src/gui/minimap.h b/src/gui/minimap.h index 33e0f14ee..86996f51c 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -58,12 +58,16 @@ class Minimap : public Window */ void draw(gcn::Graphics *graphics); + void mouseReleased(gcn::MouseEvent &event); + private: Image *mMapImage; float mWidthProportion; float mHeightProportion; static bool mShow; bool mCustomMapImage; + int mMapOriginX; + int mMapOriginY; }; extern Minimap *minimap; diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index 08e3d0053..3e66f42cb 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -52,7 +52,7 @@ extern volatile int tick_time; MiniStatusWindow::MiniStatusWindow(): - Popup("MiniStatus") + Popup("MiniStatus", "ministatus.xml") { listen(Mana::CHANNEL_ATTRIBUTES); @@ -134,7 +134,7 @@ MiniStatusWindow::~MiniStatusWindow() if (inv) inv->removeInventoyListener(this); - std::vector <ProgressBar*>::iterator it, it_end; + std::vector <ProgressBar*>::const_iterator it, it_end; for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it) { ProgressBar *bar = *it; @@ -160,7 +160,7 @@ ProgressBar *MiniStatusWindow::createBar(float progress, int width, int height, void MiniStatusWindow::updateBars() { int x = 0; - std::vector <ProgressBar*>::iterator it, it_end; + std::vector <ProgressBar*>::const_iterator it, it_end; ProgressBar* lastBar = 0; for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it) safeRemove(*it); @@ -218,8 +218,8 @@ void MiniStatusWindow::drawIcons(Graphics *graphics) } } -void MiniStatusWindow::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void MiniStatusWindow::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) { @@ -400,12 +400,12 @@ void MiniStatusWindow::mouseExited(gcn::MouseEvent &event) mStatusPopup->hide(); } -void MiniStatusWindow::showBar(std::string name, bool isVisible) +void MiniStatusWindow::showBar(std::string name, bool visible) { ProgressBar *bar = mBarNames[name]; if (!bar) return; - bar->setVisible(isVisible); + bar->setVisible(visible); updateBars(); saveBars(); } @@ -439,7 +439,7 @@ void MiniStatusWindow::loadBars() void MiniStatusWindow::saveBars() { - std::vector <ProgressBar*>::iterator it, it_end; + std::vector <ProgressBar*>::const_iterator it, it_end; int i = 0; for (it = mBars.begin(), it_end = mBars.end(); it != it_end; ++it) diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index 19517326b..5e1b442dc 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -66,7 +66,7 @@ class MiniStatusWindow : public Popup, void drawIcons(Graphics *graphics); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); void updateStatus(); @@ -80,7 +80,7 @@ class MiniStatusWindow : public Popup, void mouseExited(gcn::MouseEvent &event); - void showBar(std::string name, bool isVisible); + void showBar(std::string name, bool visible); void updateBars(); diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 0db618d69..3e1ee46d8 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -56,7 +56,7 @@ NpcDialog::DialogList NpcDialog::instances; NpcDialog::NpcDialog(int npcId) - : Window(_("NPC")), + : Window(_("NPC"), false, 0, "npc.xml"), mNpcId(npcId), mLogInteraction(config.getBoolValue("logNpcInGui")), mDefaultInt(0), @@ -228,8 +228,8 @@ void NpcDialog::action(const gcn::ActionEvent &event) } else if (mActionState == NPC_ACTION_INPUT) { - std::string printText = ""; // Text that will get printed - // in the textbox + std::string printText(""); // Text that will get printed + // in the textbox if (mInputState == NPC_INPUT_LIST) { @@ -362,12 +362,12 @@ bool NpcDialog::isInputFocused() const bool NpcDialog::isAnyInputFocused() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { - if ((*it)->isInputFocused()) + if ((*it) && (*it)->isInputFocused()) return true; } @@ -430,12 +430,12 @@ NpcDialog *NpcDialog::getActive() if (instances.size() == 1) return instances.front(); - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { - if ((*it)->isFocused()) + if ((*it) && (*it)->isFocused()) return (*it); } @@ -444,8 +444,8 @@ NpcDialog *NpcDialog::getActive() void NpcDialog::closeAll() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) { diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index 0ba4e44b6..67fc57ba9 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -39,7 +39,7 @@ NpcPostDialog::DialogList NpcPostDialog::instances; NpcPostDialog::NpcPostDialog(int npcId): - Window(_("NPC")), + Window(_("NPC"), false, 0, "npcpost.xml"), mNpcId(npcId) { setContentSize(400, 180); @@ -123,8 +123,8 @@ void NpcPostDialog::setVisible(bool visible) void NpcPostDialog::closeAll() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) (*it)->close(); diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp index 122d7176f..5a6ee4846 100644 --- a/src/gui/okdialog.cpp +++ b/src/gui/okdialog.cpp @@ -35,7 +35,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg, bool modal, bool showCenter, Window *parent): - Window(title, modal, parent) + Window(title, modal, parent, "ok.xml") { mTextBox = new TextBox; mTextBox->setEditable(false); diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index 9601e3ca5..8e0791af1 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -57,7 +57,7 @@ float OutfitWindow::mAlpha = 1.0; OutfitWindow::OutfitWindow(): - Window(_("Outfits")), + Window(_("Outfits"), false, 0, "outfits.xml"), mBoxWidth(33), mBoxHeight(33), mGridWidth(4), diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index f5c074f6c..f3046264f 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -80,8 +80,8 @@ const gcn::Color& Palette::getColor(char c, bool &valid) void Palette::advanceGradients() { - Palettes::iterator it = mInstances.begin(); - Palettes::iterator it_end = mInstances.end(); + Palettes::const_iterator it = mInstances.begin(); + Palettes::const_iterator it_end = mInstances.end(); for (; it != it_end; ++it) (*it)->advanceGradient(); diff --git a/src/gui/palette.h b/src/gui/palette.h index 1cebe236f..645260280 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -182,13 +182,14 @@ class Palette int delay; int committedDelay; - void set(int type, gcn::Color& color, GradientType grad, int delay) + void set(int type0, gcn::Color& color0, GradientType grad0, + int delay0) { - ColorElem::type = type; - ColorElem::color = color; - ColorElem::testColor = color; - ColorElem::grad = grad; - ColorElem::delay = delay; + ColorElem::type = type0; + ColorElem::color = color0; + ColorElem::testColor = color0; + ColorElem::grad = grad0; + ColorElem::delay = delay0; ColorElem::gradientIndex = rand(); } diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 0eac0a4f9..16e3d9ec7 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -83,7 +83,7 @@ std::string tradePartnerName(""); PopupMenu::PopupMenu(): - Popup("PopupMenu"), + Popup("PopupMenu", "popupmenu.xml"), mBeingId(0), mFloorItem(0), mItem(0), @@ -129,60 +129,45 @@ void PopupMenu::showPopup(int x, int y, Being *being) { case ActorSprite::PLAYER: { - mBrowserBox->addRow(strprintf("@@trade|%s@@", _("Trade"))); - mBrowserBox->addRow(strprintf("@@attack|%s@@", _("Attack"))); - mBrowserBox->addRow(strprintf("@@whisper|%s@@", _("Whisper"))); + mBrowserBox->addRow("trade", _("Trade")); + mBrowserBox->addRow("attack", _("Attack")); + mBrowserBox->addRow("whisper", _("Whisper")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@heal|%s@@", _("Heal"))); + mBrowserBox->addRow("heal", _("Heal")); mBrowserBox->addRow("##3---"); switch (player_relations.getRelation(name)) { case PlayerRelation::NEUTRAL: - mBrowserBox->addRow(strprintf( - "@@friend|%s@@", _("Be friend"))); - mBrowserBox->addRow(strprintf( - "@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Ignore"))); - mBrowserBox->addRow(strprintf( - "@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("friend", _("Be friend")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::FRIEND: - mBrowserBox->addRow(strprintf( - "@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Ignore"))); - mBrowserBox->addRow(strprintf( - "@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::DISREGARDED: - mBrowserBox->addRow(strprintf( - "@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Completely ignore"))); - mBrowserBox->addRow(strprintf( - "@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("ignore", _("Completely ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::IGNORED: - mBrowserBox->addRow(strprintf( - "@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf( - "@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::ERASED: - mBrowserBox->addRow(strprintf( - "@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf( - "@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Completely ignore"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Completely ignore")); break; default: @@ -190,9 +175,8 @@ void PopupMenu::showPopup(int x, int y, Being *being) } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@follow|%s@@", _("Follow"))); - mBrowserBox->addRow(strprintf( - "@@imitation|%s@@", _("Imitation"))); + mBrowserBox->addRow("follow", _("Follow")); + mBrowserBox->addRow("imitation", _("Imitation")); if (player_node->isInParty()) { @@ -201,13 +185,12 @@ void PopupMenu::showPopup(int x, int y, Being *being) if (player_node->getParty()->getName() != being->getPartyName()) { - mBrowserBox->addRow(strprintf( - "@@party|%s@@", _("Invite to party"))); + mBrowserBox->addRow("party", _("Invite to party")); } else { - mBrowserBox->addRow(strprintf( - "@@kick party|%s@@", _("Kick from party"))); + mBrowserBox->addRow("kick party", + _("Kick from party")); } mBrowserBox->addRow("##3---"); } @@ -221,8 +204,8 @@ void PopupMenu::showPopup(int x, int y, Being *being) { if (guild1->getId() == guild2->getId()) { - mBrowserBox->addRow(strprintf( - "@@guild-kick|%s@@", _("Kick from guild"))); + mBrowserBox->addRow("guild-kick", + _("Kick from guild")); if (guild2->getServerGuild()) { mBrowserBox->addRow(strprintf( @@ -233,8 +216,8 @@ void PopupMenu::showPopup(int x, int y, Being *being) } else if (guild2->getMember(mNick)) { - mBrowserBox->addRow(strprintf( - "@@guild-kick|%s@@", _("Kick from guild"))); + mBrowserBox->addRow("guild-kick", + _("Kick from guild")); if (guild2->getServerGuild()) { mBrowserBox->addRow(strprintf( @@ -247,8 +230,7 @@ void PopupMenu::showPopup(int x, int y, Being *being) if (guild2->getServerGuild() || (guildManager && guildManager->havePower())) { - mBrowserBox->addRow(strprintf( - "@@guild|%s@@", _("Invite to guild"))); + mBrowserBox->addRow("guild", _("Invite to guild")); } } } @@ -256,16 +238,13 @@ void PopupMenu::showPopup(int x, int y, Being *being) if (player_node->isGM()) { mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf( - "@@admin-kick|%s@@", _("Kick player"))); + mBrowserBox->addRow("admin-kick", _("Kick player")); } - mBrowserBox->addRow(strprintf("@@nuke|%s@@", _("Nuke"))); - mBrowserBox->addRow(strprintf("@@move|%s@@", _("Move"))); - mBrowserBox->addRow(strprintf("@@items|%s@@", - _("Show Items"))); - mBrowserBox->addRow(strprintf("@@undress|%s@@", _("Undress"))); - mBrowserBox->addRow(strprintf( - "@@addcomment|%s@@", _("Add comment"))); + mBrowserBox->addRow("nuke", _("Nuke")); + mBrowserBox->addRow("move", _("Move")); + mBrowserBox->addRow("items", _("Show Items")); + mBrowserBox->addRow("undress", _("Undress")); + mBrowserBox->addRow("addcomment", _("Add comment")); if (player_relations.getDefault() & PlayerRelation::TRADE) { @@ -274,18 +253,14 @@ void PopupMenu::showPopup(int x, int y, Being *being) { if (being->isShopEnabled()) { - mBrowserBox->addRow(strprintf( - "@@buy|%s@@", _("Buy"))); - mBrowserBox->addRow(strprintf( - "@@sell|%s@@", _("Sell"))); + mBrowserBox->addRow("buy", _("Buy")); + mBrowserBox->addRow("sell", _("Sell")); } } else { - mBrowserBox->addRow(strprintf( - "@@buy|%s@@", _("Buy (?)"))); - mBrowserBox->addRow(strprintf( - "@@sell|%s@@", _("Sell (?)"))); + mBrowserBox->addRow("buy", _("Buy (?)")); + mBrowserBox->addRow("sell", _("Sell (?)")); } } } @@ -294,26 +269,23 @@ void PopupMenu::showPopup(int x, int y, Being *being) case ActorSprite::NPC: // NPCs can be talked to (single option, candidate for removal // unless more options would be added) - mBrowserBox->addRow(strprintf("@@talk|%s@@", _("Talk"))); - - mBrowserBox->addRow(strprintf("@@buy|%s@@", _("Buy"))); - mBrowserBox->addRow(strprintf("@@sell|%s@@", _("Sell"))); + mBrowserBox->addRow("talk", _("Talk")); + mBrowserBox->addRow("buy", _("Buy")); + mBrowserBox->addRow("sell", _("Sell")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@move|%s@@", _("Move"))); - mBrowserBox->addRow(strprintf("@@addcomment|%s@@", - _("Add comment"))); + mBrowserBox->addRow("move", _("Move")); + mBrowserBox->addRow("addcomment", _("Add comment")); break; case ActorSprite::MONSTER: { // Monsters can be attacked - mBrowserBox->addRow(strprintf("@@attack|%s@@", _("Attack"))); + mBrowserBox->addRow("attack", _("Attack")); if (player_node->isGM()) { mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf( - "@@admin-kick|%s@@", _("Kick"))); + mBrowserBox->addRow("admin-kick", _("Kick")); } if (config.getBoolValue("enableAttackFilter")) @@ -323,19 +295,17 @@ void PopupMenu::showPopup(int x, int y, Being *being) || actorSpriteManager->isInIgnoreAttackList(name) || actorSpriteManager->isInPriorityAttackList(name)) { - mBrowserBox->addRow(strprintf("@@remove attack|%s@@", - _("Remove from attack list"))); + mBrowserBox->addRow("remove attack", + _("Remove from attack list")); } else { - mBrowserBox->addRow(strprintf( - "@@add attack priority|%s@@", - _("Add to priority attack list"))); - mBrowserBox->addRow(strprintf( - "@@add attack|%s@@", _("Add to attack list"))); - mBrowserBox->addRow(strprintf( - "@@add attack ignore|%s@@", - _("Add to ignore list"))); + mBrowserBox->addRow("add attack priority", + _("Add to priority attack list")); + mBrowserBox->addRow("add attack", + _("Add to attack list")); + mBrowserBox->addRow("add attack ignore", + _("Add to ignore list")); } } } @@ -348,10 +318,10 @@ void PopupMenu::showPopup(int x, int y, Being *being) /* Other beings aren't interesting... */ return; } - mBrowserBox->addRow(strprintf("@@name|%s@@", _("Add name to chat"))); + mBrowserBox->addRow("name", _("Add name to chat")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -360,7 +330,7 @@ void PopupMenu::showPopup(int x, int y, std::vector<Being*> &beings) { mBrowserBox->clearRows(); mBrowserBox->addRow("Players"); - std::vector<Being*>::iterator it, it_end; + std::vector<Being*>::const_iterator it, it_end; for (it = beings.begin(), it_end = beings.end(); it != it_end; ++it) { Being *being = *it; @@ -372,7 +342,7 @@ void PopupMenu::showPopup(int x, int y, std::vector<Being*> &beings) } } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -390,42 +360,39 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mBrowserBox->addRow(name); - mBrowserBox->addRow(strprintf("@@whisper|%s@@", _("Whisper"))); + mBrowserBox->addRow("whisper", _("Whisper")); mBrowserBox->addRow("##3---"); switch (player_relations.getRelation(name)) { case PlayerRelation::NEUTRAL: - mBrowserBox->addRow(strprintf("@@friend|%s@@", _("Be friend"))); - mBrowserBox->addRow(strprintf( - "@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf("@@ignore|%s@@", _("Ignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("friend", _("Be friend")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::FRIEND: - mBrowserBox->addRow(strprintf("@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf("@@ignore|%s@@", _("Ignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::DISREGARDED: - mBrowserBox->addRow(strprintf("@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Completely ignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("ignore", _("Completely ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::IGNORED: - mBrowserBox->addRow(strprintf("@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::ERASED: - mBrowserBox->addRow(strprintf("@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf("@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Completely ignore"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Completely ignore")); break; default: @@ -433,18 +400,24 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@follow|%s@@", _("Follow"))); - mBrowserBox->addRow(strprintf("@@imitation|%s@@", _("Imitation"))); - mBrowserBox->addRow(strprintf("@@addcomment|%s@@", _("Add comment"))); + mBrowserBox->addRow("follow", _("Follow")); + mBrowserBox->addRow("imitation", _("Imitation")); + mBrowserBox->addRow("addcomment", _("Add comment")); - if (player_node->isInParty() && player_node->getParty()) + if (player_node->isInParty()) { - PartyMember *member = player_node->getParty()->getMember(mNick); - if (member) + Party *party = player_node->getParty(); + if (party) { - mBrowserBox->addRow(strprintf( - "@@kick party|%s@@", _("Kick from party"))); - mBrowserBox->addRow("##3---"); + PartyMember *member = party->getMember(mNick); + if (member) + { + mBrowserBox->addRow("kick party", _("Kick from party")); + mBrowserBox->addRow("##3---"); + PartyMember *o = party->getMember(player_node->getName()); + if (o && member->getMap() == o->getMap()) + mBrowserBox->addRow("move", _("Move")); + } } } @@ -456,8 +429,7 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) if (guild2->getServerGuild() || (guildManager && guildManager->havePower())) { - mBrowserBox->addRow(strprintf( - "@@guild-kick|%s@@", _("Kick from guild"))); + mBrowserBox->addRow("guild-kick", _("Kick from guild")); } if (guild2->getServerGuild()) { @@ -470,8 +442,7 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) if (guild2->getServerGuild() || (guildManager && guildManager->havePower())) { - mBrowserBox->addRow(strprintf( - "@@guild|%s@@", _("Invite to guild"))); + mBrowserBox->addRow("guild", _("Invite to guild")); } } } @@ -479,17 +450,16 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mBrowserBox->addRow("##3---"); if (player_relations.getDefault() & PlayerRelation::TRADE) { - mBrowserBox->addRow(strprintf("@@buy|%s@@", _("Buy (?)"))); - mBrowserBox->addRow(strprintf("@@sell|%s@@", _("Sell (?)"))); + mBrowserBox->addRow("buy", _("Buy (?)")); + mBrowserBox->addRow("sell", _("Sell (?)")); } - mBrowserBox->addRow(strprintf("@@name|%s@@", _("Add name to chat"))); + mBrowserBox->addRow("name", _("Add name to chat")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); - } void PopupMenu::showPopup(int x, int y, FloorItem *floorItem) @@ -509,11 +479,11 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem) name = info.getName(); mBrowserBox->addRow(name); - mBrowserBox->addRow(strprintf("@@pickup|%s@@", _("Pick up"))); - mBrowserBox->addRow(strprintf("@@chat|%s@@", _("Add to chat"))); + mBrowserBox->addRow("pickup", _("Pick up")); + mBrowserBox->addRow("chat", _("Add to chat")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -528,16 +498,16 @@ void PopupMenu::showPopup(int x, int y, MapItem *mapItem) mBrowserBox->clearRows(); mBrowserBox->addRow(_("Map Item")); - mBrowserBox->addRow(strprintf("@@rename map|%s@@", _("Rename"))); - mBrowserBox->addRow(strprintf("@@remove map|%s@@", _("Remove"))); + mBrowserBox->addRow("rename map", _("Rename")); + mBrowserBox->addRow("remove map", _("Remove")); if (player_node && player_node->isGM()) { mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@warp map|%s@@", _("Warp"))); + mBrowserBox->addRow("warp map", _("Warp")); } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -547,11 +517,10 @@ void PopupMenu::showOutfitsPopup(int x, int y) mBrowserBox->clearRows(); mBrowserBox->addRow(_("Outfits")); - mBrowserBox->addRow(strprintf( - "@@load old outfits|%s@@", _("Load old outfits"))); + mBrowserBox->addRow("load old outfits", _("Load old outfits")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -565,12 +534,11 @@ void PopupMenu::showSpellPopup(int x, int y, TextCommand *cmd) mSpell = cmd; mBrowserBox->addRow(_("Spells")); - mBrowserBox->addRow(strprintf( - "@@load old spells|%s@@", _("Load old spells"))); - mBrowserBox->addRow(strprintf("@@edit spell|%s@@", _("Edit spell"))); + mBrowserBox->addRow("load old spells", _("Load old spells")); + mBrowserBox->addRow("edit spell", _("Edit spell")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -585,46 +553,28 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mBrowserBox->clearRows(); if (tab->getType() == ChatTab::TAB_WHISPER) - mBrowserBox->addRow(strprintf("@@chat close|%s@@", _("Close"))); + mBrowserBox->addRow("chat close", _("Close")); - mBrowserBox->addRow(strprintf("@@chat clear|%s@@", _("Clear"))); + mBrowserBox->addRow("chat clear", _("Clear")); mBrowserBox->addRow("##3---"); if (tab->getAllowHighlight()) - { - mBrowserBox->addRow(strprintf("@@disable highlight|%s@@", - _("Disable highlight"))); - } + mBrowserBox->addRow("disable highlight", _("Disable highlight")); else - { - mBrowserBox->addRow(strprintf("@@enable highlight|%s@@", - _("Enable highlight"))); - } + mBrowserBox->addRow("enable highlight", _("Enable highlight")); if (tab->getRemoveNames()) - { - mBrowserBox->addRow(strprintf("@@dont remove name|%s@@", - _("Don't remove name"))); - } + mBrowserBox->addRow("dont remove name", _("Don't remove name")); else - { - mBrowserBox->addRow(strprintf("@@remove name|%s@@", - _("Remove name"))); - } + mBrowserBox->addRow("remove name", _("Remove name")); if (tab->getNoAway()) - { - mBrowserBox->addRow(strprintf("@@enable away|%s@@", - _("Enable away"))); - } + mBrowserBox->addRow("enable away", _("Enable away")); else - { - mBrowserBox->addRow(strprintf("@@disable away|%s@@", - _("Disable away"))); - } + mBrowserBox->addRow("disable away", _("Disable away")); mBrowserBox->addRow("##3---"); if (tab->getType() == ChatTab::TAB_PARTY) { - mBrowserBox->addRow(strprintf("@@leave party|%s@@", _("Leave"))); + mBrowserBox->addRow("leave party", _("Leave")); mBrowserBox->addRow("##3---"); } @@ -642,55 +592,44 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mNick = being->getName(); mType = being->getType(); - mBrowserBox->addRow(strprintf("@@trade|%s@@", _("Trade"))); - mBrowserBox->addRow(strprintf("@@attack|%s@@", _("Attack"))); + mBrowserBox->addRow("trade", _("Trade")); + mBrowserBox->addRow("attack", _("Attack")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@heal|%s@@", _("Heal"))); + mBrowserBox->addRow("heal", _("Heal")); mBrowserBox->addRow("##3---"); switch (player_relations.getRelation(name)) { case PlayerRelation::NEUTRAL: - mBrowserBox->addRow(strprintf( - "@@friend|%s@@", _("Be friend"))); - mBrowserBox->addRow(strprintf( - "@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Ignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("friend", _("Be friend")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::FRIEND: - mBrowserBox->addRow(strprintf( - "@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Ignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::DISREGARDED: - mBrowserBox->addRow(strprintf( - "@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Completely ignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("ignore", _("Completely ignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::IGNORED: - mBrowserBox->addRow(strprintf( - "@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf("@@erase|%s@@", _("Erase"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("erase", _("Erase")); break; case PlayerRelation::ERASED: - mBrowserBox->addRow(strprintf( - "@@unignore|%s@@", _("Unignore"))); - mBrowserBox->addRow(strprintf( - "@@disregard|%s@@", _("Disregard"))); - mBrowserBox->addRow(strprintf( - "@@ignore|%s@@", _("Completely ignore"))); + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Completely ignore")); break; default: @@ -698,13 +637,12 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@follow|%s@@", _("Follow"))); - mBrowserBox->addRow(strprintf("@@imitation|%s@@", _("Imitation"))); - mBrowserBox->addRow(strprintf("@@move|%s@@", _("Move"))); - mBrowserBox->addRow(strprintf("@@items|%s@@", _("Show Items"))); - mBrowserBox->addRow(strprintf("@@undress|%s@@", _("Undress"))); - mBrowserBox->addRow(strprintf( - "@@addcomment|%s@@", _("Add comment"))); + mBrowserBox->addRow("follow", _("Follow")); + mBrowserBox->addRow("imitation", _("Imitation")); + mBrowserBox->addRow("move", _("Move")); + mBrowserBox->addRow("items", _("Show Items")); + mBrowserBox->addRow("undress", _("Undress")); + mBrowserBox->addRow("addcomment", _("Add comment")); if (player_relations.getDefault() & PlayerRelation::TRADE) { @@ -713,17 +651,14 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) { if (being->isShopEnabled()) { - mBrowserBox->addRow(strprintf( - "@@buy|%s@@", _("Buy"))); - mBrowserBox->addRow(strprintf( - "@@sell|%s@@", _("Sell"))); + mBrowserBox->addRow("buy", _("Buy")); + mBrowserBox->addRow("sell", _("Sell")); } } else { - mBrowserBox->addRow(strprintf("@@buy|%s@@", _("Buy (?)"))); - mBrowserBox->addRow(strprintf( - "@@sell|%s@@", _("Sell (?)"))); + mBrowserBox->addRow("buy", _("Buy (?)")); + mBrowserBox->addRow("sell", _("Sell (?)")); } } @@ -735,13 +670,12 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) { if (!player_node->getParty()->isMember(wTab->getNick())) { - mBrowserBox->addRow( - strprintf("@@party|%s@@", _("Invite to party"))); + mBrowserBox->addRow("party", _("Invite to party")); } else { - mBrowserBox->addRow(strprintf( - "@@kick party|%s@@", _("Kick from party"))); + mBrowserBox->addRow("kick party", + _("Kick from party")); } mBrowserBox->addRow("##3---"); } @@ -772,8 +706,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) if (guild2->getServerGuild() || (guildManager && guildManager->havePower())) { - mBrowserBox->addRow(strprintf( - "@@guild|%s@@", _("Invite to guild"))); + mBrowserBox->addRow("guild", _("Invite to guild")); } } } @@ -782,12 +715,34 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) { mNick = name; mType = Being::PLAYER; - mBrowserBox->addRow(strprintf( - "@@addcomment|%s@@", _("Add comment"))); + + mBrowserBox->addRow("follow", _("Follow")); + mBrowserBox->addRow("imitation", _("Imitation")); + + if (player_node->isInParty()) + { + Party *party = player_node->getParty(); + if (party) + { + PartyMember *m = party->getMember(mNick); + if (m) + mBrowserBox->addRow("move", _("Move")); + } + } + mBrowserBox->addRow("items", _("Show Items")); + mBrowserBox->addRow("undress", _("Undress")); + mBrowserBox->addRow("addcomment", _("Add comment")); + + if (player_relations.getDefault() & PlayerRelation::TRADE) + { + mBrowserBox->addRow("##3---"); + mBrowserBox->addRow("buy", _("Buy (?)")); + mBrowserBox->addRow("sell", _("Sell (?)")); + } mBrowserBox->addRow("##3---"); } } - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -804,14 +759,14 @@ void PopupMenu::showChangePos(int x, int y) if (guild) { PositionsMap map = guild->getPositions(); - PositionsMap::iterator itr = map.begin(); - PositionsMap::iterator itr_end = map.end(); + PositionsMap::const_iterator itr = map.begin(); + PositionsMap::const_iterator itr_end = map.end(); for (; itr != itr_end; ++itr) { mBrowserBox->addRow(strprintf("@@guild-pos-%d|%s@@", itr->first, itr->second.c_str())); } - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -879,7 +834,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "heal" && being && being->getType() != Being::MONSTER) { - actorSpriteManager->heal(player_node, being); + actorSpriteManager->heal(being); } else if (link == "unignore" && being && being->getType() == ActorSprite::PLAYER) @@ -1054,10 +1009,26 @@ void PopupMenu::handleLink(const std::string &link, chatWindow->addInputText("/w \"" + mNick + "\" "); } } - else if (link == "move" && being) + else if (link == "move" && !mNick.empty()) { if (player_node) - player_node->navigateTo(being->getTileX(), being->getTileY()); + { + if (being) + { + player_node->navigateTo(being->getTileX(), being->getTileY()); + } + else if (player_node->isInParty()) + { + Party *party = player_node->getParty(); + if (party) + { + PartyMember *m = party->getMember(mNick); + PartyMember *o = party->getMember(player_node->getName()); + if (m && o && m->getMap() == o->getMap()) + player_node->navigateTo(m->getX(), m->getY()); + } + } + } } else if (link == "split" && mItem) { @@ -1591,12 +1562,15 @@ void PopupMenu::handleLink(const std::string &link, } else if (!link.compare(0, 7, "player_")) { - mBeingId = atoi(link.substr(7).c_str()); - Being *being = actorSpriteManager->findBeing(mBeingId); - if (being) + if (actorSpriteManager) { - showPopup(getX(), getY(), being); - return; + mBeingId = atoi(link.substr(7).c_str()); + being = actorSpriteManager->findBeing(mBeingId); + if (being) + { + showPopup(getX(), getY(), being); + return; + } } } else if (!link.compare(0, 12, "hide button_")) @@ -1653,36 +1627,25 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, { if (tradeWindow && tradeWindow->isVisible()) { - mBrowserBox->addRow(strprintf("@@addtrade|%s@@", - _("Add to trade"))); + mBrowserBox->addRow("addtrade", _("Add to trade")); if (cnt > 1) { if (cnt > 10) - { - mBrowserBox->addRow(strprintf("@@addtrade 10|%s@@", - _("Add to trade 10"))); - } - mBrowserBox->addRow(strprintf("@@addtrade half|%s@@", - _("Add to trade half"))); - mBrowserBox->addRow(strprintf("@@addtrade all|%s@@", - _("Add to trade all"))); + mBrowserBox->addRow("addtrade 10", _("Add to trade 10")); + mBrowserBox->addRow("addtrade half", _("Add to trade half")); + mBrowserBox->addRow("addtrade all", _("Add to trade all")); } mBrowserBox->addRow("##3---"); } if (InventoryWindow::isStorageActive()) { - mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); + mBrowserBox->addRow("store", _("Store")); if (cnt > 1) { if (cnt > 10) - { - mBrowserBox->addRow(strprintf("@@store 10|%s@@", - _("Store 10"))); - } - mBrowserBox->addRow(strprintf("@@store half|%s@@", - _("Store half"))); - mBrowserBox->addRow(strprintf("@@store all|%s@@", - _("Store all"))); + mBrowserBox->addRow("store 10", _("Store 10")); + mBrowserBox->addRow("store half", _("Store half")); + mBrowserBox->addRow("store all", _("Store all")); } mBrowserBox->addRow("##3---"); } @@ -1690,48 +1653,45 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, if (item->isEquipment()) { if (item->isEquipped()) - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Unequip"))); + mBrowserBox->addRow("use", _("Unequip")); else - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Equip"))); + mBrowserBox->addRow("use", _("Equip")); } else - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Use"))); + { + mBrowserBox->addRow("use", _("Use")); + } if (cnt > 1) { - mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop..."))); - mBrowserBox->addRow(strprintf("@@drop all|%s@@", _("Drop all"))); + mBrowserBox->addRow("drop", _("Drop...")); + mBrowserBox->addRow("drop all", _("Drop all")); } else { - mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop"))); + mBrowserBox->addRow("drop", _("Drop")); } if (Net::getInventoryHandler()->canSplit(item)) - mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split"))); + mBrowserBox->addRow("split", _("Split")); } // Assume in storage for now // TODO: make this whole system more flexible, if needed else { - mBrowserBox->addRow(strprintf("@@retrieve|%s@@", _("Retrieve"))); + mBrowserBox->addRow("retrieve", _("Retrieve")); if (cnt > 1) { if (cnt > 10) - { - mBrowserBox->addRow(strprintf("@@retrieve 10|%s@@", - _("Retrieve 10"))); - } - mBrowserBox->addRow(strprintf("@@retrieve half|%s@@", - _("Retrieve half"))); - mBrowserBox->addRow(strprintf("@@retrieve all|%s@@", - _("Retrieve all"))); + mBrowserBox->addRow("retrieve 10", _("Retrieve 10")); + mBrowserBox->addRow("retrieve half", _("Retrieve half")); + mBrowserBox->addRow("retrieve all", _("Retrieve all")); } } - mBrowserBox->addRow(strprintf("@@chat|%s@@", _("Add to chat"))); + mBrowserBox->addRow("chat", _("Add to chat")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -1754,12 +1714,12 @@ void PopupMenu::showItemPopup(int x, int y, int itemId, unsigned char color) mItemColor = color; mBrowserBox->clearRows(); - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Use"))); + mBrowserBox->addRow("use", _("Use")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@load old item shortcuts|%s@@", - _("Load old item shortcuts"))); + mBrowserBox->addRow("load old item shortcuts", + _("Load old item shortcuts")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -1785,37 +1745,37 @@ void PopupMenu::showItemPopup(int x, int y, Item *item) if (item->isEquipment()) { if (item->isEquipped()) - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Unequip"))); + mBrowserBox->addRow("use", _("Unequip")); else - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Equip"))); + mBrowserBox->addRow("use", _("Equip")); } else { - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Use"))); + mBrowserBox->addRow("use", _("Use")); } if (item->getQuantity() > 1) { - mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop..."))); - mBrowserBox->addRow(strprintf("@@drop all|%s@@", _("Drop all"))); + mBrowserBox->addRow("drop", _("Drop...")); + mBrowserBox->addRow("drop all", _("Drop all")); } else { - mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop"))); + mBrowserBox->addRow("drop", _("Drop")); } if (Net::getInventoryHandler()->canSplit(item)) - mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split"))); + mBrowserBox->addRow("split", _("Split")); if (InventoryWindow::isStorageActive()) - mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); - mBrowserBox->addRow(strprintf("@@chat|%s@@", _("Add to chat"))); + mBrowserBox->addRow("store", _("Store")); + mBrowserBox->addRow("chat", _("Add to chat")); mBrowserBox->addRow("##3---"); } - mBrowserBox->addRow(strprintf("@@load old item shortcuts|%s@@", - _("Load old item shortcuts"))); + mBrowserBox->addRow("load old item shortcuts", + _("Load old item shortcuts")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -1830,35 +1790,37 @@ void PopupMenu::showDropPopup(int x, int y, Item *item) if (item->isEquipment()) { if (item->isEquipped()) - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Unequip"))); + mBrowserBox->addRow("use", _("Unequip")); else - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Equip"))); + mBrowserBox->addRow("use", _("Equip")); } else - mBrowserBox->addRow(strprintf("@@use|%s@@", _("Use"))); + { + mBrowserBox->addRow("use", _("Use")); + } if (item->getQuantity() > 1) { - mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop..."))); - mBrowserBox->addRow(strprintf("@@drop all|%s@@", _("Drop all"))); + mBrowserBox->addRow("drop", _("Drop...")); + mBrowserBox->addRow("drop all", _("Drop all")); } else { - mBrowserBox->addRow(strprintf("@@drop|%s@@", _("Drop"))); + mBrowserBox->addRow("drop", _("Drop")); } if (Net::getInventoryHandler()->canSplit(item)) - mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split"))); + mBrowserBox->addRow("split", _("Split")); if (InventoryWindow::isStorageActive()) - mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); - mBrowserBox->addRow(strprintf("@@chat|%s@@", _("Add to chat"))); + mBrowserBox->addRow("store", _("Store")); + mBrowserBox->addRow("chat", _("Add to chat")); mBrowserBox->addRow("##3---"); } - mBrowserBox->addRow(strprintf("@@load old drop shortcuts|%s@@", - _("Load old drop shortcuts"))); + mBrowserBox->addRow("load old drop shortcuts", + _("Load old drop shortcuts")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -1872,7 +1834,7 @@ void PopupMenu::showPopup(int x, int y, Button *button) mBrowserBox->clearRows(); std::vector <gcn::Button*> names = windowMenu->getButtons(); - std::vector <gcn::Button*>::iterator it, it_end; + std::vector <gcn::Button*>::const_iterator it, it_end; for (it = names.begin(), it_end = names.end(); it != it_end; ++ it) { Button *btn = dynamic_cast<Button*>(*it); @@ -1893,7 +1855,7 @@ void PopupMenu::showPopup(int x, int y, Button *button) } } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -1907,7 +1869,7 @@ void PopupMenu::showPopup(int x, int y, ProgressBar *b) mBrowserBox->clearRows(); std::vector <ProgressBar*> bars = miniStatusWindow->getBars(); - std::vector <ProgressBar*>::iterator it, it_end; + std::vector <ProgressBar*>::const_iterator it, it_end; for (it = bars.begin(), it_end = bars.end(); it != it_end; ++it) { ProgressBar *bar = *it; @@ -1929,11 +1891,10 @@ void PopupMenu::showPopup(int x, int y, ProgressBar *b) } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@reset yellow|%s@@", - _("Reset yellow bar"))); + mBrowserBox->addRow("reset yellow", _("Reset yellow bar")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@bar to chat|%s@@", _("Copy to chat"))); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("bar to chat", _("Copy to chat")); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -1941,7 +1902,7 @@ void PopupMenu::showPopup(int x, int y, ProgressBar *b) void PopupMenu::showAttackMonsterPopup(int x, int y, std::string name, int type) { - if (!player_node) + if (!player_node || !actorSpriteManager) return; mNick = name; @@ -1960,17 +1921,10 @@ void PopupMenu::showAttackMonsterPopup(int x, int y, std::string name, int idx = actorSpriteManager->getAttackMobIndex(name); int size = actorSpriteManager->getAttackMobsSize(); if (idx > 0) - { - mBrowserBox->addRow(strprintf( - "@@attack moveup|%s@@", _("Move up"))); - } + mBrowserBox->addRow("attack moveup", _("Move up")); if (idx + 1 < size) - { - mBrowserBox->addRow(strprintf( - "@@attack movedown|%s@@", _("Move down"))); - } - mBrowserBox->addRow(strprintf( - "@@attack remove|%s@@", _("Remove"))); + mBrowserBox->addRow("attack movedown", _("Move down")); + mBrowserBox->addRow("attack remove", _("Remove")); break; } case MapItem::PRIORITY: @@ -1978,29 +1932,21 @@ void PopupMenu::showAttackMonsterPopup(int x, int y, std::string name, int idx = actorSpriteManager->getPriorityAttackMobIndex(name); int size = actorSpriteManager->getPriorityAttackMobsSize(); if (idx > 0) - { - mBrowserBox->addRow(strprintf( - "@@priority moveup|%s@@", _("Move up"))); - } + mBrowserBox->addRow("priority moveup", _("Move up")); if (idx + 1 < size) - { - mBrowserBox->addRow(strprintf( - "@@priority movedown|%s@@", _("Move down"))); - } - mBrowserBox->addRow(strprintf( - "@@attack remove|%s@@", _("Remove"))); + mBrowserBox->addRow("priority movedown", _("Move down")); + mBrowserBox->addRow("attack remove", _("Remove")); break; } case MapItem::IGNORE_: - mBrowserBox->addRow(strprintf( - "@@attack remove|%s@@", _("Remove"))); + mBrowserBox->addRow("attack remove", _("Remove")); break; default: break; } mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); } @@ -2017,10 +1963,10 @@ void PopupMenu::showUndressPopup(int x, int y, Being *being, Item *item) mBrowserBox->clearRows(); - mBrowserBox->addRow(strprintf("@@undress item|%s@@", _("Undress"))); + mBrowserBox->addRow("undress item", _("Undress")); mBrowserBox->addRow("##3---"); - mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel"))); + mBrowserBox->addRow("cancel", _("Cancel")); showPopup(x, y); @@ -2029,10 +1975,10 @@ void PopupMenu::showUndressPopup(int x, int y, Being *being, Item *item) void PopupMenu::showPopup(int x, int y) { setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8); - if (graphics->mWidth < (x + getWidth() + 5)) - x = graphics->mWidth - getWidth(); - if (graphics->mHeight < (y + getHeight() + 5)) - y = graphics->mHeight - getHeight(); + if (mainGraphics->mWidth < (x + getWidth() + 5)) + x = mainGraphics->mWidth - getWidth(); + if (mainGraphics->mHeight < (y + getHeight() + 5)) + y = mainGraphics->mHeight - getHeight(); setPosition(x, y); setVisible(true); requestMoveToTop(); diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index 04f43fb88..05691c2d2 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -44,7 +44,8 @@ #include "debug.h" QuitDialog::QuitDialog(QuitDialog** pointerToMe): - Window(_("Quit"), true, NULL), mMyPointer(pointerToMe) + Window(_("Quit"), true, 0, "quit.xml"), + mMyPointer(pointerToMe) { mForceQuit = new RadioButton(_("Quit"), "quitdialog"); mLogoutQuit = new RadioButton(_("Quit"), "quitdialog"); @@ -55,7 +56,7 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe): addKeyListener(this); - ContainerPlacer place = getPlacer(0, 0); + ContainerPlacer placer = getPlacer(0, 0); const State state = Client::getState(); @@ -67,25 +68,25 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe): state == STATE_UPDATE || state == STATE_LOAD_DATA) { - placeOption(place, mForceQuit); + placeOption(placer, mForceQuit); } else { // Only added if we are connected to an accountserver or gameserver - placeOption(place, mLogoutQuit); - placeOption(place, mSwitchAccountServer); + placeOption(placer, mLogoutQuit); + placeOption(placer, mSwitchAccountServer); // Only added if we are connected to a gameserver if (state == STATE_GAME) - placeOption(place, mSwitchCharacter); + placeOption(placer, mSwitchCharacter); } mOptions[0]->setSelected(true); - place = getPlacer(0, 1); + placer = getPlacer(0, 1); - place(1, 0, mOkButton, 1); - place(2, 0, mCancelButton, 1); + placer(1, 0, mOkButton, 1); + placer(2, 0, mCancelButton, 1); reflowLayout(200, 0); setLocationRelativeTo(getParent()); @@ -109,9 +110,9 @@ QuitDialog::~QuitDialog() mSwitchCharacter = 0; } -void QuitDialog::placeOption(ContainerPlacer &place, gcn::RadioButton *option) +void QuitDialog::placeOption(ContainerPlacer &placer, gcn::RadioButton *option) { - place(0, static_cast<int>(mOptions.size()), option, 3); + placer(0, static_cast<int>(mOptions.size()), option, 3); mOptions.push_back(option); } @@ -178,7 +179,7 @@ void QuitDialog::keyPressed(gcn::KeyEvent &keyEvent) if (dir != 0) { - std::vector<gcn::RadioButton*>::iterator it = mOptions.begin(); + std::vector<gcn::RadioButton*>::const_iterator it = mOptions.begin(); for (; it < mOptions.end(); ++it) { diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index 380a85528..5456be26b 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -61,7 +61,7 @@ class QuitDialog : public Window, public gcn::ActionListener, void keyPressed(gcn::KeyEvent &keyEvent); private: - void placeOption(ContainerPlacer &place, gcn::RadioButton *option); + void placeOption(ContainerPlacer &placer, gcn::RadioButton *option); std::vector<gcn::RadioButton*> mOptions; gcn::RadioButton *mLogoutQuit; diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 913c958f2..062275b80 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -62,34 +62,34 @@ void WrongDataNoticeListener::action(const gcn::ActionEvent &event) mTarget->requestFocus(); } -RegisterDialog::RegisterDialog(LoginData *loginData): - Window(_("Register")), +RegisterDialog::RegisterDialog(LoginData *data): + Window(_("Register"), false, 0, "register.xml"), mEmailField(0), mMaleButton(0), mFemaleButton(0), mWrongDataNoticeListener(new WrongDataNoticeListener), - mLoginData(loginData) + mLoginData(data) { int optionalActions = Net::getLoginHandler()->supportedOptionalActions(); gcn::Label *userLabel = new Label(_("Name:")); gcn::Label *passwordLabel = new Label(_("Password:")); gcn::Label *confirmLabel = new Label(_("Confirm:")); - mUserField = new TextField(loginData->username); - mPasswordField = new PasswordField(loginData->password); + mUserField = new TextField(mLoginData->username); + mPasswordField = new PasswordField(mLoginData->password); mConfirmField = new PasswordField; mRegisterButton = new Button(_("Register"), "register", this); mCancelButton = new Button(_("Cancel"), "cancel", this); - ContainerPlacer place; - place = getPlacer(0, 0); - place(0, 0, userLabel); - place(0, 1, passwordLabel); - place(0, 2, confirmLabel); + ContainerPlacer placer; + placer = getPlacer(0, 0); + placer(0, 0, userLabel); + placer(0, 1, passwordLabel); + placer(0, 2, confirmLabel); - place(1, 0, mUserField, 3).setPadding(2); - place(1, 1, mPasswordField, 3).setPadding(2); - place(1, 2, mConfirmField, 3).setPadding(2); + placer(1, 0, mUserField, 3).setPadding(2); + placer(1, 1, mPasswordField, 3).setPadding(2); + placer(1, 2, mConfirmField, 3).setPadding(2); int row = 3; @@ -97,8 +97,8 @@ RegisterDialog::RegisterDialog(LoginData *loginData): { mMaleButton = new RadioButton(_("Male"), "sex", true); mFemaleButton = new RadioButton(_("Female"), "sex", false); - place(1, row, mMaleButton); - place(2, row, mFemaleButton); + placer(1, row, mMaleButton); + placer(2, row, mFemaleButton); row++; } @@ -107,15 +107,15 @@ RegisterDialog::RegisterDialog(LoginData *loginData): { gcn::Label *emailLabel = new Label(_("Email:")); mEmailField = new TextField; - place(0, row, emailLabel); - place(1, row, mEmailField, 3).setPadding(2); + placer(0, row, emailLabel); + placer(1, row, mEmailField, 3).setPadding(2); row++; } - place = getPlacer(0, 2); - place(1, 0, mRegisterButton); - place(2, 0, mCancelButton); + placer = getPlacer(0, 2); + placer(1, 0, mRegisterButton); + placer(2, 0, mCancelButton); reflowLayout(250, 0); mUserField->addKeyListener(this); @@ -161,7 +161,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) const std::string user = mUserField->getText(); logger->log("RegisterDialog::register Username is %s", user.c_str()); - std::string errorMessage; + std::string errorMsg; int error = 0; unsigned int minUser = Net::getLoginHandler()->getMinUserNameLength(); @@ -172,7 +172,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) if (user.length() < minUser) { // Name too short - errorMessage = strprintf + errorMsg = strprintf (_("The username needs to be at least %d characters long."), minUser); error = 1; @@ -180,7 +180,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) else if (user.length() > maxUser - 1 ) { // Name too long - errorMessage = strprintf + errorMsg = strprintf (_("The username needs to be less than %d characters long."), maxUser); error = 1; @@ -188,7 +188,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) else if (mPasswordField->getText().length() < minPass) { // Pass too short - errorMessage = strprintf + errorMsg = strprintf (_("The password needs to be at least %d characters long."), minPass); error = 2; @@ -196,7 +196,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) else if (mPasswordField->getText().length() > maxPass - 1 ) { // Pass too long - errorMessage = strprintf + errorMsg = strprintf (_("The password needs to be less than %d characters long."), maxPass); error = 2; @@ -204,7 +204,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) else if (mPasswordField->getText() != mConfirmField->getText()) { // Password does not match with the confirmation one - errorMessage = _("Passwords do not match."); + errorMsg = _("Passwords do not match."); error = 2; } @@ -225,7 +225,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event) mWrongDataNoticeListener->setTarget(this->mPasswordField); } - OkDialog *dlg = new OkDialog(_("Error"), errorMessage); + OkDialog *dlg = new OkDialog(_("Error"), errorMsg); dlg->addActionListener(mWrongDataNoticeListener); } else diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 8dd7f929d..b196ae4e4 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -48,8 +48,8 @@ char *strBuf; class SDLTextChunk { public: - SDLTextChunk(const std::string &text, const gcn::Color &color) : - img(0), text(text), color(color) + SDLTextChunk(const std::string &text0, const gcn::Color &color0) : + img(0), text(text0), color(color0) { } diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp index d9030e3fb..bbd0a71c1 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/selldialog.cpp @@ -50,14 +50,14 @@ SellDialog::DialogList SellDialog::instances; SellDialog::SellDialog(int npcId): - Window(_("Sell")), + Window(_("Sell"), false, 0, "sell.xml"), mNpcId(npcId), mMaxItems(0), mAmountItems(0), mNick("") { init(); } SellDialog::SellDialog(std::string nick): - Window(_("Sell")), + Window(_("Sell"), false, 0, "sell.xml"), mNpcId(-1), mMaxItems(0), mAmountItems(0), mNick(nick) { init(); @@ -107,18 +107,18 @@ void SellDialog::init() mSlider->setActionEventId("slider"); mSlider->addActionListener(this); - ContainerPlacer place; - place = getPlacer(0, 0); + ContainerPlacer placer; + placer = getPlacer(0, 0); - place(0, 0, mScrollArea, 8, 5).setPadding(3); - place(0, 5, mDecreaseButton); - place(1, 5, mSlider, 3); - place(4, 5, mIncreaseButton); - place(5, 5, mQuantityLabel, 2); - place(7, 5, mAddMaxButton); - place(0, 6, mMoneyLabel, 8); - place(6, 7, mSellButton); - place(7, 7, mQuitButton); + placer(0, 0, mScrollArea, 8, 5).setPadding(3); + placer(0, 5, mDecreaseButton); + placer(1, 5, mSlider, 3); + placer(4, 5, mIncreaseButton); + placer(5, 5, mQuantityLabel, 2); + placer(7, 5, mAddMaxButton); + placer(0, 6, mMoneyLabel, 8); + placer(6, 7, mSellButton); + placer(7, 7, mQuitButton); Layout &layout = getLayout(); layout.setRowHeight(0, Layout::AUTO_SET); @@ -346,8 +346,8 @@ void SellDialog::setVisible(bool visible) void SellDialog::closeAll() { - DialogList::iterator it = instances.begin(); - DialogList::iterator it_end = instances.end(); + DialogList::const_iterator it = instances.begin(); + DialogList::const_iterator it_end = instances.end(); for (; it != it_end; ++it) (*it)->close(); diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 763c190d6..5a00d4a76 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -234,7 +234,7 @@ private: ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir): - Window(_("Choose Your Server")), + Window(_("Choose Your Server"), false, 0, "server.xml"), mDir(dir), // mDownloadStatus(DOWNLOADING_PREPARING), mDownloadStatus(DOWNLOADING_UNKNOWN), @@ -367,7 +367,7 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir): loadServers(false); - if (mServers.size() == 0) + if (mServers.empty()) downloadServerList(); } @@ -548,7 +548,7 @@ void ServerDialog::mouseClicked(gcn::MouseEvent &mouseEvent) void ServerDialog::logic() { { - MutexLocker lock(&mMutex); + MutexLocker tempLock(&mMutex); if (mDownloadStatus == DOWNLOADING_COMPLETE) { mDownloadStatus = DOWNLOADING_OVER; @@ -636,11 +636,11 @@ void ServerDialog::loadServers(bool addNew) return; } - int version = XML::getProperty(rootNode, "version", 0); - if (version != 1) + int ver = XML::getProperty(rootNode, "version", 0); + if (ver != 1) { logger->log("Error: unsupported online server list version: %d", - version); + ver); return; } @@ -703,7 +703,7 @@ void ServerDialog::loadServers(bool addNew) server.version.first = gui->getFont()->getWidth(version); server.version.second = version; - MutexLocker lock(&mMutex); + MutexLocker tempLock(&mMutex); // Add the server to the local list if it's not already present bool found = false; for (unsigned int i = 0; i < mServers.size(); i++) diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 76e3936c2..ae7a3109c 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -51,7 +51,7 @@ extern Window *statusWindow; Setup::Setup(): - Window(_("Setup")) + Window(_("Setup"), false, 0, "setup.xml") { setCloseButton(true); setResizable(true); @@ -103,7 +103,8 @@ Setup::Setup(): mTabs.push_back(new Setup_Theme); mTabs.push_back(new Setup_Other); - for (std::list<SetupTab*>::iterator i = mTabs.begin(), i_end = mTabs.end(); + for (std::list<SetupTab*>::const_iterator i = mTabs.begin(), + i_end = mTabs.end(); i != i_end; ++i) { SetupTab *tab = *i; @@ -162,10 +163,11 @@ void Setup::action(const gcn::ActionEvent &event) if (!statusWindow) return; - for (std::list<Window*>::iterator it = mWindowsToReset.begin(); + for (std::list<Window*>::const_iterator it = mWindowsToReset.begin(); it != mWindowsToReset.end(); ++it) { - (*it)->resetToDefaultSize(); + if (*it) + (*it)->resetToDefaultSize(); } } } @@ -177,10 +179,11 @@ void Setup::setInGame(bool inGame) void Setup::externalUpdate() { - for (std::list<SetupTab*>::iterator it = mTabs.begin(); + for (std::list<SetupTab*>::const_iterator it = mTabs.begin(); it != mTabs.end(); ++it) { - (*it)->externalUpdated(); + if (*it) + (*it)->externalUpdated(); } } @@ -195,4 +198,26 @@ void Setup::doCancel() for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel)); } +void Setup::activateTab(const std::string &name) +{ + std::string tmp = gettext(name.c_str()); + mPanel->setSelectedTab(tmp); +/* + for (std::list<SetupTab*>::const_iterator it = mTabs.begin(); + it != mTabs.end(); ++it) + { + if (*it) + { + SetupTab *tab = *it; + logger->log("check tab: " + tab->getName()); + if (tab->getName() == tmp) + { + mPanel->setSelectedTab(name); + return; + } + } + } +*/ +} + Setup *setupWindow; diff --git a/src/gui/setup.h b/src/gui/setup.h index cdaf7db99..b499da4ee 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -73,6 +73,8 @@ class Setup : public Window, public gcn::ActionListener void doCancel(); + void activateTab(const std::string &name); + private: std::list<SetupTab*> mTabs; std::list<Window*> mWindowsToReset; diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp index 1cad4c594..23fb5c086 100644 --- a/src/gui/setup_other.cpp +++ b/src/gui/setup_other.cpp @@ -84,6 +84,15 @@ Setup_Other::Setup_Other() new SetupItemCheckBox(_("Draw hotkeys on map"), "", "drawHotKeys", this, "drawHotKeysEvent"); + new SetupItemCheckBox(_("Enable lazy scrolling"), "", + "enableLazyScrolling", this, "enableLazyScrollingEvent"); + + new SetupItemIntTextField(_("Scroll laziness"), "", "ScrollLaziness", + this, "ScrollLazinessEvent", 1, 160); + + new SetupItemIntTextField(_("Scroll radius"), "", "ScrollRadius", + this, "ScrollRadiusEvent", 0, 32); + new SetupItemLabel(_("Moving"), "", this); diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp index dfb119b91..dd634d1f3 100644 --- a/src/gui/setup_perfomance.cpp +++ b/src/gui/setup_perfomance.cpp @@ -58,9 +58,6 @@ Setup_Perfomance::Setup_Perfomance() new SetupItemCheckBox(_("Auto adjust perfomance"), "", "adjustPerfomance", this, "adjustPerfomanceEvent"); - new SetupItemCheckBox(_("Show beings transparency"), "", - "beingopacity", this, "beingopacityEvent"); - new SetupItemCheckBox(_("Hw acceleration"), "", "hwaccel", this, "hwaccelEvent"); @@ -77,6 +74,9 @@ Setup_Perfomance::Setup_Perfomance() "be very slow)"), "Can slow down drawing", "enableAlphaFix", this, "enableAlphaFixEvent"); + new SetupItemCheckBox(_("Show beings transparency"), "", + "beingopacity", this, "beingopacityEvent"); + new SetupItemCheckBox(_("Enable reorder sprites."), "", "enableReorderSprites", this, "enableReorderSpritesEvent"); diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 03b485097..d3c1163dc 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -59,7 +59,7 @@ #include "debug.h" -extern Graphics *graphics; +extern Graphics *mainGraphics; /** * The list model for mode list. @@ -157,8 +157,8 @@ ModeListModel::ModeListModel() addCustomMode("1280x1024"); addCustomMode("1400x900"); addCustomMode("1500x990"); - addCustomMode(toString(graphics->mWidth) + "x" - + toString(graphics->mHeight)); + addCustomMode(toString(mainGraphics->mWidth) + "x" + + toString(mainGraphics->mHeight)); std::sort(mVideoModes.begin(), mVideoModes.end(), modeSorter); mVideoModes.push_back("custom"); @@ -166,8 +166,8 @@ ModeListModel::ModeListModel() void ModeListModel::addCustomMode(std::string mode) { - std::vector<std::string>::iterator it = mVideoModes.begin(); - std::vector<std::string>::iterator it_end = mVideoModes.end(); + std::vector<std::string>::const_iterator it = mVideoModes.begin(); + std::vector<std::string>::const_iterator it_end = mVideoModes.end(); while (it != it_end) { if (*it == mode) @@ -179,7 +179,7 @@ void ModeListModel::addCustomMode(std::string mode) int ModeListModel::getIndexOf(const std::string &widthXHeightMode) { - std::string currentMode = ""; + std::string currentMode(""); for (int i = 0; i < getNumberOfElements(); i++) { currentMode = getElementAt(i); @@ -348,8 +348,8 @@ Setup_Video::Setup_Video(): mFpsCheckBox->setSelected(mFps > 0); // Pre-select the current video mode. - std::string videoMode = toString(graphics->mWidth) + "x" - + toString(graphics->mHeight); + std::string videoMode = toString(mainGraphics->mWidth) + "x" + + toString(mainGraphics->mHeight); mModeList->setSelected(mModeListModel->getIndexOf(videoMode)); mModeList->setActionEventId("videomode"); @@ -473,25 +473,25 @@ void Setup_Video::apply() if (!config.getIntValue("opengl")) { #endif - if (!graphics->setFullscreen(fullscreen)) + if (!mainGraphics->setFullscreen(fullscreen)) { fullscreen = !fullscreen; - if (!graphics->setFullscreen(fullscreen)) + if (!mainGraphics->setFullscreen(fullscreen)) { - std::stringstream errorMessage; + std::stringstream errorMsg; if (fullscreen) { - errorMessage << _("Failed to switch to windowed mode " - "and restoration of old mode also " - "failed!") << std::endl; + errorMsg << _("Failed to switch to windowed mode " + "and restoration of old mode also " + "failed!") << std::endl; } else { - errorMessage << _("Failed to switch to fullscreen mode" - " and restoration of old mode also " - "failed!") << std::endl; + errorMsg << _("Failed to switch to fullscreen mode" + " and restoration of old mode also " + "failed!") << std::endl; } - logger->error(errorMessage.str()); + logger->error(errorMsg.str()); } } #if defined(WIN32) || defined(__APPLE__) @@ -564,11 +564,11 @@ void Setup_Video::cancel() config.setValue("screen", mFullScreenEnabled); // Set back to the current video mode. - std::string videoMode = toString(graphics->mWidth) + "x" - + toString(graphics->mHeight); + std::string videoMode = toString(mainGraphics->mWidth) + "x" + + toString(mainGraphics->mHeight); mModeList->setSelected(mModeListModel->getIndexOf(videoMode)); - config.setValue("screenwidth", graphics->mWidth); - config.setValue("screenheight", graphics->mHeight); + config.setValue("screenwidth", mainGraphics->mWidth); + config.setValue("screenheight", mainGraphics->mHeight); config.setValue("customcursor", mCustomCursorEnabled); config.setValue("particleeffects", mParticleEffectsEnabled); @@ -612,9 +612,9 @@ void Setup_Video::action(const gcn::ActionEvent &event) return; // TODO: Find out why the drawing area doesn't resize without a restart. - if (width != graphics->mWidth || height != graphics->mHeight) + if (width != mainGraphics->mWidth || height != mainGraphics->mHeight) { - if (width < graphics->mWidth || height < graphics->mHeight) + if (width < mainGraphics->mWidth || height < mainGraphics->mHeight) new OkDialog(_("Screen Resolution Changed"), _("Restart your client for the change to take effect.") + std::string("\n") + @@ -625,8 +625,8 @@ void Setup_Video::action(const gcn::ActionEvent &event) } config.setValue("oldscreen", config.getBoolValue("screen")); - config.setValue("oldscreenwidth", graphics->mWidth); - config.setValue("oldscreenheight", graphics->mHeight); + config.setValue("oldscreenwidth", mainGraphics->mWidth); + config.setValue("oldscreenheight", mainGraphics->mHeight); config.setValue("screenwidth", width); config.setValue("screenheight", height); } @@ -687,12 +687,12 @@ void Setup_Video::action(const gcn::ActionEvent &event) } else if (id == "fpslimitcheckbox" || id == "fpslimitslider") { - int fps = static_cast<int>(mFpsSlider->getValue()); + int tempFps = static_cast<int>(mFpsSlider->getValue()); if (id == "fpslimitcheckbox" && !mFpsSlider->isEnabled()) - fps = 60; + tempFps = 60; else - fps = fps > 0 ? fps : 60; - mFps = mFpsCheckBox->isSelected() ? fps : 0; + tempFps = tempFps > 0 ? tempFps : 60; + mFps = mFpsCheckBox->isSelected() ? tempFps : 0; const std::string text = mFps > 0 ? toString(mFps) : _("None"); mFpsLabel->setCaption(text); @@ -701,9 +701,10 @@ void Setup_Video::action(const gcn::ActionEvent &event) } else if (id == "altfpslimitslider") { - int fps = static_cast<int>(mAltFpsSlider->getValue()); - fps = fps > 0 ? fps : static_cast<int>(mAltFpsSlider->getScaleStart()); - mAltFps = fps; + int tempFps = static_cast<int>(mAltFpsSlider->getValue()); + tempFps = tempFps > 0 ? tempFps : static_cast<int>( + mAltFpsSlider->getScaleStart()); + mAltFps = tempFps; const std::string text = mAltFps > 0 ? toString(mAltFps) : _("None"); mAltFpsLabel->setCaption(_("Alt FPS limit: ") + text); diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp index 9aaf88bf3..2215ce699 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/shopwindow.cpp @@ -72,7 +72,7 @@ extern std::string tradePartnerName; ShopWindow::DialogList ShopWindow::instances; ShopWindow::ShopWindow(): - Window(_("Personal Shop")), + Window(_("Personal Shop"), false, 0, "shop.xml"), mSelectedItem(-1), mAnnonceTime(0), mLastRequestTimeList(0), @@ -127,28 +127,28 @@ ShopWindow::ShopWindow(): mAnnounceLinks = new CheckBox(_("Show links in announce"), false, this, "link announce"); - ContainerPlacer place; - place = getPlacer(0, 0); - - place(0, 0, mBuyLabel, 8).setPadding(3); - place(8, 0, mSellLabel, 8).setPadding(3); - place(0, 1, mBuyScrollArea, 8, 5).setPadding(3); - place(8, 1, mSellScrollArea, 8, 5).setPadding(3); - place(0, 6, mBuyAddButton); - place(1, 6, mBuyDeleteButton); - place(3, 6, mBuyAnnounceButton); - place(8, 6, mSellAddButton); - place(9, 6, mSellDeleteButton); - place(11, 6, mSellAnnounceButton); - place(0, 7, mAnnounceLinks, 8); - place(15, 7, mCloseButton); + ContainerPlacer placer; + placer = getPlacer(0, 0); + + placer(0, 0, mBuyLabel, 8).setPadding(3); + placer(8, 0, mSellLabel, 8).setPadding(3); + placer(0, 1, mBuyScrollArea, 8, 5).setPadding(3); + placer(8, 1, mSellScrollArea, 8, 5).setPadding(3); + placer(0, 6, mBuyAddButton); + placer(1, 6, mBuyDeleteButton); + placer(3, 6, mBuyAnnounceButton); + placer(8, 6, mSellAddButton); + placer(9, 6, mSellDeleteButton); + placer(11, 6, mSellAnnounceButton); + placer(0, 7, mAnnounceLinks, 8); + placer(15, 7, mCloseButton); if (auctionManager && auctionManager->getEnableAuctionBot()) { mBuyAuctionButton = new Button(_("Auction"), "auction buy", this); mSellAuctionButton = new Button(_("Auction"), "auction sell", this); - place(4, 6, mBuyAuctionButton); - place(12, 6, mSellAuctionButton); + placer(4, 6, mBuyAuctionButton); + placer(12, 6, mSellAuctionButton); } else { @@ -395,7 +395,7 @@ void ShopWindow::saveList() } std::vector<ShopItem*> items = mBuyShopItems->items(); - std::vector<ShopItem*>::iterator it; + std::vector<ShopItem*>::const_iterator it; for (it = items.begin(); it != items.end(); ++it) { ShopItem *item = *(it); @@ -428,7 +428,7 @@ void ShopWindow::saveList() } } - std::map<int, ShopItem*>::iterator mapIt; + std::map<int, ShopItem*>::const_iterator mapIt; for (mapIt = mapItems.begin(); mapIt != mapItems.end(); ++mapIt) { ShopItem *buyItem = (*mapIt).second; @@ -468,7 +468,7 @@ void ShopWindow::announce(ShopItems *list, int mode) mSellAnnounceButton->setEnabled(false); std::vector<ShopItem*> items = list->items(); - std::vector<ShopItem*>::iterator it; + std::vector<ShopItem*>::const_iterator it; for (it = items.begin(); it != items.end(); ++it) { @@ -534,7 +534,7 @@ void ShopWindow::giveList(const std::string &nick, int mode) return; std::vector<ShopItem*> items = list->items(); - std::vector<ShopItem*>::iterator it; + std::vector<ShopItem*>::const_iterator it; for (it = items.begin(); it != items.end(); ++it) { @@ -596,7 +596,7 @@ void ShopWindow::sendMessage(const std::string &nick, if (config.getBoolValue("hideShopMessages")) Net::getChatHandler()->privateMessage(nick, data); else if (chatWindow) - chatWindow->whisper(nick, data, BY_PLAYER); + chatWindow->addWhisper(nick, data, BY_PLAYER); //here was true } @@ -780,7 +780,7 @@ bool ShopWindow::findShopItem(ShopItem *shopItem, int mode) return false; std::vector<ShopItem*> items; - std::vector<ShopItem*>::iterator it; + std::vector<ShopItem*>::const_iterator it; if (mode == SELL) { if (!mSellShopItems) diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index 0492afce0..df21488a5 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -52,7 +52,9 @@ class ShortcutTab : public Tab ShortcutWindow::ShortcutWindow(const std::string &title, ShortcutContainer *content, - int width, int height) + std::string skinFile, + int width, int height) : + Window("Window", false, 0, skinFile) { setWindowName(title); // no title presented, title bar is padding so window can be moved. @@ -96,7 +98,9 @@ ShortcutWindow::ShortcutWindow(const std::string &title, loadWindowState(); } -ShortcutWindow::ShortcutWindow(const std::string &title, int width, int height) +ShortcutWindow::ShortcutWindow(const std::string &title, std::string skinFile, + int width, int height) : + Window("Window", false, 0, skinFile) { setWindowName(title); // no title presented, title bar is padding so window can be moved. diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index 4301b72d1..1c91835e8 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -41,9 +41,10 @@ class ShortcutWindow : public Window * Constructor. */ ShortcutWindow(const std::string &title, ShortcutContainer *content, + std::string skinFile = "", int width = 0, int height = 0); - ShortcutWindow(const std::string &title, + ShortcutWindow(const std::string &title, std::string skinFile = "", int width = 0, int height = 0); /** diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index bf87e804d..28dbca939 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -273,7 +273,7 @@ private: }; SkillDialog::SkillDialog(): - Window(_("Skills")) + Window(_("Skills"), false, 0, "skills.xml") { setWindowName("Skills"); setCloseButton(true); @@ -321,7 +321,7 @@ void SkillDialog::action(const gcn::ActionEvent &event) std::string SkillDialog::update(int id) { - SkillMap::iterator i = mSkills.find(id); + SkillMap::const_iterator i = mSkills.find(id); if (i != mSkills.end()) { @@ -342,7 +342,9 @@ void SkillDialog::update() PlayerInfo::getAttribute(SKILL_POINTS))); mPointsLabel->adjustSize(); - for (SkillMap::iterator it = mSkills.begin(); it != mSkills.end(); ++it) + for (SkillMap::const_iterator it = mSkills.begin(); + it != mSkills.end(); + ++ it) { if ((*it).second && (*it).second->modifiable) (*it).second->update(); @@ -467,7 +469,7 @@ void SkillDialog::loadSkills(const std::string &file) bool SkillDialog::setModifiable(int id, bool modifiable) { - SkillMap::iterator it = mSkills.find(id); + SkillMap::const_iterator it = mSkills.find(id); if (it != mSkills.end()) { @@ -508,7 +510,9 @@ void SkillModel::updateVisibilities() { mVisibleSkills.clear(); - for (SkillList::iterator it = mSkills.begin(); it != mSkills.end(); ++it) + for (SkillList::const_iterator it = mSkills.begin(); + it != mSkills.end(); + ++ it) { if ((*it)->visible) mVisibleSkills.push_back((*it)); diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 749f26f85..a8d15f36c 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -232,7 +232,7 @@ public: mScroll = 0; } - void action(const gcn::ActionEvent &event) + void action(const gcn::ActionEvent &event A_UNUSED) { /* if (event.getId() == "do invite") @@ -528,7 +528,7 @@ public: return 0; Avatar *ava = 0; - std::vector<Avatar*>::iterator i = avatars->begin(); + std::vector<Avatar*>::const_iterator i = avatars->begin(); while (i != avatars->end()) { ava = (*i); @@ -562,7 +562,7 @@ public: if (!ava) break; - std::vector<std::string>::iterator i = names.begin(); + std::vector<std::string>::const_iterator i = names.begin(); while (i != names.end()) { if (ava->getName() == (*i) && (*i) != "") @@ -584,7 +584,7 @@ public: } } - std::vector<std::string>::iterator i = names.begin(); + std::vector<std::string>::const_iterator i = names.begin(); while (i != names.end()) { @@ -659,7 +659,7 @@ public: std::vector<Avatar*> *avatars = mBeings->getMembers(); std::vector<MapItem*> portals = map->getPortals(); - std::vector<MapItem*>::iterator i = portals.begin(); + std::vector<MapItem*>::const_iterator i = portals.begin(); SpecialLayer *specialLayer = map->getSpecialLayer(); std::vector<Avatar*>::iterator ia = avatars->begin(); @@ -752,7 +752,7 @@ public: return; Avatar *ava = 0; - std::vector<Avatar*>::iterator i = avatars->begin(); + std::vector<Avatar*>::const_iterator i = avatars->begin(); while (i != avatars->end()) { ava = (*i); @@ -786,7 +786,7 @@ public: return 01; Avatar *ava = 0; - std::vector<Avatar*>::iterator i = avatars->begin(); + std::vector<Avatar*>::const_iterator i = avatars->begin(); unsigned num = 0; while (i != avatars->end()) { @@ -962,7 +962,7 @@ public: { name = *i; } - Avatar *ava = new Avatar(name); + ava = new Avatar(name); ava->setOnline(true); ava->setLevel(level); ava->setType(MapItem::PRIORITY); @@ -997,7 +997,7 @@ public: { name = *i; } - Avatar *ava = new Avatar(name); + ava = new Avatar(name); ava->setOnline(true); ava->setLevel(level); ava->setType(MapItem::ATTACK); @@ -1032,7 +1032,7 @@ public: { name = *i; } - Avatar *ava = new Avatar(name); + ava = new Avatar(name); ava->setOnline(false); ava->setLevel(level); ava->setType(MapItem::IGNORE_); @@ -1114,7 +1114,7 @@ private: }; SocialWindow::SocialWindow() : - Window(_("Social")), + Window(_("Social"), false, 0, "social.xml"), mGuildInvited(0), mGuildAcceptDialog(0), mPartyAcceptDialog(0), diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp index 702c31718..c464b83b5 100644 --- a/src/gui/specialswindow.cpp +++ b/src/gui/specialswindow.cpp @@ -76,7 +76,7 @@ class SpecialEntry : public Container }; SpecialsWindow::SpecialsWindow(): - Window(_("Specials")) + Window(_("Specials"), false, 0, "specials.xml") { setWindowName("Specials"); setCloseButton(true); @@ -134,10 +134,11 @@ void SpecialsWindow::draw(gcn::Graphics *graphics) unsigned int found = 0; // number of entries in specialData // which match mEntries - for (std::map<int, Special>::iterator i = specialData.begin(); + for (std::map<int, Special>::const_iterator i = specialData.begin(); i != specialData.end(); ++i) { - std::map<int, SpecialEntry *>::iterator e = mEntries.find(i->first); + std::map<int, SpecialEntry *>::const_iterator + e = mEntries.find(i->first); if (e == mEntries.end()) { // found a new special - abort update and rebuild from scratch diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp index a918e037d..c7d25e257 100644 --- a/src/gui/spellpopup.cpp +++ b/src/gui/spellpopup.cpp @@ -42,7 +42,7 @@ #include "debug.h" SpellPopup::SpellPopup(): - Popup("SpellPopup") + Popup("SpellPopup", "spellpopup.xml") { // Item Name mItemName = new Label; @@ -80,14 +80,14 @@ void SpellPopup::view(int x, int y) int posX = std::max(0, x - getWidth() / 2); int posY = y + distance; - if (posX + getWidth() > graphics->mWidth) + if (posX + getWidth() > mainGraphics->mWidth) { - if (graphics->mWidth > getWidth()) - posX = graphics->mWidth - getWidth(); + if (mainGraphics->mWidth > getWidth()) + posX = mainGraphics->mWidth - getWidth(); else posX = 0; } - if (posY + getHeight() > graphics->mHeight) + if (posY + getHeight() > mainGraphics->mHeight) { if (y > getHeight() + distance) posY = y - getHeight() - distance; diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp index bb7a295ab..fee6450df 100644 --- a/src/gui/statuspopup.cpp +++ b/src/gui/statuspopup.cpp @@ -46,7 +46,7 @@ #include "debug.h" StatusPopup::StatusPopup(): - Popup("StatusPopup") + Popup("StatusPopup", "statuspopup.xml") { const int fontHeight = getFont()->getHeight(); @@ -157,9 +157,8 @@ void StatusPopup::update() minWidth += 16 + 2 * getPadding(); setWidth(minWidth); - const int fontHeight = getFont()->getHeight(); - - setHeight(24 + 8 + 14 * fontHeight + getPadding()); + setHeight(mDisableGameModifiers->getY() + + mDisableGameModifiers->getHeight() + 2 * getPadding()); } void StatusPopup::view(int x, int y) @@ -169,9 +168,9 @@ void StatusPopup::view(int x, int y) int posX = std::max(0, x - getWidth() / 2); int posY = y + distance; - if (posX + getWidth() > graphics->mWidth) - posX = graphics->mWidth - getWidth(); - if (posY + getHeight() > graphics->mHeight) + if (posX + getWidth() > mainGraphics->mWidth) + posX = mainGraphics->mWidth - getWidth(); + if (posY + getHeight() > mainGraphics->mHeight) posY = y - getHeight() - distance; update(); diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index d1fde2dd1..0cad8732a 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -123,7 +123,7 @@ class ChangeDisplay : public AttrDisplay, gcn::ActionListener }; StatusWindow::StatusWindow(): - Window(player_node ? player_node->getName() : "?") + Window(player_node ? player_node->getName() : "?", false, 0, "status.xml") { listen(Mana::CHANNEL_ATTRIBUTES); @@ -276,8 +276,8 @@ StatusWindow::StatusWindow(): mLvlLabel->adjustSize(); } -void StatusWindow::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void StatusWindow::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { static bool blocked = false; if (blocked) @@ -311,7 +311,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED, mCharacterPointsLabel->adjustSize(); // Update all attributes - for (Attrs::iterator it = mAttrs.begin(); + for (Attrs::const_iterator it = mAttrs.begin(); it != mAttrs.end(); ++it) { if (it->second) @@ -324,7 +324,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED, _("Correction points: %d"), event.getInt("newValue"))); mCorrectionPointsLabel->adjustSize(); // Update all attributes - for (Attrs::iterator it = mAttrs.begin(); + for (Attrs::const_iterator it = mAttrs.begin(); it != mAttrs.end(); ++it) { if (it->second) @@ -392,7 +392,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED, else { updateMPBar(mMpBar, true); - Attrs::iterator it = mAttrs.find(id); + Attrs::const_iterator it = mAttrs.find(id); if (it != mAttrs.end() && it->second) { if (it->second) @@ -404,7 +404,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED, void StatusWindow::setPointsNeeded(int id, int needed) { - Attrs::iterator it = mAttrs.find(id); + Attrs::const_iterator it = mAttrs.find(id); if (it != mAttrs.end()) { @@ -909,8 +909,8 @@ void StatusWindow::action(const gcn::ActionEvent &event) if (event.getId() == "copy") { - Attrs::iterator it = mAttrs.begin(); - Attrs::iterator it_end = mAttrs.end(); + Attrs::const_iterator it = mAttrs.begin(); + Attrs::const_iterator it_end = mAttrs.end(); std::string str; while (it != it_end) { diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 44d052004..fa957d059 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -58,7 +58,7 @@ class StatusWindow : public Window, */ StatusWindow(); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); void setPointsNeeded(int id, int needed); diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp index 9d759c4a2..282f23ee1 100644 --- a/src/gui/textcommandeditor.cpp +++ b/src/gui/textcommandeditor.cpp @@ -61,11 +61,11 @@ class IconsModal : public gcn::ListModel public: IconsModal() { - std::map<int, ItemInfo*> info = ItemDB::getItemInfos(); + std::map<int, ItemInfo*> items = ItemDB::getItemInfos(); std::list<std::string> tempStrings; for (std::map<int, ItemInfo*>::const_iterator - i = info.begin(), i_end = info.end(); + i = items.begin(), i_end = items.end(); i != i_end; ++i) { if (i->first < 0) @@ -165,7 +165,7 @@ public: TextCommandEditor::TextCommandEditor(TextCommand *command): - Window(_("Command Editor")) + Window(_("Command Editor"), false, 0, "commandeditor.xml") { int w = 350; int h = 350; @@ -254,34 +254,34 @@ TextCommandEditor::TextCommandEditor(TextCommand *command): mSchoolDropDown->setSelected(command->getSchool() - MAGIC_START_ID); mSchoolLvlField->setValue(command->getSchoolLvl()); - ContainerPlacer place; - place = getPlacer(0, 0); - - place(0, 0, mIsMagic, 1); - place(2, 0, mIsOther, 1); - place(0, 1, mSymbolLabel, 2).setPadding(3); - place(2, 1, mSymbolTextField, 3).setPadding(3); - place(0, 2, mCommandLabel, 2).setPadding(3); - place(2, 2, mCommandTextField, 4).setPadding(3); - place(0, 3, mTypeLabel, 2).setPadding(3); - place(2, 3, mTypeDropDown, 3).setPadding(3); - - place(0, 4, mIconLabel, 2).setPadding(3); - place(2, 4, mIconDropDown, 3).setPadding(3); - - place(0, 5, mManaLabel, 2).setPadding(3); - place(2, 5, mManaField, 3).setPadding(3); - place(0, 6, mMagicLvlLabel, 2).setPadding(3); - place(2, 6, mMagicLvlField, 3).setPadding(3); - - place(0, 7, mSchoolLabel, 2).setPadding(3); - place(2, 7, mSchoolDropDown, 3).setPadding(3); - place(0, 8, mSchoolLvlLabel, 2).setPadding(3); - place(2, 8, mSchoolLvlField, 3).setPadding(3); - - place(0, 9, mSaveButton, 2).setPadding(3); - place(2, 9, mCancelButton, 2).setPadding(3); - place(4, 9, mDeleteButton, 2).setPadding(3); + ContainerPlacer placer; + placer = getPlacer(0, 0); + + placer(0, 0, mIsMagic, 1); + placer(2, 0, mIsOther, 1); + placer(0, 1, mSymbolLabel, 2).setPadding(3); + placer(2, 1, mSymbolTextField, 3).setPadding(3); + placer(0, 2, mCommandLabel, 2).setPadding(3); + placer(2, 2, mCommandTextField, 4).setPadding(3); + placer(0, 3, mTypeLabel, 2).setPadding(3); + placer(2, 3, mTypeDropDown, 3).setPadding(3); + + placer(0, 4, mIconLabel, 2).setPadding(3); + placer(2, 4, mIconDropDown, 3).setPadding(3); + + placer(0, 5, mManaLabel, 2).setPadding(3); + placer(2, 5, mManaField, 3).setPadding(3); + placer(0, 6, mMagicLvlLabel, 2).setPadding(3); + placer(2, 6, mMagicLvlField, 3).setPadding(3); + + placer(0, 7, mSchoolLabel, 2).setPadding(3); + placer(2, 7, mSchoolDropDown, 3).setPadding(3); + placer(0, 8, mSchoolLvlLabel, 2).setPadding(3); + placer(2, 8, mSchoolLvlField, 3).setPadding(3); + + placer(0, 9, mSaveButton, 2).setPadding(3); + placer(2, 9, mCancelButton, 2).setPadding(3); + placer(4, 9, mDeleteButton, 2).setPadding(3); setWidth(w); setHeight(h); diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp index a80e25260..c1539684c 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/textdialog.cpp @@ -39,7 +39,7 @@ int TextDialog::instances = 0; TextDialog::TextDialog(const std::string &title, const std::string &msg, Window *parent, bool isPassword): - Window(title, true, parent), + Window(title, true, parent, "textdialog.xml"), mTextField(0), mPasswordField(0) { diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index 1ff601154..15b2618da 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -41,7 +41,7 @@ #include "debug.h" TextPopup::TextPopup(): - Popup("TextPopup") + Popup("TextPopup", "textpopup.xml") { const int fontHeight = getFont()->getHeight(); @@ -96,9 +96,9 @@ void TextPopup::show(int x, int y, const std::string &str1, int posX = std::max(0, x - getWidth() / 2); int posY = y + distance; - if (posX + getWidth() > graphics->mWidth) - posX = graphics->mWidth - getWidth(); - if (posY + getHeight() > graphics->mHeight) + if (posX + getWidth() > mainGraphics->mWidth) + posX = mainGraphics->mWidth - getWidth(); + if (posY + getHeight() > mainGraphics->mHeight) posY = y - getHeight() - distance; setPosition(posX, posY); diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 0607564f9..0a1a930a9 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -65,14 +65,15 @@ static void initDefaultThemePath() Skin::Skin(ImageRect skin, Image *close, Image *stickyUp, Image *stickyDown, const std::string &filePath, - const std::string &name): + const std::string &name, int padding): instances(0), mFilePath(filePath), mName(name), mBorder(skin), mCloseImage(close), mStickyImageUp(stickyUp), - mStickyImageDown(stickyDown) + mStickyImageDown(stickyDown), + mPadding(padding) {} Skin::~Skin() @@ -216,6 +217,9 @@ Skin *Theme::load(const std::string &filename, const std::string &defaultPath) Skin *skin = readSkin(filename); if (!skin) + skin = readSkin("window.xml"); + + if (!skin) { // Try falling back on the defaultPath if this makes sense if (filename != defaultPath) @@ -240,6 +244,31 @@ Skin *Theme::load(const std::string &filename, const std::string &defaultPath) return skin; } +void Theme::unload(Skin *skin) +{ + if (!skin) + return; + skin->instances --; +/* + // unload theme if no instances + if (!skin->instances) + { + SkinIterator it = mSkins.begin(); + SkinIterator it_end = mSkins.end(); + while (it != it_end) + { + if (it->second == skin) + { + mSkins.erase(it); + break; + } + ++ it; + } + delete skin; + } +*/ +} + void Theme::setMinimumOpacity(float minimumOpacity) { if (minimumOpacity > 1.0f) @@ -293,6 +322,7 @@ Skin *Theme::readSkin(const std::string &filename) Image *dBorders = Theme::getImageFromTheme(skinSetImage); ImageRect border; memset(&border, 0, sizeof(ImageRect)); + int padding = 3; // iterate <widget>'s for_each_xml_child_node(widgetNode, rootNode) @@ -304,140 +334,143 @@ Skin *Theme::readSkin(const std::string &filename) XML::getProperty(widgetNode, "type", "unknown"); if (widgetType == "Window") { - // Iterate through <part>'s - // LEEOR / TODO: - // We need to make provisions to load in a CloseButton image. For - // now it can just be hard-coded. for_each_xml_child_node(partNode, widgetNode) { - if (!xmlStrEqual(partNode->name, BAD_CAST "part")) - continue; - - const std::string partType = - XML::getProperty(partNode, "type", "unknown"); - // TOP ROW - const int xPos = XML::getProperty(partNode, "xpos", 0); - const int yPos = XML::getProperty(partNode, "ypos", 0); - const int width = XML::getProperty(partNode, "width", 1); - const int height = XML::getProperty(partNode, "height", 1); - - if (partType == "top-left-corner") + if (xmlStrEqual(partNode->name, BAD_CAST "part")) { - if (dBorders) + const std::string partType = + XML::getProperty(partNode, "type", "unknown"); + // TOP ROW + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + if (partType == "top-left-corner") { - border.grid[0] = dBorders->getSubImage( - xPos, yPos, width, height); + if (dBorders) + { + border.grid[0] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[0] = 0; + } } - else - { - border.grid[0] = 0; - } - } - else if (partType == "top-edge") - { - if (dBorders) - { - border.grid[1] = dBorders->getSubImage( - xPos, yPos, width, height); - } - else + else if (partType == "top-edge") { - border.grid[1] = 0; + if (dBorders) + { + border.grid[1] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[1] = 0; + } } - } - else if (partType == "top-right-corner") - { - if (dBorders) + else if (partType == "top-right-corner") { - border.grid[2] = dBorders->getSubImage( - xPos, yPos, width, height); + if (dBorders) + { + border.grid[2] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[2] = 0; + } } - else - { - border.grid[2] = 0; - } - } - // MIDDLE ROW - else if (partType == "left-edge") - { - if (dBorders) - { - border.grid[3] = dBorders->getSubImage( - xPos, yPos, width, height); - } - else - { - border.grid[3] = 0; - } - } - else if (partType == "bg-quad") - { - if (dBorders) + // MIDDLE ROW + else if (partType == "left-edge") { - border.grid[4] = dBorders->getSubImage( - xPos, yPos, width, height); + if (dBorders) + { + border.grid[3] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[3] = 0; + } } - else + else if (partType == "bg-quad") { - border.grid[4] = 0; + if (dBorders) + { + border.grid[4] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[4] = 0; + } } - } - else if (partType == "right-edge") - { - if (dBorders) - { - border.grid[5] = dBorders->getSubImage( - xPos, yPos, width, height); - } - else + else if (partType == "right-edge") { - border.grid[5] = 0; + if (dBorders) + { + border.grid[5] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[5] = 0; + } } - } - // BOTTOM ROW - else if (partType == "bottom-left-corner") - { - if (dBorders) - { - border.grid[6] = dBorders->getSubImage( - xPos, yPos, width, height); - } - else - { - border.grid[6] = 0; - } - } - else if (partType == "bottom-edge") - { - if (dBorders) + // BOTTOM ROW + else if (partType == "bottom-left-corner") { - border.grid[7] = dBorders->getSubImage( - xPos, yPos, width, height); + if (dBorders) + { + border.grid[6] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[6] = 0; + } } - else + else if (partType == "bottom-edge") { - border.grid[7] = 0; + if (dBorders) + { + border.grid[7] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[7] = 0; + } } - } - else if (partType == "bottom-right-corner") - { - if (dBorders) + else if (partType == "bottom-right-corner") { - border.grid[8] = dBorders->getSubImage( - xPos, yPos, width, height); + if (dBorders) + { + border.grid[8] = dBorders->getSubImage( + xPos, yPos, width, height); + } + else + { + border.grid[8] = 0; + } } + else { - border.grid[8] = 0; + logger->log("Theme::readSkin(): Unknown part type " + "'%s'", partType.c_str()); } } - - else + else if (xmlStrEqual(partNode->name, BAD_CAST "option")) { - logger->log("Theme::readSkin(): Unknown part type '%s'", - partType.c_str()); + const std::string name = XML::getProperty( + partNode, "name", ""); + if (name == "padding") + padding = XML::getProperty(partNode, "value", 3); } } } @@ -467,7 +500,7 @@ Skin *Theme::readSkin(const std::string &filename) } Skin *skin = new Skin(border, closeImage, stickyImageUp, stickyImageDown, - filename); + filename, "", padding); skin->updateAlpha(mMinimumOpacity); return skin; } diff --git a/src/gui/theme.h b/src/gui/theme.h index fbc6f13da..92b2c8878 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -43,8 +43,8 @@ class Skin { public: Skin(ImageRect skin, Image *close, Image *stickyUp, Image *stickyDown, - const std::string &filePath, - const std::string &name = ""); + const std::string &filePath, const std::string &name = "", + int padding = 3); ~Skin(); @@ -95,6 +95,9 @@ class Skin */ void updateAlpha(float minimumOpacityAllowed = 0.0f); + int getPadding() + { return mPadding; } + int instances; private: @@ -104,6 +107,7 @@ class Skin Image *mCloseImage; /**< Close Button Image */ Image *mStickyImageUp; /**< Sticky Button Image */ Image *mStickyImageDown; /**< Sticky Button Image */ + int mPadding; }; class Theme : public Palette, public ConfigListener @@ -238,6 +242,8 @@ class Theme : public Palette, public ConfigListener Skin *load(const std::string &filename, const std::string &defaultPath = getThemePath()); + void unload(Skin *skin); + /** * Updates the alpha values of all of the skins. */ diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index 3c19ee9c2..bd7e9bb1e 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -63,7 +63,7 @@ #define CAPTION_ACCEPTED _("Agreed. Waiting...") TradeWindow::TradeWindow(): - Window(_("Trade: You")), + Window(_("Trade: You"), false, 0, "trade.xml"), mMyInventory(new Inventory(Inventory::TRADE)), mPartnerInventory(new Inventory(Inventory::TRADE)), mStatus(PROPOSING), @@ -118,14 +118,14 @@ TradeWindow::TradeWindow(): place(1, 0, mMoneyLabel); place(0, 1, myScroll).setPadding(3); place(1, 1, partnerScroll).setPadding(3); - ContainerPlacer place; - place = getPlacer(0, 0); - place(0, 0, mMoneyLabel2); - place(1, 0, mMoneyField, 2); - place(3, 0, mMoneyChangeButton).setHAlign(LayoutCell::LEFT); - place = getPlacer(0, 2); - place(0, 0, mAddButton); - place(1, 0, mOkButton); + ContainerPlacer placer; + placer = getPlacer(0, 0); + placer(0, 0, mMoneyLabel2); + placer(1, 0, mMoneyField, 2); + placer(3, 0, mMoneyChangeButton).setHAlign(LayoutCell::LEFT); + placer = getPlacer(0, 2); + placer(0, 0, mAddButton); + placer(1, 0, mOkButton); Layout &layout = getLayout(); layout.extend(0, 2, 2, 1); layout.setRowHeight(1, Layout::AUTO_SET); @@ -443,10 +443,10 @@ void TradeWindow::initTrade(std::string nick) bool TradeWindow::checkItem(Item *item) { - Item *tradeItem = mMyInventory->findItem( + Item *tItem = mMyInventory->findItem( item->getId(), item->getColor()); - if (tradeItem && (tradeItem->getQuantity() > 1 + if (tItem && (tItem->getQuantity() > 1 || item->getQuantity() > 1)) { if (localChatTab) diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index 568e0613e..cc5caca60 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -46,10 +46,10 @@ #include "debug.h" -UnRegisterDialog::UnRegisterDialog(LoginData *loginData): - Window(_("Unregister"), true), +UnRegisterDialog::UnRegisterDialog(LoginData *data): + Window(_("Unregister"), true, 0, "unregister.xml"), mWrongDataNoticeListener(new WrongDataNoticeListener), - mLoginData(loginData) + mLoginData(data) { gcn::Label *userLabel = new Label(strprintf(_("Name: %s"), mLoginData-> username.c_str())); @@ -108,7 +108,7 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event) logger->log("UnregisterDialog::unregistered, Username is %s", username.c_str()); - std::stringstream errorMessage; + std::stringstream errorMsg; bool error = false; unsigned int min = Net::getLoginHandler()->getMinPasswordLength(); @@ -118,15 +118,15 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event) if (password.length() < min) { // Pass too short - errorMessage << strprintf(_("The password needs to be at least %d " - "characters long."), min); + errorMsg << strprintf(_("The password needs to be at least %d " + "characters long."), min); error = true; } else if (password.length() > max - 1) { // Pass too long - errorMessage << strprintf(_("The password needs to be less than " - "%d characters long."), max); + errorMsg << strprintf(_("The password needs to be less than " + "%d characters long."), max); error = true; } @@ -134,7 +134,7 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event) { mWrongDataNoticeListener->setTarget(this->mPasswordField); - OkDialog *dlg = new OkDialog(_("Error"), errorMessage.str()); + OkDialog *dlg = new OkDialog(_("Error"), errorMsg.str()); dlg->addActionListener(mWrongDataNoticeListener); } else diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 4ba1c9179..2efe82199 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -135,7 +135,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost, const std::string &updatesDir, bool applyUpdates, int updateType): - Window(_("Updating...")), + Window(_("Updating..."), false, 0, "update.xml"), mDownloadStatus(UPDATE_NEWS), mUpdateHost(updateHost), mUpdatesDir(updatesDir), @@ -165,14 +165,14 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost, mBrowserBox->setOpaque(false); mPlayButton->setEnabled(false); - ContainerPlacer place; - place = getPlacer(0, 0); + ContainerPlacer placer; + placer = getPlacer(0, 0); - place(0, 0, mScrollArea, 5, 3).setPadding(3); - place(0, 3, mLabel, 5); - place(0, 4, mProgressBar, 5); - place(3, 5, mCancelButton); - place(4, 5, mPlayButton); + placer(0, 0, mScrollArea, 5, 3).setPadding(3); + placer(0, 3, mLabel, 5); + placer(0, 4, mProgressBar, 5); + placer(3, 5, mCancelButton); + placer(4, 5, mPlayButton); reflowLayout(450, 400); diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index eac9559ef..62fd03c70 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -172,7 +172,7 @@ UserPalette::UserPalette(): UserPalette::~UserPalette() { - for (Colors::iterator col = mColors.begin(), + for (Colors::const_iterator col = mColors.begin(), colEnd = mColors.end(); col != colEnd; ++col) { const std::string &configName = ColorTypeNames[col->type]; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index b6e09c011..461dd581d 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -80,11 +80,13 @@ Viewport::Viewport(): mScrollCenterOffsetY = config.getIntValue("ScrollCenterOffsetY"); mShowBeingPopup = config.getBoolValue("showBeingPopup"); mSelfMouseHeal = config.getBoolValue("selfMouseHeal"); + mEnableLazyScrolling = config.getBoolValue("enableLazyScrolling"); config.addListener("ScrollLaziness", this); config.addListener("ScrollRadius", this); config.addListener("showBeingPopup", this); config.addListener("selfMouseHeal", this); + config.addListener("enableLazyScrolling", this); mPopupMenu = new PopupMenu; mBeingPopup = new BeingPopup; @@ -99,6 +101,7 @@ Viewport::~Viewport() config.removeListener("ScrollRadius", this); config.removeListener("showBeingPopup", this); config.removeListener("selfMouseHeal", this); + config.removeListener("enableLazyScrolling", this); delete mPopupMenu; mPopupMenu = 0; @@ -150,59 +153,67 @@ void Viewport::draw(gcn::Graphics *gcnGraphics) int cnt = 0; - // Apply lazy scrolling - while (lastTick < tick_time && cnt < 32) + if (mEnableLazyScrolling) { - if (player_x > static_cast<int>(mPixelViewX) + mScrollRadius) + // Apply lazy scrolling + while (lastTick < tick_time && cnt < 32) { - mPixelViewX += static_cast<float>(player_x - - static_cast<int>(mPixelViewX) - mScrollRadius) / + if (player_x > static_cast<int>(mPixelViewX) + mScrollRadius) + { + mPixelViewX += static_cast<float>(player_x + - static_cast<int>(mPixelViewX) - mScrollRadius) / + static_cast<float>(mScrollLaziness); + } + if (player_x < static_cast<int>(mPixelViewX) - mScrollRadius) + { + mPixelViewX += static_cast<float>(player_x + - static_cast<int>(mPixelViewX) + mScrollRadius) / + static_cast<float>(mScrollLaziness); + } + if (player_y > static_cast<int>(mPixelViewY) + mScrollRadius) + { + mPixelViewY += static_cast<float>(player_y + - static_cast<int>(mPixelViewY) - mScrollRadius) / static_cast<float>(mScrollLaziness); - } - if (player_x < static_cast<int>(mPixelViewX) - mScrollRadius) - { - mPixelViewX += static_cast<float>(player_x - - static_cast<int>(mPixelViewX) + mScrollRadius) / + } + if (player_y < static_cast<int>(mPixelViewY) - mScrollRadius) + { + mPixelViewY += static_cast<float>(player_y + - static_cast<int>(mPixelViewY) + mScrollRadius) / static_cast<float>(mScrollLaziness); + } + lastTick ++; + cnt ++; } - if (player_y > static_cast<int>(mPixelViewY) + mScrollRadius) - { - mPixelViewY += static_cast<float>(player_y - - static_cast<int>(mPixelViewY) - mScrollRadius) / - static_cast<float>(mScrollLaziness); - } - if (player_y < static_cast<int>(mPixelViewY) - mScrollRadius) - { - mPixelViewY += static_cast<float>(player_y - - static_cast<int>(mPixelViewY) + mScrollRadius) / - static_cast<float>(mScrollLaziness); - } - lastTick ++; - cnt ++; - } - // Auto center when player is off screen - if (cnt > 30 || player_x - static_cast<int>(mPixelViewX) - > graphics->mWidth / 2 || static_cast<int>(mPixelViewX) - - player_x > graphics->mWidth / 2 || static_cast<int>(mPixelViewY) - - player_y > graphics->getHeight() / 2 || player_y - - static_cast<int>(mPixelViewY) > graphics->getHeight() / 2) - { - if (player_x <= 0 || player_y <= 0) + // Auto center when player is off screen + if (cnt > 30 || player_x - static_cast<int>(mPixelViewX) + > graphics->mWidth / 2 || static_cast<int>(mPixelViewX) + - player_x > graphics->mWidth / 2 || static_cast<int>(mPixelViewY) + - player_y > graphics->getHeight() / 2 || player_y + - static_cast<int>(mPixelViewY) > graphics->getHeight() / 2) { - 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) + if (player_x <= 0 || player_y <= 0) { - logger->log("tile position: %d, %d", - player_node->getTileX(), player_node->getTileY()); + 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) + { + logger->log("tile position: %d, %d", + player_node->getTileX(), player_node->getTileY()); + } } + mPixelViewX = static_cast<float>(player_x); + mPixelViewY = static_cast<float>(player_y); } + } + else + { mPixelViewX = static_cast<float>(player_x); mPixelViewY = static_cast<float>(player_y); - }; + } // Don't move camera so that the end of the map is on screen const int viewXmax = @@ -478,7 +489,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) if (actorSpriteManager) { if (player_node != mHoverBeing || mSelfMouseHeal) - actorSpriteManager->heal(player_node, mHoverBeing); + actorSpriteManager->heal(mHoverBeing); } } else if (player_node->withinAttackRange(mHoverBeing) || @@ -693,9 +704,16 @@ void Viewport::closePopupMenu() void Viewport::optionChanged(const std::string &name A_UNUSED) { - mScrollLaziness = config.getIntValue("ScrollLaziness"); - mScrollRadius = config.getIntValue("ScrollRadius"); - mShowBeingPopup = config.getBoolValue("showBeingPopup"); + if (name == "ScrollLaziness") + mScrollLaziness = config.getIntValue("ScrollLaziness"); + else if (name == "ScrollRadius") + mScrollRadius = config.getIntValue("ScrollRadius"); + else if (name == "showBeingPopup") + mShowBeingPopup = config.getBoolValue("showBeingPopup"); + else if (name == "selfMouseHeal") + mSelfMouseHeal = config.getBoolValue("selfMouseHeal"); + else if (name == "enableLazyScrolling") + mEnableLazyScrolling = config.getBoolValue("enableLazyScrolling"); } void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED) diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 50c81aff4..8823928a3 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -286,6 +286,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener, int mScrollLaziness; bool mShowBeingPopup; bool mSelfMouseHeal; + bool mEnableLazyScrolling; int mScrollCenterOffsetX; int mScrollCenterOffsetY; int mMouseX; /**< Current mouse position in pixels. */ diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 1e9f686e4..e1f69c2d7 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -78,7 +78,7 @@ bool stringCompare(const std::string &left, const std::string &right ) } WhoIsOnline::WhoIsOnline(): - Window(_("Who Is Online - Updating")), + Window(_("Who Is Online - Updating"), false, 0, "whoisonline.xml"), mThread(NULL), mDownloadStatus(UPDATE_LIST), mDownloadComplete(true), @@ -95,9 +95,11 @@ WhoIsOnline::WhoIsOnline(): const int w = 200; setDefaultSize(w, h, ImageRect::CENTER); // setContentSize(w, h); + setVisible(false); setCloseButton(true); setResizable(true); setStickyButtonLock(true); + setSaveVisible(true); mUpdateButton = new Button(_("Update"), "update", this); mUpdateButton->setEnabled(false); @@ -563,4 +565,4 @@ void WhoIsOnline::optionChanged(const std::string &name) { if (name == "updateOnlineList") mUpdateOnlineList = config.getBoolValue("updateOnlineList"); -}
\ No newline at end of file +} diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index d4764cba5..18dc48417 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -330,7 +330,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event) Being* being = actorSpriteManager->findBeingByName(ava->getName(), Being::PLAYER); if (being) - actorSpriteManager->heal(player_node, being); + actorSpriteManager->heal(being); } else { @@ -373,7 +373,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event) default: { Map *map = viewport->getMap(); - Avatar *ava = model->getAvatarAt(selected); + ava = model->getAvatarAt(selected); if (map && ava) { MapItem *mapItem = map->findPortalXY( @@ -384,7 +384,6 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event) } } } - else if (event.getButton() == gcn::MouseEvent::MIDDLE) { if (ava->getType() == AVATAR_PLAYER && chatWindow) diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 65a25363d..1419e213c 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -210,23 +210,23 @@ void BrowserBox::addRow(const std::string &row, bool atTop) for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); ++i) { - std::string row = *i; - for (unsigned int j = 0; j < row.size(); j++) + std::string tempRow = *i; + for (unsigned int j = 0; j < tempRow.size(); j++) { - std::string character = row.substr(j, 1); + std::string character = tempRow.substr(j, 1); x += font->getWidth(character); nextChar = j + 1; // Wraping between words (at blank spaces) - if ((nextChar < row.size()) && (row.at(nextChar) == ' ')) + if (nextChar < tempRow.size() && tempRow.at(nextChar) == ' ') { int nextSpacePos = static_cast<int>( - row.find(" ", (nextChar + 1))); + tempRow.find(" ", (nextChar + 1))); if (nextSpacePos <= 0) - nextSpacePos = static_cast<int>(row.size()) - 1; + nextSpacePos = static_cast<int>(tempRow.size()) - 1; unsigned nextWordWidth = font->getWidth( - row.substr(nextChar, + tempRow.substr(nextChar, (nextSpacePos - nextChar))); if ((x + nextWordWidth + 10) > (unsigned)getWidth()) @@ -256,6 +256,11 @@ void BrowserBox::addRow(const std::string &row, bool atTop) updateHeight(); } +void BrowserBox::addRow(const std::string &cmd, char *text) +{ + addRow(strprintf("@@%s|%s@@", cmd.c_str(), text)); +} + void BrowserBox::addImage(const std::string &path) { if (!mEnableImages) diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index cd69ce56f..e86f0288e 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -112,6 +112,11 @@ class BrowserBox : public gcn::Widget, */ void addRow(const std::string &row, bool atTop = false); + /** + * Adds a menu line to the browser. + */ + void addRow(const std::string &cmd, char *text); + void addImage(const std::string &path); /** diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 81c0d277f..485e96e74 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -337,7 +337,7 @@ void ChatTab::chatInput(const std::string &message) start = msg.find('[', start + 1); } - std::string temp = ""; + std::string temp(""); if (start + 1 < msg.length() && end < msg.length() && end > start + 1) { @@ -439,7 +439,7 @@ void ChatTab::loadFromLogFile(std::string name) { std::list<std::string> list; chatLogger->loadLast(name, list, 5); - std::list<std::string>::iterator i = list.begin(); + std::list<std::string>::const_iterator i = list.begin(); while (i != list.end()) { std::string line = "##9" + *i; diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index f01d3fb55..687d7dc6d 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -46,7 +46,8 @@ Image *DropDown::buttons[2][2]; ImageRect DropDown::skin; float DropDown::mAlpha = 1.0; -DropDown::DropDown(gcn::ListModel *listModel): +DropDown::DropDown(gcn::ListModel *listModel, gcn::ActionListener* listener, + std::string eventId): gcn::DropDown::DropDown(listModel, new ScrollArea, new ListBox(listModel)) @@ -105,6 +106,12 @@ DropDown::DropDown(gcn::ListModel *listModel): mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT); mShadowColor = Theme::getThemeColor(Theme::DROPDOWN_SHADOW); setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + + if (!eventId.empty()) + setActionEventId(eventId); + + if (listener) + addActionListener(listener); } DropDown::~DropDown() diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 6a22ba497..4cbd23314 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -46,7 +46,9 @@ class DropDown : public gcn::DropDown * @param listBox the listBox to use. * @see ListModel, ScrollArea, ListBox. */ - DropDown(gcn::ListModel *listModel = 0); + DropDown(gcn::ListModel *listModel = 0, + gcn::ActionListener* listener = NULL, + std::string eventId = ""); ~DropDown(); diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp index 33e3790a0..0a64a7142 100644 --- a/src/gui/widgets/flowcontainer.cpp +++ b/src/gui/widgets/flowcontainer.cpp @@ -67,7 +67,7 @@ void FlowContainer::widgetResized(const gcn::Event &event A_UNUSED) int i = 0; height = 0; - for (WidgetList::iterator it = mWidgets.begin(); + for (WidgetList::const_iterator it = mWidgets.begin(); it != mWidgets.end(); ++it) { int x = i % mGridWidth * mBoxWidth; diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 91b674018..2cc80ee8b 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -96,6 +96,63 @@ class SortItemIdFunctor } } itemIdSorter; +class SortItemWeightFunctor +{ + public: + bool operator() (ItemIdPair* pair1, ItemIdPair* pair2) + { + if (!pair1 || !pair2) + return false; + + const int w1 = pair1->mItem->getInfo().getWeight(); + const int w2 = pair2->mItem->getInfo().getWeight(); + if (w1 == w2) + { + return (pair1->mItem->getInfo().getName() + < pair2->mItem->getInfo().getName()); + } + return w1 < w2; + } +} itemWeightSorter; + +class SortItemAmountFunctor +{ + public: + bool operator() (ItemIdPair* pair1, ItemIdPair* pair2) + { + if (!pair1 || !pair2) + return false; + + const int c1 = pair1->mItem->getQuantity(); + const int c2 = pair2->mItem->getQuantity(); + if (c1 == c2) + { + return (pair1->mItem->getInfo().getName() + < pair2->mItem->getInfo().getName()); + } + return c1 < c2; + } +} itemAmountSorter; + +class SortItemTypeFunctor +{ + public: + bool operator() (ItemIdPair* pair1, ItemIdPair* pair2) + { + if (!pair1 || !pair2) + return false; + + const int t1 = pair1->mItem->getInfo().getType(); + const int t2 = pair2->mItem->getInfo().getType(); + if (t1 == t2) + { + return (pair1->mItem->getInfo().getName() + < pair2->mItem->getInfo().getName()); + } + return t1 < t2; + } +} itemTypeSorter; + ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity): mInventory(inventory), mGridColumns(1), @@ -456,6 +513,9 @@ void ItemContainer::updateMatrix() int i = 0; int j = 0; + std::string temp = mName; + toLower(temp); + for (unsigned idx = 0; idx < mInventory->getSize(); idx ++) { Item *item = mInventory->getItem(idx); @@ -463,7 +523,15 @@ void ItemContainer::updateMatrix() if (!item || item->getId() == 0 || !item->isHaveTag(mTag)) continue; - sortedItems.push_back(new ItemIdPair(idx, item)); + if (mName.empty()) + { + sortedItems.push_back(new ItemIdPair(idx, item)); + continue; + } + std::string name = item->getInfo().getName(); + toLower(name); + if (name.find(temp) != std::string::npos) + sortedItems.push_back(new ItemIdPair(idx, item)); } switch (mSortType) @@ -477,9 +545,18 @@ void ItemContainer::updateMatrix() case 2: sort(sortedItems.begin(), sortedItems.end(), itemIdSorter); break; + case 3: + sort(sortedItems.begin(), sortedItems.end(), itemWeightSorter); + break; + case 4: + sort(sortedItems.begin(), sortedItems.end(), itemAmountSorter); + break; + case 5: + sort(sortedItems.begin(), sortedItems.end(), itemTypeSorter); + break; } - std::vector<ItemIdPair*>::iterator iter; + std::vector<ItemIdPair*>::const_iterator iter; for (iter = sortedItems.begin(); iter != sortedItems.end(); ++iter) { if (j >= mGridRows) @@ -608,6 +685,5 @@ void ItemContainer::setFilter (int tag) void ItemContainer::setSortType (int sortType) { mSortType = sortType; - logger->log("setSortType: %d", sortType); updateMatrix(); } diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index df7de63ee..845bfb3a9 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -125,6 +125,9 @@ class ItemContainer : public gcn::Widget, void setSortType (int sortType); + void setName(std::string str) + { mName = str; } + void updateMatrix(); private: @@ -194,6 +197,7 @@ class ItemContainer : public gcn::Widget, int mDragPosX, mDragPosY; int mTag; int mSortType; + std::string mName; ItemPopup *mItemPopup; int *mShowMatrix; diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index a14b416ce..52b92d0bc 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -86,12 +86,12 @@ void LayoutCell::computeSizes() if (mType != ARRAY) return; - std::vector< std::vector< LayoutCell * > >::iterator + std::vector <std::vector <LayoutCell *> >::const_iterator i = mArray->mCells.begin(); while (i != mArray->mCells.end()) { - std::vector< LayoutCell * >::iterator j = i->begin(); + std::vector <LayoutCell *>::const_iterator j = i->begin(); while (j != i->end()) { LayoutCell *cell = *j; @@ -113,7 +113,8 @@ LayoutArray::LayoutArray(): mSpacing(4) LayoutArray::~LayoutArray() { - std::vector< std::vector< LayoutCell * > >::iterator i = mCells.begin(); + std::vector <std::vector <LayoutCell *> >::iterator + i = mCells.begin(); while (i != mCells.end()) { std::vector< LayoutCell * >::iterator j = i->begin(); @@ -154,7 +155,8 @@ void LayoutArray::resizeGrid(int w, int h) if (extW) mSizes[0].resize(w, Layout::AUTO_DEF); - std::vector< std::vector< LayoutCell * > >::iterator i = mCells.begin(); + std::vector <std::vector <LayoutCell *> >::iterator + i = mCells.begin(); while (i != mCells.end()) { i->resize(w, 0); diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h index 5e9a46cfd..9484be0a5 100644 --- a/src/gui/widgets/mouseevent.h +++ b/src/gui/widgets/mouseevent.h @@ -28,12 +28,12 @@ class MouseEvent : public gcn::MouseEvent { public: - MouseEvent(gcn::Widget* source, bool isShiftPressed, - bool isControlPressed, bool isAltPressed, - bool isMetaPressed, unsigned int type, unsigned int button, + MouseEvent(gcn::Widget* source, bool shiftPressed, + bool controlPressed, bool altPressed, + bool metaPressed, unsigned int type, unsigned int button, int x, int y, int clickCount) : - gcn::MouseEvent(source, isShiftPressed, isControlPressed, - isAltPressed, isMetaPressed, type, button, x, y, + gcn::MouseEvent(source, shiftPressed, controlPressed, + altPressed, metaPressed, type, button, x, y, clickCount) { } diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 38088770b..ac282b088 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -40,12 +40,12 @@ #include "debug.h" -Popup::Popup(const std::string &name, const std::string &skin): +Popup::Popup(const std::string &name, std::string skin): mPopupName(name), mMinWidth(100), mMinHeight(40), - mMaxWidth(graphics->mWidth), - mMaxHeight(graphics->mHeight), + mMaxWidth(mainGraphics->mWidth), + mMaxHeight(mainGraphics->mHeight), mVertexes(new GraphicsVertexes()), mRedraw(true) { @@ -58,8 +58,20 @@ Popup::Popup(const std::string &name, const std::string &skin): setPadding(3); + if (skin == "") + skin = "popup.xml"; + // Loads the skin - mSkin = Theme::instance()->load(skin); + if (Theme::instance()) + { + mSkin = Theme::instance()->load(skin); + if (mSkin) + setPadding(mSkin->getPadding()); + } + else + { + mSkin = 0; + } // Add this window to the window container windowContainer->add(this); @@ -76,7 +88,11 @@ Popup::~Popup() mVertexes = 0; if (mSkin) - mSkin->instances--; + { + if (Theme::instance()) + Theme::instance()->unload(mSkin); + mSkin = 0; + } } void Popup::setWindowContainer(WindowContainer *wc) @@ -190,9 +206,9 @@ void Popup::position(int x, int y) int posX = std::max(0, x - getWidth() / 2); int posY = y + distance; - if (posX + getWidth() > graphics->mWidth) - posX = graphics->mWidth - getWidth(); - if (posY + getHeight() > graphics->mHeight) + if (posX + getWidth() > mainGraphics->mWidth) + posX = mainGraphics->mWidth - getWidth(); + if (posY + getHeight() > mainGraphics->mHeight) posY = y - getHeight() - distance; setPosition(posX, posY); diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 0ac50f69e..9d4343ba3 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -66,8 +66,7 @@ class Popup : public Container, public gcn::MouseListener, * debugging purposes. * @param skin The location where the Popup's skin XML can be found. */ - Popup(const std::string &name = "", - const std::string &skin = "window.xml"); + Popup(const std::string &name = "", std::string skin = ""); /** * Destructor. Deletes all the added widgets. diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index c1d6a9531..7324fc9ad 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -70,7 +70,9 @@ ProgressBar::ProgressBar(float progress, if (mInstances == 0) { - Image *dBorders = Theme::getImageFromTheme("vscroll_grey.png"); + Image *dBorders = Theme::getImageFromTheme("progress.png"); + if (!dBorders) + dBorders = Theme::getImageFromTheme("vscroll_grey.png"); if (dBorders) { mBorder.grid[0] = dBorders->getSubImage(0, 0, 4, 4); diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index 52a26ddac..36ed96bd2 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -94,8 +94,8 @@ class ProgressBar : public gcn::Widget, public gcn::WidgetListener /** * Sets the text shown on the progress bar. */ - void setText(const std::string &text) - { mText = text; } + void setText(const std::string &str) + { mText = str; } /** * Returns the text shown on the progress bar. diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index e641be323..feedeae7b 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -136,23 +136,16 @@ void RadioButton::drawBox(gcn::Graphics* graphics) } if (box) - static_cast<Graphics*>(graphics)->drawImage(box, 2, 2); + static_cast<Graphics*>(graphics)->drawImage(box, 3, 3); } void RadioButton::draw(gcn::Graphics* graphics) { - graphics->pushClipArea(gcn::Rectangle(1, 1, getWidth() - 1, - getHeight() - 1)); - drawBox(graphics); - graphics->popClipArea(); - graphics->setFont(getFont()); graphics->setColor(getForegroundColor()); -// int h = getHeight() + getHeight() / 2; -// graphics->drawText(getCaption(), h - 2, 0); graphics->drawText(getCaption(), 16, 0); } @@ -165,4 +158,3 @@ void RadioButton::mouseExited(gcn::MouseEvent& event A_UNUSED) { mHasMouse = false; } - diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp index 30bb66469..e9917b090 100644 --- a/src/gui/widgets/setuptabscroll.cpp +++ b/src/gui/widgets/setuptabscroll.cpp @@ -90,25 +90,31 @@ void SetupTabScroll::addControl(SetupItem *widget, std::string event) void SetupTabScroll::apply() { - std::map<std::string, SetupItem*>::iterator iter; + std::map<std::string, SetupItem*>::const_iterator iter; for (iter = mItems.begin(); iter != mItems.end(); ++ iter) - (*iter).second->apply((*iter).first); + { + if ((*iter).second) + (*iter).second->apply((*iter).first); + } } void SetupTabScroll::cancel() { - std::map<std::string, SetupItem*>::iterator iter; + std::map<std::string, SetupItem*>::const_iterator iter; for (iter = mItems.begin(); iter != mItems.end(); ++ iter) - (*iter).second->cancel((*iter).first); + { + if ((*iter).second) + (*iter).second->cancel((*iter).first); + } } void SetupTabScroll::externalUpdated() { - std::map<std::string, SetupItem*>::iterator iter; + std::map<std::string, SetupItem*>::const_iterator iter; for (iter = mItems.begin(); iter != mItems.end(); ++ iter) { SetupItem *widget = (*iter).second; - if (!widget->isMainConfig()) + if (widget && !widget->isMainConfig()) (*iter).second->externalUpdated((*iter).first); } } diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 940dad12a..47b02c925 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -241,6 +241,19 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab) widgetResized(NULL); } +void TabbedArea::setSelectedTab(const std::string &name) +{ + for (TabContainer::const_iterator itr = mTabs.begin(), + itr_end = mTabs.end(); itr != itr_end; ++itr) + { + if ((*itr).first && (*itr).first->getCaption() == name) + { + setSelectedTab((*itr).first); + return; + } + } +} + void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED) { int width = getWidth() - 2 * getFrameSize() diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index a91b4c199..3ad113b4c 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -122,6 +122,8 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener void setSelectedTab(gcn::Tab *tab); + void setSelectedTab(const std::string &name); + void widgetResized(const gcn::Event &event); /* diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 2729e5407..5d4fbc0b4 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -48,12 +48,14 @@ float TextField::mAlpha = 1.0; ImageRect TextField::skin; TextField::TextField(const std::string &text, bool loseFocusOnTab, - gcn::ActionListener* listener, std::string eventId): + gcn::ActionListener* listener, std::string eventId, + bool sendAlwaysEvents): gcn::TextField(text), mNumeric(false), mMinimum(0), mMaximum(0), - mLastEventPaste(false) + mLastEventPaste(false), + mSendAlwaysEvents(sendAlwaysEvents) { setFrameSize(2); @@ -276,7 +278,9 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent) case Key::ENTER: distributeActionEvent(); - break; + keyEvent.consume(); + fixScroll(); + return; case Key::HOME: mCaretPosition = 0; @@ -309,6 +313,10 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent) } break; + case 3: + handleCopy(); + break; + case 22: // Control code 22, SYNCHRONOUS IDLE, sent on Ctrl+v // hack to prevent paste key sticking if (mLastEventPaste && mLastEventPaste > cur_time) @@ -333,6 +341,9 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent) break; } + if (mSendAlwaysEvents) + distributeActionEvent(); + keyEvent.consume(); fixScroll(); } @@ -348,3 +359,9 @@ void TextField::handlePaste() setCaretPosition(static_cast<unsigned>(caretPos)); } } + +void TextField::handleCopy() +{ + std::string text = getText(); + sendBuffer(text); +} diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 79197bb7a..7e19099e8 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -41,7 +41,7 @@ class TextField : public gcn::TextField */ TextField(const std::string &text = "", bool loseFocusOnTab = true, gcn::ActionListener* listener = NULL, - std::string eventId = ""); + std::string eventId = "", bool sendAlwaysEvents = false); ~TextField(); @@ -99,6 +99,8 @@ class TextField : public gcn::TextField private: void handlePaste(); + void handleCopy(); + static int instances; static float mAlpha; static ImageRect skin; @@ -107,6 +109,7 @@ class TextField : public gcn::TextField int mMaximum; bool mLoseFocusOnTab; int mLastEventPaste; + bool mSendAlwaysEvents; }; #endif diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index ea6b4d520..5e79b7c19 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -73,8 +73,9 @@ void VertContainer::clear() void VertContainer::widgetResized(const gcn::Event &event A_UNUSED) { - for (std::vector<gcn::Widget*>::iterator it = mResizableWidgets.begin(); - it != mResizableWidgets.end(); ++ it) + for (std::vector<gcn::Widget*>::const_iterator + it = mResizableWidgets.begin(); + it != mResizableWidgets.end(); ++ it) { (*it)->setWidth(getWidth()); } diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 4435496a7..c52bf744e 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -47,7 +47,7 @@ int Window::instances = 0; int Window::mouseResize = 0; Window::Window(const std::string &caption, bool modal, Window *parent, - const std::string &skin): + std::string skin): gcn::Window(caption), mGrip(0), mParent(parent), @@ -63,8 +63,8 @@ Window::Window(const std::string &caption, bool modal, Window *parent, mStickyButtonLock(false), mMinWinWidth(100), mMinWinHeight(40), - mMaxWinWidth(graphics->mWidth), - mMaxWinHeight(graphics->mHeight), + mMaxWinWidth(mainGraphics->mWidth), + mMaxWinHeight(mainGraphics->mHeight), mVertexes(new GraphicsVertexes()), mRedraw(true) { @@ -79,8 +79,20 @@ Window::Window(const std::string &caption, bool modal, Window *parent, setPadding(3); setTitleBarHeight(20); + if (skin == "") + skin = "window.xml"; + // Loads the skin - mSkin = Theme::instance()->load(skin); + if (Theme::instance()) + { + mSkin = Theme::instance()->load(skin); + if (mSkin) + setPadding(mSkin->getPadding()); + } + else + { + mSkin = 0; + } // Add this window to the window container windowContainer->add(this); @@ -113,8 +125,6 @@ Window::~Window() mWidgets.clear(); -// need mWidgets.clean ? - removeWidgetListener(this); delete mVertexes; mVertexes = 0; @@ -122,7 +132,11 @@ Window::~Window() instances--; if (mSkin) - mSkin->instances--; + { + if (Theme::instance()) + Theme::instance()->unload(mSkin); + mSkin = 0; + } } void Window::setWindowContainer(WindowContainer *wc) @@ -244,39 +258,39 @@ void Window::setLocationRelativeTo(ImageRect::ImagePosition position, } else if (position == ImageRect::UPPER_CENTER) { - offsetX += (graphics->mWidth - getWidth()) / 2; + offsetX += (mainGraphics->mWidth - getWidth()) / 2; } else if (position == ImageRect::UPPER_RIGHT) { - offsetX += graphics->mWidth - getWidth(); + offsetX += mainGraphics->mWidth - getWidth(); } else if (position == ImageRect::LEFT) { - offsetY += (graphics->mHeight - getHeight()) / 2; + offsetY += (mainGraphics->mHeight - getHeight()) / 2; } else if (position == ImageRect::CENTER) { - offsetX += (graphics->mWidth - getWidth()) / 2; - offsetY += (graphics->mHeight - getHeight()) / 2; + offsetX += (mainGraphics->mWidth - getWidth()) / 2; + offsetY += (mainGraphics->mHeight - getHeight()) / 2; } else if (position == ImageRect::RIGHT) { - offsetX += graphics->mWidth - getWidth(); - offsetY += (graphics->mHeight - getHeight()) / 2; + offsetX += mainGraphics->mWidth - getWidth(); + offsetY += (mainGraphics->mHeight - getHeight()) / 2; } else if (position == ImageRect::LOWER_LEFT) { - offsetY += graphics->mHeight - getHeight(); + offsetY += mainGraphics->mHeight - getHeight(); } else if (position == ImageRect::LOWER_CENTER) { - offsetX += (graphics->mWidth - getWidth()) / 2; - offsetY += graphics->mHeight - getHeight(); + offsetX += (mainGraphics->mWidth - getWidth()) / 2; + offsetY += mainGraphics->mHeight - getHeight(); } else if (position == ImageRect::LOWER_RIGHT) { - offsetX += graphics->mWidth - getWidth(); - offsetY += graphics->mHeight - getHeight(); + offsetX += mainGraphics->mWidth - getWidth(); + offsetY += mainGraphics->mHeight - getHeight(); } setPosition(offsetX, offsetY); @@ -373,7 +387,7 @@ void Window::widgetHidden(const gcn::Event &event A_UNUSED) if (!mFocusHandler) return; - for (it = mWidgets.begin(); it != mWidgets.end(); it++) + for (it = mWidgets.begin(); it != mWidgets.end(); ++ it) { if (mFocusHandler->isFocused(*it)) mFocusHandler->focusNone(); @@ -443,7 +457,7 @@ void Window::mousePressed(gcn::MouseEvent &event) const int y = event.getY(); // Handle close button - if (mCloseButton) + if (mCloseButton && mSkin) { Image *img = mSkin->getCloseImage(); if (img) @@ -464,7 +478,7 @@ void Window::mousePressed(gcn::MouseEvent &event) } // Handle sticky button - if (mStickyButton) + if (mStickyButton && mSkin) { Image *button = mSkin->getStickyImage(mSticky); if (button) @@ -579,8 +593,8 @@ void Window::mouseDragged(gcn::MouseEvent &event) { int newX = std::max(0, getX()); int newY = std::max(0, getY()); - newX = std::min(graphics->mWidth - getWidth(), newX); - newY = std::min(graphics->mHeight - getHeight(), newY); + newX = std::min(mainGraphics->mWidth - getWidth(), newX); + newY = std::min(mainGraphics->mHeight - getHeight(), newY); setPosition(newX, newY); } @@ -621,14 +635,10 @@ void Window::mouseDragged(gcn::MouseEvent &event) newDim.height += newDim.y; newDim.y = 0; } - if (newDim.x + newDim.width > graphics->mWidth) - { - newDim.width = graphics->mWidth - newDim.x; - } - if (newDim.y + newDim.height > graphics->mHeight) - { - newDim.height = graphics->mHeight - newDim.y; - } + if (newDim.x + newDim.width > mainGraphics->mWidth) + newDim.width = mainGraphics->mWidth - newDim.x; + if (newDim.y + newDim.height > mainGraphics->mHeight) + newDim.height = mainGraphics->mHeight - newDim.y; // Update mouse offset when dragging bottom or right border if (mouseResize & BOTTOM) @@ -790,39 +800,39 @@ void Window::setDefaultSize(int defaultWidth, int defaultHeight, } else if (position == ImageRect::UPPER_CENTER) { - x = (graphics->mWidth - defaultWidth) / 2; + x = (mainGraphics->mWidth - defaultWidth) / 2; } else if (position == ImageRect::UPPER_RIGHT) { - x = graphics->mWidth - defaultWidth; + x = mainGraphics->mWidth - defaultWidth; } else if (position == ImageRect::LEFT) { - y = (graphics->mHeight - defaultHeight) / 2; + y = (mainGraphics->mHeight - defaultHeight) / 2; } else if (position == ImageRect::CENTER) { - x = (graphics->mWidth - defaultWidth) / 2; - y = (graphics->mHeight - defaultHeight) / 2; + x = (mainGraphics->mWidth - defaultWidth) / 2; + y = (mainGraphics->mHeight - defaultHeight) / 2; } else if (position == ImageRect::RIGHT) { - x = graphics->mWidth - defaultWidth; - y = (graphics->mHeight - defaultHeight) / 2; + x = mainGraphics->mWidth - defaultWidth; + y = (mainGraphics->mHeight - defaultHeight) / 2; } else if (position == ImageRect::LOWER_LEFT) { - y = graphics->mHeight - defaultHeight; + y = mainGraphics->mHeight - defaultHeight; } else if (position == ImageRect::LOWER_CENTER) { - x = (graphics->mWidth - defaultWidth) / 2; - y = graphics->mHeight - defaultHeight; + x = (mainGraphics->mWidth - defaultWidth) / 2; + y = mainGraphics->mHeight - defaultHeight; } else if (position == ImageRect::LOWER_RIGHT) { - x = graphics->mWidth - defaultWidth; - y = graphics->mHeight - defaultHeight; + x = mainGraphics->mWidth - defaultWidth; + y = mainGraphics->mHeight - defaultHeight; } mDefaultX = x - offsetX; @@ -994,11 +1004,11 @@ void Window::checkIfIsOffScreen(bool partially, bool entirely) // Look if the window is partially off-screen limits... if (partially) { - if (winDimension.x + winDimension.width > graphics->mWidth) - winDimension.x = graphics->mWidth - winDimension.width; + if (winDimension.x + winDimension.width > mainGraphics->mWidth) + winDimension.x = mainGraphics->mWidth - winDimension.width; - if (winDimension.y + winDimension.height > graphics->mHeight) - winDimension.y = graphics->mHeight - winDimension.height; + if (winDimension.y + winDimension.height > mainGraphics->mHeight) + winDimension.y = mainGraphics->mHeight - winDimension.height; setDimension(winDimension); return; @@ -1006,11 +1016,11 @@ void Window::checkIfIsOffScreen(bool partially, bool entirely) if (entirely) { - if (winDimension.x > graphics->mWidth) - winDimension.x = graphics->mWidth - winDimension.width; + if (winDimension.x > mainGraphics->mWidth) + winDimension.x = mainGraphics->mWidth - winDimension.width; - if (winDimension.y > graphics->mHeight) - winDimension.y = graphics->mHeight - winDimension.height; + if (winDimension.y > mainGraphics->mHeight) + winDimension.y = mainGraphics->mHeight - winDimension.height; } setDimension(winDimension); } @@ -1021,4 +1031,4 @@ gcn::Rectangle Window::getWindowArea() getPadding(), getWidth() - getPadding() * 2, getHeight() - getPadding() * 2); -}
\ No newline at end of file +} diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index b9f65dceb..510a68323 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -65,7 +65,7 @@ class Window : public gcn::Window, gcn::WidgetListener * @param skin The location where the window's skin XML can be found. */ Window(const std::string &caption = "Window", bool modal = false, - Window *parent = NULL, const std::string &skin = "window.xml"); + Window *parent = NULL, std::string skin = ""); /** * Destructor. Deletes all the added widgets. diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 0d81ba3a9..487035350 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -99,9 +99,9 @@ WindowMenu::WindowMenu(): KeyboardConfig::KEY_WINDOW_DIDYOUKNOW); addButton(N_("SET"), _("Setup"), x, h, KeyboardConfig::KEY_WINDOW_SETUP); - if (graphics) + if (mainGraphics) { - setDimension(gcn::Rectangle(graphics->mWidth - x - 3, + setDimension(gcn::Rectangle(mainGraphics->mWidth - x - 3, 3, x - 3, h)); } @@ -315,13 +315,13 @@ void WindowMenu::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) mTextPopup->hide(); } -void WindowMenu::showButton(std::string name, bool isVisible) +void WindowMenu::showButton(std::string name, bool visible) { Button *btn = dynamic_cast<Button*>(mButtonNames[name]); if (!btn) return; - btn->setVisible(isVisible); + btn->setVisible(visible); updateButtons(); saveButtons(); } @@ -329,7 +329,7 @@ void WindowMenu::showButton(std::string name, bool isVisible) void WindowMenu::updateButtons() { int x = 0, h = 0; - std::vector <gcn::Button*>::iterator it, it_end; + std::vector <gcn::Button*>::const_iterator it, it_end; for (it = mButtons.begin(), it_end = mButtons.end(); it != it_end; ++it) safeRemove(*it); for (it = mButtons.begin(), it_end = mButtons.end(); it != it_end; ++it) @@ -345,9 +345,9 @@ void WindowMenu::updateButtons() h = btn->getHeight(); } } - if (graphics) + if (mainGraphics) { - setDimension(gcn::Rectangle(graphics->mWidth - x - 3, + setDimension(gcn::Rectangle(mainGraphics->mWidth - x - 3, 3, x - 3, h)); } } diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 6572fe470..739a302ba 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -72,7 +72,7 @@ class WindowMenu : public Container, std::vector <gcn::Button*> &getButtons() { return mButtons; } - void showButton(std::string name, bool isVisible); + void showButton(std::string name, bool visible); void loadButtons(); diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp index 7e2afbaa3..b4f697ba3 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/worldselectdialog.cpp @@ -74,7 +74,7 @@ class WorldListModel : public gcn::ListModel }; WorldSelectDialog::WorldSelectDialog(Worlds worlds): - Window(_("Select World")) + Window(_("Select World"), false, 0, "world.xml") { mWorldListModel = new WorldListModel(worlds); mWorldList = new ListBox(mWorldListModel); diff --git a/src/guild.cpp b/src/guild.cpp index 98e5bb519..5d129e11e 100644 --- a/src/guild.cpp +++ b/src/guild.cpp @@ -124,7 +124,7 @@ GuildMember *Guild::getMember(int id) const itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == id) + if ((*itr) && (*itr)->mId == id) return (*itr); ++itr; } @@ -138,7 +138,7 @@ GuildMember *Guild::getMember(int accountId, int charId) const itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == accountId && (*itr)->mCharId == charId) + if ((*itr) && (*itr)->mId == accountId && (*itr)->mCharId == charId) return (*itr); ++itr; } @@ -152,7 +152,7 @@ GuildMember *Guild::getMember(const std::string &name) const itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->getName() == name) + if ((*itr) && (*itr)->getName() == name) return (*itr); ++itr; } @@ -170,9 +170,9 @@ void Guild::removeMember(GuildMember *member) (*itr)->mCharId == member->mCharId && (*itr)->getName() == member->getName()) { - GuildMember *member = *itr; + GuildMember *m = *itr; mMembers.erase(itr); - delete member; + delete m; return; } ++itr; @@ -189,7 +189,7 @@ void Guild::removeMember(int id) itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == id) + if ((*itr) && (*itr)->mId == id) { GuildMember *member = *itr; mMembers.erase(itr); @@ -212,7 +212,7 @@ void Guild::removeMember(const std::string &name) itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->getName() == name) + if ((*itr) && (*itr)->getName() == name) { GuildMember *member = *itr; mMembers.erase(itr); @@ -230,8 +230,8 @@ void Guild::removeFromMembers() if (!actorSpriteManager) return; - MemberList::iterator itr = mMembers.begin(), - itr_end = mMembers.end(); + MemberList::const_iterator itr = mMembers.begin(); + MemberList::const_iterator itr_end = mMembers.end(); while (itr != itr_end) { Being *b = actorSpriteManager->findBeing((*itr)->getID()); @@ -262,7 +262,7 @@ bool Guild::isMember(GuildMember *member) const itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == member->mId && + if ((*itr) && (*itr)->mId == member->mId && (*itr)->getName() == member->getName()) { return true; @@ -279,7 +279,7 @@ bool Guild::isMember(int id) const itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == id) + if ((*itr) && (*itr)->mId == id) return true; ++itr; } @@ -293,7 +293,7 @@ bool Guild::isMember(const std::string &name) const itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->getName() == name) + if ((*itr) && (*itr)->getName() == name) return true; ++itr; } @@ -309,7 +309,8 @@ void Guild::getNames(std::vector<std::string> &names) const while (it != it_end) { - names.push_back((*it)->getName()); + if (*it) + names.push_back((*it)->getName()); ++it; } } @@ -321,7 +322,7 @@ void Guild::addPos(int id, std::string name) Guild *Guild::getGuild(short id) { - GuildMap::iterator it = guilds.find(id); + GuildMap::const_iterator it = guilds.find(id); if (it != guilds.end()) return it->second; diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index 1a8d5b433..4620de742 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -43,6 +43,8 @@ bool GuildManager::mEnableGuildBot = false; GuildManager::GuildManager() : mGotInfo(false), mGotName(false), + mSentInfoRequest(false), + mSentNameRequest(false), mHavePower(false), mTab(0), mRequest(false) @@ -57,9 +59,6 @@ GuildManager::~GuildManager() void GuildManager::init() { - if (guildManager) - return; - int val = serverConfig.getValue("enableGuildBot", -1); if (val == -1) { @@ -71,7 +70,17 @@ void GuildManager::init() } mEnableGuildBot = val; if (mEnableGuildBot) - guildManager = new GuildManager(); + { + if (!guildManager) + guildManager = new GuildManager(); + else + guildManager->reload(); + } + else if (guildManager) + { + delete guildManager; + guildManager = 0; + } } void GuildManager::reload() @@ -80,12 +89,14 @@ void GuildManager::reload() mGotName = false; mHavePower = false; mRequest = false; + mSentNameRequest = false; + mSentInfoRequest = false; mTempList.clear(); if (socialWindow) { Guild *guild = Guild::getGuild(1); - if (guild) + if (guild && socialWindow) socialWindow->removeTab(guild); } delete mTab; @@ -109,7 +120,8 @@ void GuildManager::chat(std::string msg) void GuildManager::getNames(std::vector<std::string> &names) { Guild *guild = createGuild(); - guild->getNames(names); + if (guild) + guild->getNames(names); } void GuildManager::requestGuildInfo() @@ -117,15 +129,21 @@ void GuildManager::requestGuildInfo() if (mRequest) return; - if (!mGotName) + if (!mGotName && !mSentNameRequest) { + if (!Client::limitPackets(PACKET_CHAT)) + return; send("!info " + toString(tick_time)); mRequest = true; + mSentNameRequest = true; } - else if (!mGotInfo) + else if (!mGotInfo && !mSentInfoRequest && !mSentNameRequest) { + if (!Client::limitPackets(PACKET_CHAT)) + return; send("!getonlineinfo " + toString(tick_time)); mRequest = true; + mSentInfoRequest = true; } } @@ -135,8 +153,8 @@ void GuildManager::updateList() if (guild) { guild->setServerGuild(false); - std::vector<std::string>::iterator it = mTempList.begin(); - std::vector<std::string>::iterator it_end = mTempList.end(); + std::vector<std::string>::const_iterator it = mTempList.begin(); + std::vector<std::string>::const_iterator it_end = mTempList.end(); int i = 0; while (it != it_end) { @@ -174,6 +192,7 @@ void GuildManager::updateList() } } mTempList.clear(); + mSentInfoRequest = false; mGotInfo = true; } @@ -262,6 +281,7 @@ bool GuildManager::process(std::string msg) if (player_node) player_node->setGuildName(msg); mGotName = true; + mSentNameRequest = false; mRequest = false; return true; } @@ -300,6 +320,7 @@ bool GuildManager::process(std::string msg) if (player_node) player_node->setGuildName(msg); mGotName = true; + mSentNameRequest = false; mRequest = false; return true; } @@ -338,7 +359,7 @@ bool GuildManager::process(std::string msg) return true; } else if (!haveNick && (findCutLast(msg, " has been removed " - "from the Guild.") || findCutLast(msg," has left the Guild."))) + "from the Guild.") || findCutLast(msg, " has left the Guild."))) { Guild *guild = createGuild(); if (!guild) diff --git a/src/guildmanager.h b/src/guildmanager.h index 80014e352..5cd5e19cc 100644 --- a/src/guildmanager.h +++ b/src/guildmanager.h @@ -83,6 +83,8 @@ class GuildManager static bool mEnableGuildBot; bool mGotInfo; bool mGotName; + bool mSentInfoRequest; + bool mSentNameRequest; bool mHavePower; std::vector<std::string> mTempList; GuildChatTab *mTab; diff --git a/src/item.cpp b/src/item.cpp index d76eaf401..45a10f837 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -72,14 +72,9 @@ void Item::setId(int id, unsigned char color) ResourceManager *resman = ResourceManager::getInstance(); const ItemInfo &info = getInfo(); mTags = info.getTags(); -// logger->log("tag0=" + toString(mTags[1])); - -// for (int f = 0; f < mTags->size(); f ++) -// logger->log("tag: %d", (*mTags)[f]); SpriteDisplay display = info.getDisplay(); - std::string imagePath = paths.getStringValue("itemIcons") - + display.image; + std::string imagePath = paths.getStringValue("itemIcons") + display.image; std::string dye = combineDye2(imagePath, info.getDyeColorsString(color)); mImage = resman->getImage(dye); mDrawImage = resman->getImage(dye); diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index bf58c518a..ea9f9b90b 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -477,4 +477,4 @@ std::string KeyboardConfig::getKeyShortString(const std::string &key) const else if (key == "unknown key") return "u key"; return key; -}
\ No newline at end of file +} diff --git a/src/listener.h b/src/listener.h index f5efa8a53..8993c31af 100644 --- a/src/listener.h +++ b/src/listener.h @@ -38,7 +38,7 @@ class Listener void ignore(Channels channel); - virtual void event(Channels channel, const Event &event) = 0; + virtual void processEvent(Channels channel, const Event &event) = 0; }; } // namespace Mana diff --git a/src/localplayer.cpp b/src/localplayer.cpp index e9386a5ee..e17cf09c4 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -93,6 +93,8 @@ LocalPlayer *player_node = NULL; extern std::list<BeingCacheEntry*> beingInfoCache; extern OkDialog *weightNotice; extern int weightNoticeTime; +extern MiniStatusWindow *miniStatusWindow; +extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(int id, int subtype): Being(id, PLAYER, subtype, 0), @@ -123,7 +125,8 @@ LocalPlayer::LocalPlayer(int id, int subtype): mLastHitFrom(""), mWaitFor(""), mAdvertTime(0), - mBlockAdvert(false) + mBlockAdvert(false), + mNextStep(false) { logger->log1("LocalPlayer::LocalPlayer"); @@ -137,7 +140,10 @@ LocalPlayer::LocalPlayer(int id, int subtype): mUpdateName = true; mTextColor = &Theme::getThemeColor(Theme::PLAYER); - mNameColor = &userPalette->getColor(UserPalette::SELF); + if (userPalette) + mNameColor = &userPalette->getColor(UserPalette::SELF); + else + mNameColor = 0; mLastTargetX = 0; mLastTargetY = 0; @@ -222,8 +228,9 @@ void LocalPlayer::logic() if (mActivityTime == 0 || mLastAction != -1) mActivityTime = cur_time; - if (mAction != MOVE && !mNavigatePath.empty()) + if ((mAction != MOVE || mNextStep) && !mNavigatePath.empty()) { + mNextStep = false; int dist = 5; if (!mSyncPlayerMove) dist = 20; @@ -389,8 +396,6 @@ void LocalPlayer::setGMLevel(int level) Position LocalPlayer::getNextWalkPosition(unsigned char dir) { - // check for mMap? - // Compute where the next tile will be set. int dx = 0, dy = 0; if (dir & Being::UP) @@ -844,7 +849,17 @@ void LocalPlayer::nextTile(unsigned char dir A_UNUSED = 0) mPath.clear(); } - Being::nextTile(); + if (mPath.empty()) + { + if (mNavigatePath.empty() || mAction != MOVE) + setAction(STAND); + else + mNextStep = true; + } + else + { + Being::nextTile(); + } } #ifdef MANASERV_SUPPORT else @@ -890,11 +905,11 @@ void LocalPlayer::inviteToGuild(Being *being) // TODO: Allow user to choose which guild to invite being to // For now, just invite to the first guild you have permissions to invite with - std::map<int, Guild*>::iterator itr = mGuilds.begin(); - std::map<int, Guild*>::iterator itr_end = mGuilds.end(); + std::map<int, Guild*>::const_iterator itr = mGuilds.begin(); + std::map<int, Guild*>::const_iterator itr_end = mGuilds.end(); for (; itr != itr_end; ++itr) { - if (checkInviteRights(itr->second->getName())) + if (itr->second && checkInviteRights(itr->second->getName())) { Net::getGuildHandler()->invite(itr->second->getId(), being); return; @@ -1028,13 +1043,13 @@ void LocalPlayer::setDestination(int x, int y) else if (mInvertDirection == 1) { Uint8 newDir = 0; - if (mDirection&UP) + if (mDirection & UP) newDir |= DOWN; - if (mDirection&LEFT) + if (mDirection & LEFT) newDir |= RIGHT; - if (mDirection&DOWN) + if (mDirection & DOWN) newDir |= UP; - if (mDirection&RIGHT) + if (mDirection & RIGHT) newDir |= LEFT; Net::getPlayerHandler()->setDestination(x, y, newDir); @@ -1104,8 +1119,8 @@ void LocalPlayer::setWalkingDir(unsigned char dir) startWalking(dir); } #ifdef MANASERV_SUPPORT - else if (mAction == MOVE - && (Net::getNetworkType() == ServerInfo::MANASERV)) + else if (mAction == MOVE && (Net::getNetworkType() + == ServerInfo::MANASERV)) { nextTile(dir); } @@ -1415,7 +1430,7 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount, msg = N_("Unknown problem picking up item."); break; } - if (config.getBoolValue("showpickupchat")) + if (localChatTab && config.getBoolValue("showpickupchat")) localChatTab->chatLog(_(msg), BY_SERVER); if (mMap && config.getBoolValue("showpickupparticle")) @@ -1533,9 +1548,6 @@ void LocalPlayer::setGotoTarget(Being *target) } } -extern MiniStatusWindow *miniStatusWindow; -extern SkillDialog *skillDialog; - void LocalPlayer::handleStatusEffect(StatusEffect *effect, int effectId) { Being::handleStatusEffect(effect, effectId); @@ -1621,7 +1633,8 @@ void LocalPlayer::optionChanged(const std::string &value) mTradebot = config.getBoolValue("tradebot"); } -void LocalPlayer::event(Mana::Channels channel, const Mana::Event &event) +void LocalPlayer::processEvent(Mana::Channels channel, + const Mana::Event &event) { if (channel == Mana::CHANNEL_ATTRIBUTES) { @@ -1749,9 +1762,12 @@ void LocalPlayer::moveToTarget(unsigned int dist) if (mTarget) { - debugPath = mMap->findPath(static_cast<int>(playerPos.x - 16) / 32, + if (mMap) + { + debugPath = mMap->findPath(static_cast<int>(playerPos.x - 16) / 32, static_cast<int>(playerPos.y - 32) / 32, mTarget->getTileX(), mTarget->getTileY(), getWalkMask(), 0); + } if (debugPath.size() < dist) return; @@ -1799,9 +1815,9 @@ void LocalPlayer::moveToHome() { moveTo(mCrossX, mCrossY); } - else + else if (mMap) { - std::map<std::string, Vector>::iterator iter = + std::map<std::string, Vector>::const_iterator iter = mHomes.find(mMap->getProperty("_realfilename")); if (iter != mHomes.end()) @@ -1916,20 +1932,24 @@ void LocalPlayer::changeEquipmentBeforeAttack(Being* target) if (dx * dx + dy * dy < 8) allowSword = true; + const Inventory *inv = PlayerInfo::getInventory(); + if (!inv) + return; + //if attack distance for sword if (allowSword) { //finding sword - item = PlayerInfo::getInventory()->findItem(571, 0); + item = inv->findItem(571, 0); if (!item) - item = PlayerInfo::getInventory()->findItem(570, 0); + item = inv->findItem(570, 0); if (!item) - item = PlayerInfo::getInventory()->findItem(579, 0); + item = inv->findItem(579, 0); if (!item) - item = PlayerInfo::getInventory()->findItem(536, 0); + item = inv->findItem(536, 0); //no swords if (!item) @@ -1937,21 +1957,17 @@ void LocalPlayer::changeEquipmentBeforeAttack(Being* target) //if sword not equiped if (!item->isEquipped()) - { Net::getInventoryHandler()->equipItem(item); - } //if need equip shield too if (mAttackWeaponType == 3) { //finding shield - item = PlayerInfo::getInventory()->findItem(601, 0); + item = inv->findItem(601, 0); if (!item) - item = PlayerInfo::getInventory()->findItem(602, 0); + item = inv->findItem(602, 0); if (item && !item->isEquipped()) - { Net::getInventoryHandler()->equipItem(item); - } } } @@ -1959,29 +1975,22 @@ void LocalPlayer::changeEquipmentBeforeAttack(Being* target) else { //finding bow - item = PlayerInfo::getInventory()->findItem(545, 0); + item = inv->findItem(545, 0); if (!item) - item = PlayerInfo::getInventory()->findItem(530, 0); + item = inv->findItem(530, 0); //no bow if (!item) return; if (!item->isEquipped()) - { Net::getInventoryHandler()->equipItem(item); - } } - } - void LocalPlayer::crazyMove() { -// if (!allowAction()) -// return; - bool oldDisableCrazyMove = mDisableCrazyMove; mDisableCrazyMove = true; switch(mCrazyMoveType) @@ -2238,7 +2247,7 @@ void LocalPlayer::crazyMove7() void LocalPlayer::crazyMove8() { - if (mAction == MOVE) + if (mAction == MOVE || !mMap) return; int idx = 0; int dist = 1; @@ -2366,7 +2375,7 @@ void LocalPlayer::crazyMoveA() if (mAction == MOVE) return; - if (mMoveProgram.length() == 0) + if (mMoveProgram.empty()) return; if (mCrazyMoveState >= mMoveProgram.length()) @@ -2432,8 +2441,6 @@ void LocalPlayer::crazyMoveA() // direction command else if (mMoveProgram[mCrazyMoveState] == 'd') { - Uint8 dir = 0; - mCrazyMoveState ++; if (mCrazyMoveState < mMoveProgram.length()) @@ -2479,6 +2486,7 @@ void LocalPlayer::crazyMoveA() case 'L': if (Client::limitPackets(PACKET_DIRECTION)) { + Uint8 dir = 0; switch (getDirection()) { case UP : dir = Being::LEFT; break; @@ -2494,6 +2502,7 @@ void LocalPlayer::crazyMoveA() case 'R': if (Client::limitPackets(PACKET_DIRECTION)) { + Uint8 dir = 0; switch (getDirection()) { case UP : dir = Being::RIGHT; break; @@ -2509,6 +2518,7 @@ void LocalPlayer::crazyMoveA() case 'b': if (Client::limitPackets(PACKET_DIRECTION)) { + Uint8 dir = 0; switch (getDirection()) { case UP : dir = Being::DOWN; break; @@ -2595,11 +2605,8 @@ void LocalPlayer::crazyMoveA() mCrazyMoveState ++; } -// mCrazyMoveState ++; if (mCrazyMoveState >= mMoveProgram.length()) mCrazyMoveState = 0; - -// debugMsg("mCrazyMoveState: " + toString(mCrazyMoveState)); } bool LocalPlayer::isReachable(int x, int y, int maxCost) @@ -2844,8 +2851,6 @@ void LocalPlayer::specialMove(unsigned char direction) } else { -// if (direction != 0 && getInvertDirection() == 4) -// crazyMove(); setWalkingDir(direction); } @@ -2966,7 +2971,6 @@ void LocalPlayer::setMap(Map *map) Being::setMap(map); updateNavigateList(); -// updateCoords(); } void LocalPlayer::setHome() @@ -2984,7 +2988,7 @@ void LocalPlayer::setHome() if (mAction == SIT) { - std::map<std::string, Vector>::iterator iter = mHomes.find(key); + std::map<std::string, Vector>::const_iterator iter = mHomes.find(key); if (iter != mHomes.end()) { @@ -2998,8 +3002,6 @@ void LocalPlayer::setHome() mMap->updatePortalTile("", MapItem::EMPTY, static_cast<int>(pos.x), static_cast<int>(pos.y)); -// if (specialLayer) -// specialLayer->setTile(pos.x, pos.y, MapItem::EMPTY); mHomes.erase(key); socialWindow->removePortal(static_cast<int>(pos.x), static_cast<int>(pos.y)); @@ -3017,8 +3019,6 @@ void LocalPlayer::setHome() mHomes[key] = pos; mMap->updatePortalTile("home", MapItem::HOME, getTileX(), getTileY()); -// if (specialLayer) -// specialLayer->setTile(getTileX(), getTileY(), MapItem::HOME); socialWindow->addPortal(getTileX(), getTileY()); } MapItem *mapItem = specialLayer->getTile(getTileX(), getTileY()); @@ -3034,8 +3034,6 @@ void LocalPlayer::setHome() { MapItem *mapItem = specialLayer->getTile(getTileX(), getTileY()); int type = 0; -// if (!mapItem) -// return; std::map<std::string, Vector>::iterator iter = mHomes.find(key); if (iter != mHomes.end() && getTileX() == pos.x && getTileY() == pos.y) @@ -3046,8 +3044,6 @@ void LocalPlayer::setHome() if (!mapItem || mapItem->getType() == MapItem::EMPTY) { -// if (mAction == SIT) -// type = MapItem::HOME; if (mDirection & UP) type = MapItem::ARROW_UP; else if (mDirection & LEFT) @@ -3062,7 +3058,6 @@ void LocalPlayer::setHome() type = MapItem::EMPTY; } mMap->updatePortalTile("", type, getTileX(), getTileY()); -// mapItem = specialLayer->getTile(getTileX(), getTileY()); if (type != MapItem::EMPTY) { @@ -3090,7 +3085,7 @@ void LocalPlayer::saveHomes() std::string homeStr; std::stringstream ss(homeStr); - for (std::map<std::string, Vector>::iterator iter = mHomes.begin(); + for (std::map<std::string, Vector>::const_iterator iter = mHomes.begin(); iter != mHomes.end(); ++iter ) { Vector pos = (*iter).second; @@ -3336,8 +3331,7 @@ void LocalPlayer::updateCoords() if (mShowNavigePath) { - if (getTileX() != mOldTileX || getTileY() != mOldTileY) -// if (playerPos.x != mOldX || playerPos.y != mOldY) + if (mMap && (getTileX() != mOldTileX || getTileY() != mOldTileY)) { SpecialLayer *tmpLayer = mMap->getTempLayer(); if (!tmpLayer) @@ -3561,17 +3555,9 @@ void LocalPlayer::imitateOutfit(Being *player, int sprite) if (mImitationMode == 1 && !player_imitated.empty() && player->getName() == player_imitated) { -// logger->log("have equip %d", sprite); -// std::string filename = ItemDB::get( -// player->getId()).getSprite(mGender); -// logger->log("LocalPlayer::imitateOutfit sprite: " + toString(sprite)); -// logger->log("LocalPlayer::imitateOutfit sprite: " + toString(player->getNumberOfLayers())); -// logger->log("LocalPlayer::imitateOutfit spritecount: " + toString(player->getSpritesCount())); if (sprite < 0 || sprite >= player->getNumberOfLayers()) -// if (sprite < 0 || sprite >= 20) return; -// logger->log("after check"); AnimatedSprite *equipmentSprite = dynamic_cast<AnimatedSprite *>(player ->getSprite(sprite)); @@ -3621,7 +3607,8 @@ void LocalPlayer::imitateOutfit(Being *player, int sprite) void LocalPlayer::followMoveTo(Being *being, int x, int y) { - if (!mPlayerFollowed.empty() && being->getName() == mPlayerFollowed) + if (being && !mPlayerFollowed.empty() + && being->getName() == mPlayerFollowed) { mPickUpTarget = 0; setDestination(x, y); @@ -3661,9 +3648,9 @@ void LocalPlayer::followMoveTo(Being *being, int x1, int y1, int x2, int y2) { if (actorSpriteManager) { - Being *being = actorSpriteManager->findBeingByName( - mPlayerFollowed, Being::PLAYER); - setTarget(being); + Being *b = actorSpriteManager->findBeingByName( + mPlayerFollowed, Being::PLAYER); + setTarget(b); } } moveToTarget(); @@ -3790,7 +3777,7 @@ void LocalPlayer::updateNavigateList() { if (mMap) { - std::map<std::string, Vector>::iterator iter = + std::map<std::string, Vector>::const_iterator iter = mHomes.find(mMap->getProperty("_realfilename")); if (iter != mHomes.end()) diff --git a/src/localplayer.h b/src/localplayer.h index ebc347ce0..cb23d855e 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -386,7 +386,7 @@ class LocalPlayer : public Being, public ActorSpriteListener, */ void optionChanged(const std::string &value); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); /** * set a following player. @@ -601,6 +601,7 @@ class LocalPlayer : public Being, public ActorSpriteListener, bool mBlockAdvert; bool mEnableAdvert; bool mTradebot; + bool mNextStep; }; extern LocalPlayer *player_node; diff --git a/src/logger.cpp b/src/logger.cpp index 6790d622a..8ce92c6d6 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -51,9 +51,7 @@ Logger::Logger(): Logger::~Logger() { if (mLogFile.is_open()) - { mLogFile.close(); - } } void Logger::setLogFile(const std::string &logFilename) @@ -209,7 +207,8 @@ void Logger::error(const std::string &error_text) #elif defined __linux__ || __linux std::cerr << "Error: " << error_text << std::endl; std::string msg = "xmessage \"" + error_text + "\""; - system(msg.c_str()); + if (system(msg.c_str()) == -1) + std::cerr << "Error: " << error_text << std::endl; #else std::cerr << "Error: " << error_text << std::endl; #endif diff --git a/src/main.h b/src/main.h index f8b6d97ba..0348d2700 100644 --- a/src/main.h +++ b/src/main.h @@ -85,8 +85,8 @@ //define DEBUG_ALPHA_CACHE 1 //define DEBUG_OPENGL_LEAKS 1 -#define SMALL_VERSION "1.1.9.4" -#define CHECK_VERSION "01.01.09.04" +#define SMALL_VERSION "1.1.9.18" +#define CHECK_VERSION "01.01.09.18" #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ diff --git a/src/map.cpp b/src/map.cpp index 947bb8f09..dc742d6bb 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -54,8 +54,6 @@ #include "debug.h" -bool actorCompare(const Actor *a, const Actor *b); - /** * A location on a tile map. Used for pathfinding, open list. */ @@ -80,6 +78,17 @@ struct Location MetaTile *tile; }; +class ActorFunctuator +{ + public: + bool operator()(const Actor *a, const Actor *b) const + { + if (!a || !b) + return false; + return a->getPixelY() < b->getPixelY(); + } +} actorCompare; + TileAnimation::TileAnimation(Animation *ani): mLastImage(NULL) { @@ -104,19 +113,20 @@ void TileAnimation::update(int ticks) Image *img = mAnimation->getCurrentImage(); if (img != mLastImage) { - for (std::vector<std::pair<MapLayer*, int> >::iterator i = + for (std::vector<std::pair<MapLayer*, int> >::const_iterator i = mAffected.begin(); i != mAffected.end(); ++i) { - i->first->setTile(i->second, img); + if (i->first) + i->first->setTile(i->second, img); } mLastImage = img; } } -MapLayer::MapLayer(int x, int y, int width, int height, bool isFringeLayer): +MapLayer::MapLayer(int x, int y, int width, int height, bool fringeLayer): mX(x), mY(y), mWidth(width), mHeight(height), - mIsFringeLayer(isFringeLayer), + mIsFringeLayer(fringeLayer), mHighlightAttackRange(config.getBoolValue("highlightAttackRange")) { const int size = mWidth * mHeight; @@ -149,11 +159,6 @@ void MapLayer::setTile(int x, int y, Image *img) setTile(x + y * mWidth, img); } -Image* MapLayer::getTile(int x, int y) const -{ - return mTiles[x + y * mWidth]; -} - void MapLayer::draw(Graphics *graphics, int startX, int startY, int endX, int endY, int scrollX, int scrollY, int debugFlags) const @@ -187,13 +192,14 @@ void MapLayer::draw(Graphics *graphics, int startX, int startY, const int py0 = y32 + dy; - for (int x = startX; x < endX; x++) + Image **tilePtr = mTiles + startX + yWidth; + + for (int x = startX; x < endX; x++, tilePtr++) { const int x32 = x * 32; - const int tilePtr = x + yWidth; int c = 0; - Image *img = mTiles[tilePtr]; + Image *img = *tilePtr; if (img) { const int px = x32 + dx; @@ -202,7 +208,7 @@ void MapLayer::draw(Graphics *graphics, int startX, int startY, { int width = 0; // here need not draw over player position - c = getTileDrawWidth(tilePtr, endX - x, width); + c = getTileDrawWidth(img, endX - x, width); if (!c) { @@ -257,11 +263,11 @@ void MapLayer::updateSDL(Graphics *graphics, int startX, int startY, const int yWidth = y * mWidth; const int py0 = y * 32 + dy; + Image **tilePtr = mTiles + startX + yWidth; - for (int x = startX; x < endX; x++) + for (int x = startX; x < endX; x++, tilePtr++) { - const int tilePtr = x + yWidth; - Image *img = mTiles[tilePtr]; + Image *img = *tilePtr; if (img) { const int px = x * 32 + dx; @@ -284,13 +290,13 @@ void MapLayer::updateSDL(Graphics *graphics, int startX, int startY, void MapLayer::drawSDL(Graphics *graphics) { - MapRows::iterator rit = mTempRows.begin(); - MapRows::iterator rit_end = mTempRows.end(); + MapRows::const_iterator rit = mTempRows.begin(); + MapRows::const_iterator rit_end = mTempRows.end(); while (rit != rit_end) { MepRowImages *images = &(*rit)->images; - MepRowImages::iterator iit = images->begin(); - MepRowImages::iterator iit_end = images->end(); + MepRowImages::const_iterator iit = images->begin(); + MepRowImages::const_iterator iit_end = images->end(); while (iit != iit_end) { graphics->drawTile(*iit); @@ -338,10 +344,10 @@ void MapLayer::updateOGL(Graphics *graphics, int startX, int startY, const int py0 = y * 32 + dy; std::map<Image*, ImageVertexes*> imgSet; - for (int x = startX; x < endX; x++) + Image **tilePtr = mTiles + startX + yWidth; + for (int x = startX; x < endX; x++, tilePtr++) { - const int tilePtr = x + yWidth; - Image *img = mTiles[tilePtr]; + Image *img = *tilePtr; if (img) { const int px = x * 32 + dx; @@ -375,13 +381,13 @@ void MapLayer::updateOGL(Graphics *graphics, int startX, int startY, void MapLayer::drawOGL(Graphics *graphics) { - MapRows::iterator rit = mTempRows.begin(); - MapRows::iterator rit_end = mTempRows.end(); + MapRows::const_iterator rit = mTempRows.begin(); + MapRows::const_iterator rit_end = mTempRows.end(); while (rit != rit_end) { MepRowImages *images = &(*rit)->images; - MepRowImages::iterator iit = images->begin(); - MepRowImages::iterator iit_end = images->end(); + MepRowImages::const_iterator iit = images->begin(); + MepRowImages::const_iterator iit_end = images->end(); while (iit != iit_end) { graphics->drawTile(*iit); @@ -466,14 +472,14 @@ void MapLayer::drawFringe(Graphics *graphics, int startX, int startY, const int py0 = y32 + dy; const int py1 = y32 - scrollY; - for (int x = startX; x < endX; x++) + Image **tilePtr = mTiles + startX + yWidth; + for (int x = startX; x < endX; x++, tilePtr++) { const int x32 = x * 32; const int px1 = x32 - scrollX; - const int tilePtr = x + yWidth; int c = 0; - Image *img = mTiles[tilePtr]; + Image *img = *tilePtr; if (img) { const int px = x32 + dx; @@ -484,7 +490,7 @@ void MapLayer::drawFringe(Graphics *graphics, int startX, int startY, { int width = 0; // here need not draw over player position - c = getTileDrawWidth(tilePtr, endX - x, width); + c = getTileDrawWidth(img, endX - x, width); if (!c) { @@ -574,9 +580,9 @@ void MapLayer::drawFringe(Graphics *graphics, int startX, int startY, } } -int MapLayer::getTileDrawWidth(int tilePtr, int endX, int &width) const +int MapLayer::getTileDrawWidth(Image *img, int endX, int &width) const { - Image *img1 = mTiles[tilePtr]; + Image *img1 = img; int c = 0; if (!img1) { @@ -586,8 +592,7 @@ int MapLayer::getTileDrawWidth(int tilePtr, int endX, int &width) const width = img1->mBounds.w; for (int x = 1; x < endX; x++) { - tilePtr ++; - Image *img = mTiles[tilePtr]; + img ++; if (img != img1) break; c ++; @@ -762,9 +767,12 @@ void Map::initializeAmbientLayers() void Map::addLayer(MapLayer *layer) { - mLayers.push_back(layer); - if (layer->isFringeLayer() && !mFringeLayer) - mFringeLayer = layer; + if (layer) + { + mLayers.push_back(layer); + if (layer->isFringeLayer() && !mFringeLayer) + mFringeLayer = layer; + } } void Map::addTileset(Tileset *tileset) @@ -778,22 +786,15 @@ void Map::addTileset(Tileset *tileset) mMaxTileHeight = tileset->getHeight(); } -bool actorCompare(const Actor *a, const Actor *b) -{ - if (!a || !b) - return false; - - return a->getPixelY() < b->getPixelY(); -} - void Map::update(int ticks) { // Update animated tiles - for (std::map<int, TileAnimation*>::iterator + for (std::map<int, TileAnimation*>::const_iterator iAni = mTileAnimations.begin(); iAni != mTileAnimations.end(); ++iAni) { - iAni->second->update(ticks); + if (iAni->second) + iAni->second->update(ticks); } } @@ -826,7 +827,7 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY) // Draw backgrounds drawAmbientLayers(graphics, BACKGROUND_LAYERS, mOverlayDetail); - if (mDebugFlags == MAP_BLACKWHITE) + if (mDebugFlags == MAP_BLACKWHITE && userPalette) { graphics->setColor(userPalette->getColorWithAlpha( UserPalette::WALKABLE_HIGHLIGHT)); @@ -978,23 +979,26 @@ void Map::drawCollision(Graphics *graphics, int scrollX, int scrollY, for (int y = startY; y < endY; y++) { - for (int x = startX; x < endX; x++) + const int yWidth = y * mWidth; + int tilePtr = startX + yWidth; + for (int x = startX; x < endX; x++, tilePtr++) { int width = 0; int x0 = x; - if (mMetaTiles[x + y * mWidth].blockmask & BLOCKMASK_WALL) + if (mMetaTiles[tilePtr].blockmask & BLOCKMASK_WALL) { width = 32; - for (int x2 = x + 1; x < endX; x2 ++) + for (int x2 = tilePtr + 1; x < endX; x2 ++) { - if (!(mMetaTiles[x2 + y * mWidth].blockmask + if (!(mMetaTiles[x2].blockmask & BLOCKMASK_WALL)) { break; } width += 32; x ++; + tilePtr ++; } if (width && userPalette) { @@ -1008,19 +1012,20 @@ void Map::drawCollision(Graphics *graphics, int scrollX, int scrollY, } } - if (x < endX && mMetaTiles[x + y * mWidth].blockmask + if (x < endX && mMetaTiles[tilePtr].blockmask & BLOCKMASK_AIR) { width = 32; - for (int x2 = x + 1; x < endX; x2 ++) + for (int x2 = tilePtr + 1; x < endX; x2 ++) { - if (!(mMetaTiles[x2 + y * mWidth].blockmask + if (!(mMetaTiles[x2].blockmask & BLOCKMASK_AIR)) { break; } width += 32; x ++; + tilePtr ++; } if (width && userPalette) { @@ -1034,19 +1039,20 @@ void Map::drawCollision(Graphics *graphics, int scrollX, int scrollY, } } - if (x < endX && mMetaTiles[x + y * mWidth].blockmask + if (x < endX && mMetaTiles[tilePtr].blockmask & BLOCKMASK_WATER) { width = 32; - for (int x2 = x + 1; x < endX; x2 ++) + for (int x2 = tilePtr + 1; x < endX; x2 ++) { - if (!(mMetaTiles[x2 + y * mWidth].blockmask + if (!(mMetaTiles[x2].blockmask & BLOCKMASK_WATER)) { break; } width += 32; x ++; + tilePtr ++; } if (width && userPalette) { @@ -1079,7 +1085,7 @@ void Map::updateAmbientLayers(float scrollX, float scrollY) float dy = scrollY - mLastAScrollY; int timePassed = get_elapsed_time(lastTick); - std::vector<AmbientLayer*>::iterator i; + std::vector<AmbientLayer*>::const_iterator i; for (i = mBackgrounds.begin(); i != mBackgrounds.end(); ++i) (*i)->update(timePassed, dx, dy); @@ -1116,10 +1122,11 @@ void Map::drawAmbientLayers(Graphics *graphics, LayerType type, } // Draw overlays - for (std::vector<AmbientLayer*>::iterator i = layers->begin(); + for (std::vector<AmbientLayer*>::const_iterator i = layers->begin(); i != layers->end(); ++i) { - (*i)->draw(graphics, graphics->mWidth, graphics->mHeight); + if (*i) + (*i)->draw(graphics, graphics->mWidth, graphics->mHeight); // Detail 1: only one overlay, higher: all overlays if (detail == 1) @@ -1129,7 +1136,7 @@ void Map::drawAmbientLayers(Graphics *graphics, LayerType type, Tileset *Map::getTilesetWithGid(int gid) const { - if (gid < mIndexedTilesetsSize) + if (gid >= 0 && gid < mIndexedTilesetsSize) return mIndexedTilesets[gid]; else return 0; @@ -1589,20 +1596,20 @@ void Map::addParticleEffect(const std::string &effectFile, particleEffects.push_back(newEffect); } -void Map::initializeParticleEffects(Particle *particleEngine) +void Map::initializeParticleEffects(Particle *engine) { - if (!particleEngine) + if (!engine) return; Particle *p; if (config.getBoolValue("particleeffects")) { - for (std::vector<ParticleEffectData>::iterator + for (std::vector<ParticleEffectData>::const_iterator i = particleEffects.begin(); i != particleEffects.end(); ++i) { - p = particleEngine->addEffect(i->file, i->x, i->y); + p = engine->addEffect(i->file, i->x, i->y); if (p && i->w > 0 && i->h > 0) p->adjustEmitterSize(i->w, i->h); } @@ -1650,12 +1657,7 @@ void Map::addExtraLayer() comment += " " + buf; int type = atoi(type1.c_str()); -/* - MapItem *item = new MapItem(atoi(type.c_str()), comment); - int x1 = atoi(x.c_str()); - int y1 = atoi(y.c_str()); - mSpecialLayer->setTile(x1, y1, item); -*/ + if (comment.empty()) { if (type < MapItem::ARROW_UP @@ -1785,8 +1787,8 @@ void Map::updatePortalTile(const std::string &name, int type, MapItem *Map::findPortalXY(int x, int y) { - std::vector<MapItem*>::iterator it; - std::vector<MapItem*>::iterator it_end; + std::vector<MapItem*>::const_iterator it; + std::vector<MapItem*>::const_iterator it_end; for (it = mMapPortals.begin(), it_end = mMapPortals.end(); it != it_end; ++it) @@ -1849,7 +1851,7 @@ std::string Map::getObjectData(unsigned x, unsigned y, int type) if (!list) return ""; - std::vector<MapObject>::iterator it = list->objects.begin(); + std::vector<MapObject>::const_iterator it = list->objects.begin(); while (it != list->objects.end()) { if ((*it).type == type) @@ -2102,14 +2104,9 @@ void SpecialLayer::setTile(int x, int y, int type) int idx = x + y * mWidth; if (mTiles[idx]) - { mTiles[idx]->setType(type); - } else - { - delete mTiles[idx]; mTiles[idx] = new MapItem(type); - } mTiles[idx]->setPos(x, y); } @@ -2157,8 +2154,6 @@ void SpecialLayer::draw(Graphics *graphics, int startX, int startY, if (endY > mHeight) endY = mHeight; -// MapSprites::const_iterator si = sprites.begin(); - for (int y = startY; y < endY; y++) { for (int x = startX; x < endX; x++) @@ -2214,7 +2209,7 @@ MapItem::~MapItem() void MapItem::setType(int type) { - std::string name = ""; + std::string name(""); mType = type; if (mImage) mImage->decRef(); @@ -2285,7 +2280,7 @@ void MapItem::draw(Graphics *graphics, int x, int y, int dx, int dy) default: break; } - if (!mName.empty() && mType != PORTAL && mType != EMPTY) + if (!mName.empty() && mType != PORTAL && mType != EMPTY && userPalette) { gcn::Font *font = gui->getFont(); if (font) @@ -96,10 +96,10 @@ struct MetaTile class MapObject { public: - MapObject(int type, std::string data) + MapObject(int type0, std::string data0) { - this->type = type; - this->data = data; + type = type0; + data = data0; } int type; @@ -161,11 +161,6 @@ class MapLayer: public ConfigListener void setTile(int index, Image *img) { mTiles[index] = img; } /** - * Get tile image, with x and y in layer coordinates. - */ - Image *getTile(int x, int y) const; - - /** * Draws this layer to the given graphics context. The coordinates are * expected to be in map range and will be translated to local layer * coordinates and clipped to the layer's dimensions. @@ -223,7 +218,7 @@ class MapLayer: public ConfigListener void optionChanged(const std::string &value); - int getTileDrawWidth(int tilePtr, int endX, int &width) const; + int getTileDrawWidth(Image *img, int endX, int &width) const; // void initTileInfo(); diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp index bace077cd..2b3f15afa 100644 --- a/src/mumblemanager.cpp +++ b/src/mumblemanager.cpp @@ -188,7 +188,7 @@ void MumbleManager::setAction(int action) case 3: /* SIT */ mLinkedMemCache.fAvatarPosition[1] = 1.0f; break; - case 4: /* DEAD */ + case 4: /* DEAD */ default: mLinkedMemCache.fAvatarPosition[1] = 0.0f; break; diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 685562d6f..f38d17a59 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -70,7 +70,7 @@ void BuySellHandler::requestSellList(std::string nick) else { if (chatWindow) - chatWindow->whisper(nick, data, BY_PLAYER); + chatWindow->addWhisper(nick, data, BY_PLAYER); } } @@ -89,7 +89,7 @@ void BuySellHandler::requestBuyList(std::string nick) else { if (chatWindow) - chatWindow->whisper(nick, data, BY_PLAYER); + chatWindow->addWhisper(nick, data, BY_PLAYER); } } @@ -102,12 +102,12 @@ void BuySellHandler::sendBuyRequest(std::string nick, ShopItem* item, return; } std::string data = strprintf("!buyitem %d %d %d", - item->getId(), item->getPrice(), amount); + item->getId(), item->getPrice(), amount); if (config.getBoolValue("hideShopMessages")) Net::getChatHandler()->privateMessage(nick, data); else - chatWindow->whisper(nick, data, BY_PLAYER); + chatWindow->addWhisper(nick, data, BY_PLAYER); } void BuySellHandler::sendSellRequest(std::string nick, ShopItem* item, @@ -120,12 +120,12 @@ void BuySellHandler::sendSellRequest(std::string nick, ShopItem* item, } std::string data = strprintf("!sellitem %d %d %d", - item->getId(), item->getPrice(), amount); + item->getId(), item->getPrice(), amount); if (config.getBoolValue("hideShopMessages")) Net::getChatHandler()->privateMessage(nick, data); else - chatWindow->whisper(nick, data, BY_PLAYER); + chatWindow->addWhisper(nick, data, BY_PLAYER); } void BuySellHandler::processNpcBuySellChoice(Net::MessageIn &msg) diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 5737cc2b2..c18b1bb9a 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -125,7 +125,7 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg) case 0x01: if (chatWindow) { - chatWindow->whisper(nick, + chatWindow->addWhisper(nick, strprintf(_("Whisper could not be " "sent, %s is offline."), nick.c_str()), BY_SERVER); } @@ -133,7 +133,7 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg) case 0x02: if (chatWindow) { - chatWindow->whisper(nick, + chatWindow->addWhisper(nick, strprintf(_("Whisper could not " "be sent, ignored by %s."), nick.c_str()), BY_SERVER); @@ -183,7 +183,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) if (tradeBot) { if (showMsg && chatWindow) - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); shopWindow->giveList(nick, ShopWindow::SELL); } @@ -193,7 +193,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) if (tradeBot) { if (showMsg && chatWindow) - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); shopWindow->giveList(nick, ShopWindow::BUY); } @@ -201,7 +201,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) else if (chatMsg.find("!buyitem ") == 0) { if (showMsg && chatWindow) - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); if (tradeBot) { shopWindow->processRequest(nick, chatMsg, @@ -211,7 +211,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) else if (chatMsg.find("!sellitem ") == 0) { if (showMsg && chatWindow) - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); if (tradeBot) { shopWindow->processRequest(nick, chatMsg, @@ -223,7 +223,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) { chatMsg = chatMsg.erase(0, 2); if (showMsg && chatWindow) - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); if (chatMsg.find("B1") == 0 || chatMsg.find("S1") == 0) { @@ -232,12 +232,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) } else if (chatWindow) { - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); } } else if (chatWindow) { - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); } } else @@ -246,7 +246,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) || (chatMsg.find("!selllist") != 0 && chatMsg.find("!buylist") != 0))) { - chatWindow->whisper(nick, chatMsg); + chatWindow->addWhisper(nick, chatMsg); } } } diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 04c13572f..a202cbc86 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -46,7 +46,8 @@ GameHandler::GameHandler() listen(Mana::CHANNEL_GAME); } -void GameHandler::event(Mana::Channels channel, const Mana::Event &event) +void GameHandler::processEvent(Mana::Channels channel, + const Mana::Event &event) { if (channel == Mana::CHANNEL_GAME) { diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index abfaaa6b4..6d8b88bd4 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -43,7 +43,8 @@ class GameHandler : public Net::GameHandler, public Mana::Listener public: GameHandler(); - virtual void event(Mana::Channels channel, const Mana::Event &event); + virtual void processEvent(Mana::Channels channel, + const Mana::Event &event); virtual void who(); diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index ab030be83..9836f5fa9 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -101,7 +101,7 @@ bool GuildTab::handleCommand(const std::string &type, const std::string &args) else if (type == "notice" && taGuild) { std::string str1 = args.substr(0, 60); - std::string str2 = ""; + std::string str2(""); if (args.size() > 60) str2 = args.substr(60); Net::getGuildHandler()->changeNotice(taGuild->getId(), str1, str2); diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 01000f8f1..1de681007 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -434,8 +434,8 @@ void InventoryHandler::processPlayerStorageStatus(Net::MessageIn &msg) if (!mStorage) mStorage = new Inventory(Inventory::STORAGE, size); - Ea::InventoryItems::iterator it = mInventoryItems.begin(); - Ea::InventoryItems::iterator it_end = mInventoryItems.end(); + Ea::InventoryItems::const_iterator it = mInventoryItems.begin(); + Ea::InventoryItems::const_iterator it_end = mInventoryItems.end(); for (; it != it_end; ++it) { mStorage->setItem((*it).slot, (*it).id, (*it).quantity, diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 4be4ddaa6..cb1e84673 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -114,15 +114,15 @@ class InventoryItem int refine; bool equip; - InventoryItem(int slot, int id, int quantity, int refine, - unsigned char color, bool equip) + InventoryItem(int slot0, int id0, int quantity0, int refine0, + unsigned char color0, bool equip0) { - this->slot = slot; - this->id = id; - this->quantity = quantity; - this->refine = refine; - this->color = color; - this->equip = equip; + slot = slot0; + id = id0; + quantity = quantity0; + refine = refine0; + color = color0; + equip = equip0; } }; diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index bd6f19d97..e006b9c71 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -203,7 +203,7 @@ void PartyHandler::processPartyInvited(Net::MessageIn &msg) { int id = msg.readInt32(); std::string partyName = msg.readString(24); - std::string nick = ""; + std::string nick(""); Being *being; if (actorSpriteManager) diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp index 3b2306feb..42db6e621 100644 --- a/src/net/manaserv/charhandler.cpp +++ b/src/net/manaserv/charhandler.cpp @@ -138,7 +138,7 @@ void CharHandler::handleCharacterCreateResponse(Net::MessageIn &msg) if (errMsg != ERRMSG_OK) { // Character creation failed - std::string errorMessage = ""; + std::string errorMessage(""); switch (errMsg) { case ERRMSG_NO_LOGIN: @@ -212,7 +212,7 @@ void CharHandler::handleCharacterDeleteResponse(Net::MessageIn &msg) else { // Character deletion failed - std::string errorMessage = ""; + std::string errorMessage(""); switch (errMsg) { case ERRMSG_NO_LOGIN: diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index 85323b11a..16552018e 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -231,7 +231,7 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg) std::string userNick = msg.readString(); std::string chatMsg = msg.readString(); - chatWindow->whisper(userNick, chatMsg); + chatWindow->addWhisper(userNick, chatMsg); } void ChatHandler::handleAnnouncement(Net::MessageIn &msg) diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index 7c95033a8..2eea6cdf6 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -64,7 +64,7 @@ namespace ManaServ Connection *accountServerConnection = 0; Connection *chatServerConnection = 0; Connection *gameServerConnection = 0; -std::string netToken = ""; +std::string netToken(""); ServerInfo gameServer; ServerInfo chatServer; @@ -176,8 +176,8 @@ void GeneralHandler::clearHandlers() clearNetworkHandlers(); } -void GeneralHandler::event(Mana::Channels channel, - const Mana::Event &event) +void GeneralHandler::processEvent(Mana::Channels channel, + const Mana::Event &event) { if (channel == Mana::CHANNEL_CLIENT) { diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h index 90587eeb3..ccdddbbe6 100644 --- a/src/net/manaserv/generalhandler.h +++ b/src/net/manaserv/generalhandler.h @@ -56,7 +56,7 @@ class GeneralHandler : public Net::GeneralHandler, public Mana::Listener void clearHandlers(); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); protected: MessageHandlerPtr mBeingHandler; diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp index 53e83e4ec..b83bc5748 100644 --- a/src/net/manaserv/network.cpp +++ b/src/net/manaserv/network.cpp @@ -45,7 +45,7 @@ namespace ManaServ { typedef std::map<unsigned short, MessageHandler*> MessageHandlers; -typedef MessageHandlers::iterator MessageHandlerIterator; +typedef MessageHandlers::const_iterator MessageHandlerIterator; static MessageHandlers mMessageHandlers; void initialize() @@ -96,17 +96,13 @@ Connection *getConnection() void registerHandler(MessageHandler *handler) { for (const Uint16 *i = handler->handledMessages; *i; i++) - { mMessageHandlers[*i] = handler; - } } void unregisterHandler(MessageHandler *handler) { for (const Uint16 *i = handler->handledMessages; *i; i++) - { mMessageHandlers.erase(*i); - } } void clearNetworkHandlers() diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp index efd2ab2bc..8ff2c5d21 100644 --- a/src/net/manaserv/npchandler.cpp +++ b/src/net/manaserv/npchandler.cpp @@ -60,9 +60,7 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) { Being *being = actorSpriteManager->findBeing(msg.readInt16()); if (!being || being->getType() != ActorSprite::NPC) - { return; - } int npcId = being->getId(); NpcDialogs::iterator diag = mNpcDialogs.find(npcId); diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 5bfeefdb6..8f177f906 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -190,12 +190,11 @@ std::string MessageIn::readString(int length) char const *stringEnd = static_cast<char const *>(memchr(stringBeg, '\0', length)); - std::string readString(stringBeg, - stringEnd ? stringEnd - stringBeg : length); + std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : length); mPos += length; PacketCounters::incInBytes(length); - DEBUGLOG("readString: " + readString); - return readString; + DEBUGLOG("readString: " + str); + return str; } std::string MessageIn::readRawString(int length) @@ -215,12 +214,11 @@ std::string MessageIn::readRawString(int length) char const *stringBeg = mData + mPos; char const *stringEnd = static_cast<char const *>(memchr(stringBeg, '\0', length)); - std::string readString(stringBeg, - stringEnd ? stringEnd - stringBeg : length); + std::string str(stringBeg, stringEnd ? stringEnd - stringBeg : length); mPos += length; PacketCounters::incInBytes(length); - DEBUGLOG("readString: " + readString); + DEBUGLOG("readString: " + str); if (stringEnd) { @@ -234,11 +232,11 @@ std::string MessageIn::readRawString(int length) { DEBUGLOG("readString2: " + hiddenPart); - return readString + "|" + hiddenPart; + return str + "|" + hiddenPart; } } - return readString; + return str; } } diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index a332b04fa..5d5034938 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -89,7 +89,7 @@ void AdminHandler::localAnnounce(const std::string &text) outMsg.writeString(text, static_cast<int>(text.length())); } -void AdminHandler::hide(bool hide A_UNUSED) +void AdminHandler::hide(bool h A_UNUSED) { MessageOut outMsg(CMSG_ADMIN_HIDE); outMsg.writeInt32(0); //unused diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 79f41dece..53fd4831f 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -50,7 +50,7 @@ class AdminHandler : public MessageHandler, public Ea::AdminHandler void localAnnounce(const std::string &text); - void hide(bool hide); + void hide(bool h); void kick(int playerId); }; diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index ce2db733f..845c30f19 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -27,6 +27,7 @@ #include "client.h" #include "effectmanager.h" #include "guild.h" +#include "guildmanager.h" #include "keyboardconfig.h" #include "localplayer.h" #include "logger.h" @@ -444,7 +445,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) Being *dstBeing; int hairStyle, hairColor; unsigned char colors[9]; - Uint8 dir; + // An update about a player, potentially including movement. int id = msg.readInt32(); @@ -468,7 +469,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) return; } - dir = dstBeing->getDirectionDelayed(); + Uint8 dir = dstBeing->getDirectionDelayed(); if (dir) { if (dir != dstBeing->getDirection()) @@ -505,10 +506,17 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) guild = msg.readInt32(); // guild - if (guild == 0) - dstBeing->clearGuilds(); - else - dstBeing->setGuild(Guild::getGuild(static_cast<short>(guild))); + if (!guildManager || !GuildManager::getEnableGuildBot()) + { + if (guild == 0) + { + dstBeing->clearGuilds(); + } + else + { + dstBeing->setGuild(Guild::getGuild(static_cast<short>(guild))); + } + } msg.readInt16(); // emblem msg.readInt16(); // manner @@ -560,10 +568,10 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) if (srcX != dstX || srcY != dstY) { - int dir = dstBeing->calcDirection(dstX, dstY); + int d = dstBeing->calcDirection(dstX, dstY); - if (dir && dstBeing->getDirection() != dir) - dstBeing->setDirectionDelayed(static_cast<Uint8>(dir)); + if (d && dstBeing->getDirection() != d) + dstBeing->setDirectionDelayed(static_cast<Uint8>(d)); } if (player_node->getCurrentAction() != Being::STAND) @@ -576,7 +584,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) } else { - Uint8 dir; +// Uint8 dir; Uint16 x, y; msg.readCoordinates(x, y, dir); dstBeing->setTileCoords(x, y); diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index e1b565399..c6ebc000c 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -240,8 +240,8 @@ void GeneralHandler::clearHandlers() mNetwork->clearHandlers(); } -void GeneralHandler::event(Mana::Channels channel, - const Mana::Event &event) +void GeneralHandler::processEvent(Mana::Channels channel, + const Mana::Event &event) { if (channel == Mana::CHANNEL_GAME) { diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 27186fcc8..5e6c9f18f 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -59,7 +59,7 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler, void clearHandlers(); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); void reloadPartially(); diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 43271671e..f80dd6e69 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -194,7 +194,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg, bool haveLength) const int npcId = msg.readInt32(); - NpcDialogs::iterator diag = mNpcDialogs.find(npcId); + NpcDialogs::const_iterator diag = mNpcDialogs.find(npcId); mDialog = 0; if (diag == mNpcDialogs.end()) diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index e93066b96..46e482df6 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -517,22 +517,22 @@ bool OpenGL1Graphics::pushClipArea(gcn::Rectangle area) if (!mClipStack.empty()) { - transX = -mClipStack.top().xOffset; - transY = -mClipStack.top().yOffset; + const gcn::ClipRectangle &clipArea = mClipStack.top(); + transX = -clipArea.xOffset; + transY = -clipArea.yOffset; } bool result = gcn::Graphics::pushClipArea(area); - transX += mClipStack.top().xOffset; - transY += mClipStack.top().yOffset; + const gcn::ClipRectangle &clipArea = mClipStack.top(); + transX += clipArea.xOffset; + transY += clipArea.yOffset; glPushMatrix(); glTranslatef(static_cast<GLfloat>(transX), static_cast<GLfloat>(transY), 0); - glScissor(mClipStack.top().x, - mTarget->h - mClipStack.top().y - mClipStack.top().height, - mClipStack.top().width, - mClipStack.top().height); + glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + clipArea.width, clipArea.height); return result; } @@ -545,10 +545,9 @@ void OpenGL1Graphics::popClipArea() return; glPopMatrix(); - glScissor(mClipStack.top().x, - mTarget->h - mClipStack.top().y - mClipStack.top().height, - mClipStack.top().width, - mClipStack.top().height); + const gcn::ClipRectangle &clipArea = mClipStack.top(); + glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + clipArea.width, clipArea.height); } void OpenGL1Graphics::setColor(const gcn::Color& color) diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index f918a5c0d..2ec5db490 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -486,24 +486,26 @@ void OpenGLGraphics::drawImagePattern(Image *image, int x, int y, int w, int h) static_cast<GLubyte>(mColor.a)); } -void OpenGLGraphics::drawRescaledImagePattern(Image *image, int x, int y, - int w, int h, int scaledWidth, +void OpenGLGraphics::drawRescaledImagePattern(Image *image, + int x, int y, + int w, int h, + int scaledWidth, int scaledHeight) { if (!image) return; + if (scaledWidth == 0 || scaledHeight == 0) + return; + const int srcX = image->mBounds.x; const int srcY = image->mBounds.y; - const int iw = scaledWidth; - const int ih = scaledHeight; + const int iw = image->getWidth(); + const int ih = image->getHeight(); if (iw == 0 || ih == 0) return; - const float tw = static_cast<float>(image->getTextureWidth()); - const float th = static_cast<float>(image->getTextureHeight()); - glColor4f(1.0f, 1.0f, 1.0f, image->mAlpha); bindTexture(Image::mTextureType, image->mGLImage); @@ -513,23 +515,32 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image, int x, int y, unsigned int vp = 0; const unsigned int vLimit = vertexBufSize * 4; - float texX1 = static_cast<float>(srcX) / tw; - float texY1 = static_cast<float>(srcY) / th; - // Draw a set of textured rectangles if (image->mTextureType == GL_TEXTURE_2D) { - for (int py = 0; py < h; py += ih) + const float tw = static_cast<float>(image->getTextureWidth()); + const float th = static_cast<float>(image->getTextureHeight()); + + const float texX1 = static_cast<float>(srcX) / tw; + const float texY1 = static_cast<float>(srcY) / th; + + const float tFractionW = iw / tw; + const float tFractionH = ih / th; + + for (int py = 0; py < h; py += scaledHeight) { - const int height = (py + ih >= h) ? h - py : ih; + const int height = (py + scaledHeight >= h) + ? h - py : scaledHeight; const int dstY = y + py; - for (int px = 0; px < w; px += iw) + for (int px = 0; px < w; px += scaledWidth) { - int width = (px + iw >= w) ? w - px : iw; + int width = (px + scaledWidth >= w) ? w - px : scaledWidth; int dstX = x + px; + const float visibleFractionW = (float) width / scaledWidth; + const float visibleFractionH = (float) height / scaledHeight; - float texX2 = static_cast<float>(srcX + width) / tw; - float texY2 = static_cast<float>(srcY + height) / th; + const float texX2 = texX1 + tFractionW * visibleFractionW; + const float texY2 = texY1 + tFractionH * visibleFractionH; mFloatTexArray[vp + 0] = texX1; mFloatTexArray[vp + 1] = texY1; @@ -546,14 +557,14 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image, int x, int y, mIntVertArray[vp + 0] = dstX; mIntVertArray[vp + 1] = dstY; - mIntVertArray[vp + 2] = dstX + scaledWidth; + mIntVertArray[vp + 2] = dstX + width; mIntVertArray[vp + 3] = dstY; - mIntVertArray[vp + 4] = dstX + scaledWidth; - mIntVertArray[vp + 5] = dstY + scaledHeight; + mIntVertArray[vp + 4] = dstX + width; + mIntVertArray[vp + 5] = dstY + height; mIntVertArray[vp + 6] = dstX; - mIntVertArray[vp + 7] = dstY + scaledHeight; + mIntVertArray[vp + 7] = dstY + height; vp += 8; if (vp >= vLimit) @@ -568,38 +579,42 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image, int x, int y, } else { - for (int py = 0; py < h; py += ih) + const float scaleFactorW = (float) scaledWidth / iw; + const float scaleFactorH = (float) scaledHeight / ih; + + for (int py = 0; py < h; py += scaledHeight) { - const int height = (py + ih >= h) ? h - py : ih; + const int height = (py + scaledHeight >= h) + ? h - py : scaledHeight; const int dstY = y + py; - for (int px = 0; px < w; px += iw) + for (int px = 0; px < w; px += scaledWidth) { - int width = (px + iw >= w) ? w - px : iw; + int width = (px + scaledWidth >= w) ? w - px : scaledWidth; int dstX = x + px; mIntTexArray[vp + 0] = srcX; mIntTexArray[vp + 1] = srcY; - mIntTexArray[vp + 2] = srcX + width; + mIntTexArray[vp + 2] = srcX + width / scaleFactorW; mIntTexArray[vp + 3] = srcY; - mIntTexArray[vp + 4] = srcX + width; - mIntTexArray[vp + 5] = srcY + height; + mIntTexArray[vp + 4] = srcX + width / scaleFactorW; + mIntTexArray[vp + 5] = srcY + height / scaleFactorH; mIntTexArray[vp + 6] = srcX; - mIntTexArray[vp + 7] = srcY + height; + mIntTexArray[vp + 7] = srcY + height / scaleFactorH; mIntVertArray[vp + 0] = dstX; mIntVertArray[vp + 1] = dstY; - mIntVertArray[vp + 2] = dstX + scaledWidth; + mIntVertArray[vp + 2] = dstX + width; mIntVertArray[vp + 3] = dstY; - mIntVertArray[vp + 4] = dstX + scaledWidth; - mIntVertArray[vp + 5] = dstY + scaledHeight; + mIntVertArray[vp + 4] = dstX + width; + mIntVertArray[vp + 5] = dstY + height; mIntVertArray[vp + 6] = dstX; - mIntVertArray[vp + 7] = dstY + scaledHeight; + mIntVertArray[vp + 7] = dstY + height; vp += 8; if (vp >= vLimit) @@ -631,15 +646,15 @@ void OpenGLGraphics::drawImagePattern2(GraphicsVertexes *vert, Image *image) setTexturingAndBlending(true); std::vector<GLint*> *intVertPool = ogl->getIntVertPool(); - std::vector<GLint*>::iterator iv; + std::vector<GLint*>::const_iterator iv; std::vector<int> *vp = ogl->getVp(); - std::vector<int>::iterator ivp; + std::vector<int>::const_iterator ivp; // Draw a set of textured rectangles if (image->mTextureType == GL_TEXTURE_2D) { std::vector<GLfloat*> *floatTexPool = ogl->getFloatTexPool(); - std::vector<GLfloat*>::iterator ft; + std::vector<GLfloat*>::const_iterator ft; for (iv = intVertPool->begin(), ft = floatTexPool->begin(), ivp = vp->begin(); @@ -653,7 +668,7 @@ void OpenGLGraphics::drawImagePattern2(GraphicsVertexes *vert, Image *image) else { std::vector<GLint*> *intTexPool = ogl->getIntTexPool(); - std::vector<GLint*>::iterator it; + std::vector<GLint*>::const_iterator it; for (iv = intVertPool->begin(), it = intTexPool->begin(), ivp = vp->begin(); @@ -1010,6 +1025,9 @@ SDL_Surface* OpenGLGraphics::getScreenshot() w, h, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000); + if (!screenshot) + return 0; + if (SDL_MUSTLOCK(screenshot)) SDL_LockSurface(screenshot); @@ -1048,22 +1066,22 @@ bool OpenGLGraphics::pushClipArea(gcn::Rectangle area) if (!mClipStack.empty()) { - transX = -mClipStack.top().xOffset; - transY = -mClipStack.top().yOffset; + const gcn::ClipRectangle &clipArea = mClipStack.top(); + transX = -clipArea.xOffset; + transY = -clipArea.yOffset; } bool result = gcn::Graphics::pushClipArea(area); - transX += mClipStack.top().xOffset; - transY += mClipStack.top().yOffset; + const gcn::ClipRectangle &clipArea = mClipStack.top(); + transX += clipArea.xOffset; + transY += clipArea.yOffset; glPushMatrix(); glTranslatef(static_cast<GLfloat>(transX), static_cast<GLfloat>(transY), 0); - glScissor(mClipStack.top().x, - mTarget->h - mClipStack.top().y - mClipStack.top().height, - mClipStack.top().width, - mClipStack.top().height); + glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + clipArea.width, clipArea.height); return result; } @@ -1076,10 +1094,9 @@ void OpenGLGraphics::popClipArea() return; glPopMatrix(); - glScissor(mClipStack.top().x, - mTarget->h - mClipStack.top().y - mClipStack.top().height, - mClipStack.top().width, - mClipStack.top().height); + const gcn::ClipRectangle &clipArea = mClipStack.top(); + glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + clipArea.width, clipArea.height); } void OpenGLGraphics::setColor(const gcn::Color& color) diff --git a/src/particle.cpp b/src/particle.cpp index 7d7a73e9a..874e49d9a 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -95,6 +95,8 @@ void Particle::setupEngine() Particle::maxCount = config.getIntValue("particleMaxCount"); Particle::fastPhysics = config.getIntValue("particleFastPhysics"); Particle::emitterSkip = config.getIntValue("particleEmitterSkip") + 1; + if (!Particle::emitterSkip) + Particle::emitterSkip = 1; Particle::enabled = config.getBoolValue("particleeffects"); disableAutoDelete(); logger->log1("Particle engine set up"); @@ -200,11 +202,11 @@ bool Particle::update() // Update child emitters if ((mLifetimePast - 1) % Particle::emitterSkip == 0) { - for (EmitterIterator e = mChildEmitters.begin(); + for (EmitterConstIterator e = mChildEmitters.begin(); e != mChildEmitters.end(); ++e) { Particles newParticles = (*e)->createParticles(mLifetimePast); - for (ParticleIterator p = newParticles.begin(); + for (ParticleConstIterator p = newParticles.begin(); p != newParticles.end(); ++p) { (*p)->moveBy(mPos); @@ -258,7 +260,7 @@ bool Particle::update() void Particle::moveBy(const Vector &change) { mPos += change; - for (ParticleIterator p = mChildParticles.begin(); + for (ParticleConstIterator p = mChildParticles.begin(); p != mChildParticles.end(); ++p) { if ((*p)->doesFollow()) @@ -451,7 +453,7 @@ void Particle::adjustEmitterSize(int w, int h) { if (mAllowSizeAdjust) { - for (EmitterIterator e = mChildEmitters.begin(); + for (EmitterConstIterator e = mChildEmitters.begin(); e != mChildEmitters.end(); ++e) { (*e)->adjustSize(w, h); diff --git a/src/particle.h b/src/particle.h index e90a1f37f..c360a5e94 100644 --- a/src/particle.h +++ b/src/particle.h @@ -42,8 +42,10 @@ class ParticleEmitter; typedef std::list<Particle *> Particles; typedef Particles::iterator ParticleIterator; +typedef Particles::const_iterator ParticleConstIterator; typedef std::list<ParticleEmitter *> Emitters; typedef Emitters::iterator EmitterIterator; +typedef Emitters::const_iterator EmitterConstIterator; /** * A particle spawned by a ParticleEmitter. @@ -109,7 +111,7 @@ class Particle : public Actor * Necessary for sorting with the other sprites. */ virtual int getPixelY() const - { return static_cast<int>(mPos.y + mPos.z) - 64; } + { return static_cast<int>(mPos.y) - 64; } /** * Creates a blank particle as a child of the current particle diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index 70b1e2c84..5f5b1b257 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -93,7 +93,7 @@ void ParticleList::removeLocally(Particle *particle) void ParticleList::clearLocally() { - for (std::list<Particle *>::iterator it = mElements.begin(); + for (std::list<Particle *>::const_iterator it = mElements.begin(); it != mElements.end(); ++it) { (*it)->kill(); @@ -187,4 +187,3 @@ void ParticleVector::moveTo(float x, float y) } } } - diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index caa48a795..1add452a0 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -225,11 +225,6 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, int offsetX = XML::getProperty(frameNode, "offsetX", 0); int offsetY = XML::getProperty(frameNode, "offsetY", 0); int rand = XML::getProperty(frameNode, "rand", 100); - if (!imageset) - { - logger->log1("Error: no valid imageset"); - continue; - } offsetY -= imageset->getHeight() - 32; offsetX -= imageset->getWidth() / 2 - 16; @@ -435,7 +430,7 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o) mDeathEffect = o.mDeathEffect; mTempSets = o.mTempSets; - for (std::vector<ImageSet*>::iterator + for (std::vector<ImageSet*>::const_iterator i = mTempSets.begin(); i != mTempSets.end(); ++i) { @@ -453,7 +448,7 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o) ParticleEmitter::~ParticleEmitter() { - for (std::vector<ImageSet*>::iterator + for (std::vector<ImageSet*>::const_iterator i = mTempSets.begin(); i != mTempSets.end(); ++i) { @@ -532,12 +527,12 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick) newParticle = new ImageParticle(mMap, mParticleImage); } - else if (mParticleRotation.getLength() > 0) + else if (!mParticleRotation.empty()) { Animation *newAnimation = new Animation(mParticleRotation); newParticle = new RotationalParticle(mMap, newAnimation); } - else if (mParticleAnimation.getLength() > 0) + else if (!mParticleAnimation.empty()) { Animation *newAnimation = new Animation(mParticleAnimation); newParticle = new AnimationParticle(mMap, newAnimation); @@ -566,9 +561,9 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick) newParticle->setFollow(mParticleFollow); newParticle->setDestination(mParticleTarget, - mParticleAcceleration.value(tick), - mParticleMomentum.value(tick) - ); + mParticleAcceleration.value(tick), + mParticleMomentum.value(tick)); + newParticle->setDieDistance(mParticleDieDistance.value(tick)); newParticle->setLifetime(mParticleLifetime.value(tick)); @@ -576,17 +571,15 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick) newParticle->setFadeIn(mParticleFadeIn.value(tick)); newParticle->setAlpha(mParticleAlpha.value(tick)); - for (std::list<ParticleEmitter>::iterator - i = mParticleChildEmitters.begin(); - i != mParticleChildEmitters.end(); ++i) + for (std::list<ParticleEmitter>::const_iterator + it = mParticleChildEmitters.begin(); + it != mParticleChildEmitters.end(); ++it) { - newParticle->addEmitter(new ParticleEmitter(*i)); + newParticle->addEmitter(new ParticleEmitter(*it)); } if (!mDeathEffect.empty()) - { newParticle->setDeathEffect(mDeathEffect, mDeathEffectConditions); - } newParticles.push_back(newParticle); } diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h index 5b0b22e4f..76c855e4f 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -60,6 +60,8 @@ template <typename T> struct ParticleEmitterProp changeFunc = func; changeAmplitude = amplitude; changePeriod = period; + if (!changePeriod) + changePeriod = 1; changePhase = phase; } diff --git a/src/party.cpp b/src/party.cpp index f3f787807..f561ca49f 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -25,6 +25,8 @@ #include "debug.h" +#include "utils/stringutils.h" + class SortPartyFunctor { public: @@ -37,7 +39,15 @@ class SortPartyFunctor if (p2->getLeader()) return false; - return p1->getName() < p2->getName(); + if (p1->getName() != p2->getName()) + { + std::string s1 = p1->getName(); + std::string s2 = p2->getName(); + toLower(s1); + toLower(s2); + return s1 < s2; + } + return false; } } partySorter; @@ -94,7 +104,7 @@ PartyMember *Party::getMember(const std::string &name) const itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->getName() == name) + if ((*itr) && (*itr)->getName() == name) return (*itr); ++itr; @@ -116,12 +126,12 @@ void Party::removeMember(PartyMember *member) itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == member->mId && + if ((*itr) && (*itr)->mId == member->mId && (*itr)->getName() == member->getName()) { - PartyMember *member = (*itr); + PartyMember *m = (*itr); mMembers.erase(itr); - delete member; + delete m; deleted = true; break; } @@ -140,7 +150,7 @@ void Party::removeMember(int id) itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == id) + if ((*itr) && (*itr)->mId == id) { PartyMember *member = (*itr); mMembers.erase(itr); @@ -163,7 +173,7 @@ void Party::removeMember(const std::string &name) itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->getName() == name) + if ((*itr) && (*itr)->getName() == name) { PartyMember *member = (*itr); mMembers.erase(itr); @@ -181,8 +191,9 @@ void Party::removeFromMembers() if (!actorSpriteManager) return; - MemberList::iterator itr = mMembers.begin(), - itr_end = mMembers.end(); + MemberList::const_iterator itr = mMembers.begin(); + MemberList::const_iterator itr_end = mMembers.end(); + while (itr != itr_end) { Being *b = actorSpriteManager->findBeing((*itr)->getID()); @@ -212,11 +223,11 @@ bool Party::isMember(PartyMember *member) const if (member->mParty > 0 && member->mParty != this) return false; - MemberList::const_iterator itr = mMembers.begin(), - itr_end = mMembers.end(); + MemberList::const_iterator itr = mMembers.begin(); + MemberList::const_iterator itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == member->mId && + if ((*itr) && (*itr)->mId == member->mId && (*itr)->getName() == member->getName()) { return true; @@ -229,11 +240,11 @@ bool Party::isMember(PartyMember *member) const bool Party::isMember(int id) const { - MemberList::const_iterator itr = mMembers.begin(), - itr_end = mMembers.end(); + MemberList::const_iterator itr = mMembers.begin(); + MemberList::const_iterator itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->mId == id) + if ((*itr) && (*itr)->mId == id) return true; ++itr; } @@ -243,11 +254,11 @@ bool Party::isMember(int id) const bool Party::isMember(const std::string &name) const { - MemberList::const_iterator itr = mMembers.begin(), - itr_end = mMembers.end(); + MemberList::const_iterator itr = mMembers.begin(); + MemberList::const_iterator itr_end = mMembers.end(); while (itr != itr_end) { - if ((*itr)->getName() == name) + if ((*itr) && (*itr)->getName() == name) return true; ++itr; } @@ -258,11 +269,12 @@ bool Party::isMember(const std::string &name) const void Party::getNames(std::vector<std::string> &names) const { names.clear(); - MemberList::const_iterator it = mMembers.begin(), - it_end = mMembers.end(); + MemberList::const_iterator it = mMembers.begin(); + MemberList::const_iterator it_end = mMembers.end(); while (it != it_end) { - names.push_back((*it)->getName()); + if (*it) + names.push_back((*it)->getName()); ++it; } } @@ -270,18 +282,19 @@ void Party::getNames(std::vector<std::string> &names) const void Party::getNamesSet(std::set<std::string> &names) const { names.clear(); - MemberList::const_iterator it = mMembers.begin(), - it_end = mMembers.end(); + MemberList::const_iterator it = mMembers.begin(); + MemberList::const_iterator it_end = mMembers.end(); while (it != it_end) { - names.insert((*it)->getName()); + if (*it) + names.insert((*it)->getName()); ++it; } } Party *Party::getParty(short id) { - PartyMap::iterator it = parties.find(id); + PartyMap::const_iterator it = parties.find(id); if (it != parties.end()) return it->second; Party *party = new Party(id); diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp index 769d24a16..e0f8aa494 100644 --- a/src/playerinfo.cpp +++ b/src/playerinfo.cpp @@ -68,7 +68,10 @@ void triggerAttr(int id, int old) void triggerStat(int id, const std::string &changed, int old1, int old2) { - StatMap::iterator it = mData.mStats.find(id); + StatMap::const_iterator it = mData.mStats.find(id); + if (it == mData.mStats.end()) + return; + Mana::Event event(Mana::EVENT_UPDATESTAT); event.setInt("id", id); event.setInt("base", it->second.base); @@ -309,7 +312,7 @@ public: listen(Mana::CHANNEL_GAME); } - void event(Mana::Channels channel, const Mana::Event &event) + void processEvent(Mana::Channels channel, const Mana::Event &event) { if (channel == Mana::CHANNEL_CLIENT) { diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 5b25ae5fb..00a9d1cad 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -43,6 +43,21 @@ #define IGNORE_EMOTE_TIME 100 +class SortPlayersFunctor +{ + public: + bool operator() (const std::string &str1, const std::string &str2) + { + std::string s1 = str1; + std::string s2 = str2; + toLower(s1); + toLower(s2); + if (s1 == s2) + return str1 < str2; + return s1 < s2; + } +} playersSorter; + // (De)serialisation class class PlayerConfSerialiser : public ConfigurationListManager<std::pair<std::string, PlayerRelation *>, @@ -52,7 +67,7 @@ class PlayerConfSerialiser : std::pair<std::string, PlayerRelation *> value, ConfigurationObject *cobj) { - if (!value.second) + if (!cobj || !value.second) return NULL; cobj->setValue(NAME, value.first); cobj->setValue(RELATION, toString( @@ -65,6 +80,8 @@ class PlayerConfSerialiser : readConfigItem(ConfigurationObject *cobj, std::map<std::string, PlayerRelation *> *container) { + if (!cobj) + return container; std::string name = cobj->getValue(NAME, ""); if (name.empty()) return container; @@ -139,6 +156,9 @@ int PlayerRelationsManager::getPlayerIgnoreStrategyIndex( std::vector<PlayerIgnoreStrategy *> *strategies = getPlayerIgnoreStrategies(); + if (!strategies) + return -1; + for (unsigned int i = 0; i < strategies->size(); i++) { if ((*strategies)[i]->mShortName == name) @@ -216,8 +236,6 @@ void PlayerRelationsManager::store() void PlayerRelationsManager::signalUpdate(const std::string &name) { -// store(); - for (std::list<PlayerRelationsListener *>::const_iterator it = mListeners.begin(); it != mListeners.end(); ++it) { @@ -307,7 +325,7 @@ void PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::Relation relation) { PlayerRelation *r = mRelations[player_name]; - if (r == NULL) + if (!r) mRelations[player_name] = new PlayerRelation(relation); else r->mRelation = relation; @@ -327,7 +345,7 @@ std::vector<std::string> * PlayerRelationsManager::getPlayers() retval->push_back(it->first); } - sort(retval->begin(), retval->end()); + sort(retval->begin(), retval->end(), playersSorter); return retval; } diff --git a/src/position.h b/src/position.h index 1d3070e1b..973a774f0 100644 --- a/src/position.h +++ b/src/position.h @@ -31,8 +31,8 @@ */ struct Position { - Position(int x, int y): - x(x), y(y) + Position(int x0, int y0): + x(x0), y(y0) { } int x; diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp index 10d70c2c7..319bc5b8c 100644 --- a/src/resources/ambientlayer.cpp +++ b/src/resources/ambientlayer.cpp @@ -41,16 +41,16 @@ AmbientLayer::AmbientLayer(Image *img, float parallax, if (keepRatio && !mImage->useOpenGL() /*&& defaultScreenWidth != 0 && defaultScreenHeight != 0*/ - && graphics->mWidth != defaultScreenWidth - && graphics->mHeight != defaultScreenHeight) + && mainGraphics->mWidth != defaultScreenWidth + && mainGraphics->mHeight != defaultScreenHeight) { // Rescale the overlay to keep the ratio as if we were on // the default resolution... Image *rescaledOverlay = ResourceManager::getInstance()-> getRescaled(mImage, static_cast<int>(mImage->mBounds.w) - / defaultScreenWidth * graphics->mWidth, + / defaultScreenWidth * mainGraphics->mWidth, static_cast<int>(mImage->mBounds.h) - / defaultScreenHeight * graphics->mHeight); + / defaultScreenHeight * mainGraphics->mHeight); if (rescaledOverlay) mImage = rescaledOverlay; diff --git a/src/resources/animation.h b/src/resources/animation.h index 0c6f45681..19b17eb54 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -85,6 +85,12 @@ class Animation { return static_cast<unsigned>(mFrames.size()); } /** + * Check for empty animation. + */ + bool empty() const + { return mFrames.empty(); } + + /** * Returns the duration of this animation. */ int getDuration() const diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 8beea420d..4aa7515b1 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -94,10 +94,10 @@ void BeingInfo::addSound(SoundEvent event, const std::string &filename) const std::string &BeingInfo::getSound(SoundEvent event) const { - static std::string empty(""); + static std::string emptySound(""); SoundEvents::const_iterator i = mSounds.find(event); - return (i == mSounds.end() || !i->second) ? empty : + return (i == mSounds.end() || !i->second) ? emptySound : i->second->at(rand() % i->second->size()); } diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index a61483940..b93c11ba6 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -38,12 +38,12 @@ struct Attack std::string particleEffect; std::string missileParticle; - Attack(std::string action, std::string particleEffect, - std::string missileParticle) + Attack(std::string action0, std::string particleEffect0, + std::string missileParticle0) { - this->action = action; - this->particleEffect = particleEffect; - this->missileParticle = missileParticle; + action = action0; + particleEffect = particleEffect0; + missileParticle = missileParticle0; } }; diff --git a/src/resources/colordb.h b/src/resources/colordb.h index ce128578e..83bff57da 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -38,11 +38,11 @@ namespace ColorDB color("") { } - ItemColor(int id, std::string name, std::string color) + ItemColor(int id0, std::string name0, std::string color0) { - this->id = id; - this->name = name; - this->color = color; + this->id = id0; + this->name = name0; + this->color = color0; } int id; diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 802f2ee12..8f5ee1d2d 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -49,12 +49,12 @@ int Image::mTextureSize = 0; bool Image::mEnableAlphaCache = false; bool Image::mEnableAlpha = true; -Image::Image(SDL_Surface *image, bool hasAlphaChannel, Uint8 *alphaChannel): +Image::Image(SDL_Surface *image, bool hasAlphaChannel0, Uint8 *alphaChannel): mAlpha(1.0f), - mHasAlphaChannel(hasAlphaChannel), + mHasAlphaChannel(hasAlphaChannel0), mSDLSurface(image), mAlphaChannel(alphaChannel), - mIsAlphaVisible(hasAlphaChannel), + mIsAlphaVisible(hasAlphaChannel0), mIsAlphaCalculated(false) { #ifdef USE_OPENGL @@ -336,7 +336,7 @@ bool Image::hasAlphaChannel() SDL_Surface *Image::getByAlpha(float alpha) { - std::map<float, SDL_Surface*>::iterator it = mAlphaCache.find(alpha); + std::map<float, SDL_Surface*>::const_iterator it = mAlphaCache.find(alpha); if (it != mAlphaCache.end()) return (*it).second; return 0; @@ -361,7 +361,7 @@ void Image::setAlpha(float alpha) { #ifdef DEBUG_ALPHA_CACHE logger->log("cleanCache"); - for (std::map<float, SDL_Surface*>::iterator + for (std::map<float, SDL_Surface*>::const_iterator i = mAlphaCache.begin(), i_end = mAlphaCache.end(); i != i_end; ++i) { diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 733c12958..9ff80de22 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -308,7 +308,7 @@ void ItemDB::load() effect += " / "; effect += strprintf(gettext(fields[i][1]), value); } - for (std::vector<Stat>::iterator it = extraStats.begin(); + for (std::vector<Stat>::const_iterator it = extraStats.begin(); it != extraStats.end(); ++it) { int value = XML::getProperty(node, it->tag.c_str(), 0); @@ -361,7 +361,7 @@ void ItemDB::load() mItemInfos[id] = itemInfo; if (!name.empty()) { - std::string temp = normalize(name); + temp = normalize(name); NamedItemInfos::const_iterator itr = mNamedItemInfos.find(temp); if (itr == mNamedItemInfos.end()) diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 267f60eef..c20961eff 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -68,10 +68,10 @@ namespace ItemDB struct Stat { - Stat(const std::string &tag, - const std::string &format): - tag(tag), - format(format) + Stat(const std::string &tag0, + const std::string &format0) : + tag(tag0), + format(format0) {} std::string tag; diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index fb4b8ed5e..5b07724a1 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -108,7 +108,7 @@ const std::string &ItemInfo::getSprite(Gender gender) const } else { - static const std::string empty = ""; + static const std::string empty(""); std::map<int, std::string>::const_iterator i = mAnimationFiles.find(gender); @@ -139,7 +139,7 @@ const std::string &ItemInfo::getSound(EquipmentSoundEvent event) const if (i == mSounds.end()) return empty; - return i->second.size() > 0 ? i->second[rand() % i->second.size()] : empty; + return (!i->second.empty()) ? i->second[rand() % i->second.size()] : empty; } std::map<int, int> *ItemInfo::addReplaceSprite(int sprite, int direction) @@ -185,7 +185,8 @@ std::string ItemInfo::getDyeColorsString(int color) const if (!mColors || mColorList.empty()) return ""; - std::map <int, ColorDB::ItemColor>::iterator it = mColors->find(color); + std::map <int, ColorDB::ItemColor>::const_iterator + it = mColors->find(color); if (it == mColors->end()) return ""; @@ -208,7 +209,8 @@ const std::string ItemInfo::replaceColors(std::string str, std::string name; if (mColors && !mColorList.empty()) { - std::map <int, ColorDB::ItemColor>::iterator it = mColors->find(color); + std::map <int, ColorDB::ItemColor>::const_iterator + it = mColors->find(color); if (it == mColors->end()) name = "unknown"; else @@ -220,7 +222,7 @@ const std::string ItemInfo::replaceColors(std::string str, } str = replaceAll(str, "%color%", name); - if (name.size() > 0) + if (!name.empty()) name[0] = static_cast<char>(toupper(name[0])); return replaceAll(str, "%Color%", name); diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 685d415ff..f702864ea 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -734,7 +734,7 @@ Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path, Animation *ani = new Animation; for (int i = 0; ; i++) { - std::map<std::string, int>::iterator iFrame, iDelay; + std::map<std::string, int>::const_iterator iFrame, iDelay; iFrame = tileProperties.find( "animation-frame" + toString(i)); iDelay = tileProperties.find( diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index 49e7adc31..e8e5d3dbb 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -53,9 +53,9 @@ Resource *SoundEffect::load(void *buffer, unsigned bufferSize) } } -bool SoundEffect::play(int loops, int volume) +bool SoundEffect::play(int loops, int volume, int channel) { Mix_VolumeChunk(mChunk, volume); - return Mix_PlayChannel(-1, mChunk, loops) != -1; + return Mix_PlayChannel(channel, mChunk, loops) != -1; } diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 80f826646..fdd4bd275 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -54,11 +54,12 @@ class SoundEffect : public Resource * * @param loops Number of times to repeat the playback. * @param volume Sample playback volume. + * @param channel Sample playback channel. * * @return <code>true</code> if the playback started properly * <code>false</code> otherwise. */ - virtual bool play(int loops, int volume); + virtual bool play(int loops, int volume, int channel = -1); protected: /** diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp index 573ffb2a3..2463da06a 100644 --- a/src/resources/specialdb.cpp +++ b/src/resources/specialdb.cpp @@ -123,7 +123,7 @@ void SpecialDB::unload() SpecialInfo *SpecialDB::get(int id) { - SpecialInfos::iterator i = mSpecialInfos.find(id); + SpecialInfos::const_iterator i = mSpecialInfos.find(id); if (i == mSpecialInfos.end()) return NULL; diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index dee93e1e7..2e32f6c5f 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -86,7 +86,7 @@ void SpriteDef::substituteAction(std::string complete, std::string with) { if (mActions.find(complete) == mActions.end()) { - Actions::iterator i = mActions.find(with); + Actions::const_iterator i = mActions.find(with); if (i != mActions.end()) mActions[complete] = i->second; } diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 8fa64e7b9..b2939fca1 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -43,10 +43,10 @@ struct SpriteReference sprite(""), variant(0) {} - SpriteReference(std::string sprite, int variant) + SpriteReference(std::string sprite0, int variant0) { - this->sprite = sprite; - this->variant = variant; + sprite = sprite0; + variant = variant0; } std::string sprite; @@ -86,7 +86,7 @@ namespace SpriteAction static const std::string CAST_MAGIC = "magic"; static const std::string USE_ITEM = "item"; static const std::string SPAWN = "spawn"; - static const std::string INVALID = ""; + static const std::string INVALID(""); } enum SpriteDirection diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 09c9f2a04..5cfec3b84 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -137,7 +137,7 @@ void Wallpaper::loadWallpapers() std::string Wallpaper::getWallpaper(int width, int height) { - std::vector<WallpaperData>::iterator iter; + std::vector<WallpaperData>::const_iterator iter; WallpaperData wp; // Wallpaper filename container diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp index cd16ddf63..60d818cd9 100644 --- a/src/rotationalparticle.cpp +++ b/src/rotationalparticle.cpp @@ -55,10 +55,13 @@ bool RotationalParticle::update() // TODO: cache velocities to avoid spamming atan2() + int size = mAnimation->getLength(); + if (!size) + return false; + float rad = static_cast<float>(atan2(mVelocity.x, mVelocity.y)); if (rad < 0) rad = static_cast<float>(PI + (PI + rad)); - int size = mAnimation->getLength(); float range = static_cast<float>(PI / size); diff --git a/src/shopitem.cpp b/src/shopitem.cpp index 5000ceb4d..3a9b63ca6 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -40,12 +40,12 @@ ShopItem::ShopItem(int inventoryIndex, int id, unsigned char color, if (serverVersion > 0) { mDisplayName = getInfo().getName(color) + " (" - + Units::formatCurrency(mPrice).c_str() + ") "; + + Units::formatCurrency(mPrice).c_str() + ") "; } else { mDisplayName = getInfo().getName() + " (" - + Units::formatCurrency(mPrice).c_str() + ") "; + + Units::formatCurrency(mPrice).c_str() + ") "; } if (quantity > 0) mDisplayName += "[" + toString(quantity) + "]"; diff --git a/src/sound.cpp b/src/sound.cpp index 0a3c75d11..40c929824 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -54,7 +54,8 @@ Sound::Sound(): mMusic(0), mPlayBattle(false), mPlayGui(false), - mPlayMusic(false) + mPlayMusic(false), + mGuiChannel(-1) { // This set up our callback function used to // handle fade outs endings. @@ -353,8 +354,10 @@ void Sound::playGuiSfx(const std::string &path) paths.getStringValue("sfx") + path); if (sample) { - logger->log("Sound::playSfx() Playing: %s", path.c_str()); - sample->play(0, 120); + logger->log("Sound::playGuiSfx() Playing: %s", path.c_str()); + int ret = sample->play(0, 120, mGuiChannel); + if (ret != -1) + mGuiChannel = ret; } } diff --git a/src/sound.h b/src/sound.h index 625dd0ea8..16fff161b 100644 --- a/src/sound.h +++ b/src/sound.h @@ -145,6 +145,7 @@ class Sound : public ConfigListener bool mPlayBattle; bool mPlayGui; bool mPlayMusic; + int mGuiChannel; }; extern Sound sound; diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index a79388350..895ac94f2 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -41,7 +41,6 @@ SpellManager::SpellManager() { - //fillSpells(); load(); } @@ -50,7 +49,6 @@ SpellManager::~SpellManager() delete_all(mSpells); mSpells.clear(); mSpellsVector.clear(); -// save(); } TextCommand* SpellManager::getSpell(int spellId) @@ -104,7 +102,7 @@ bool SpellManager::addSpell(TextCommand *spell) if (!spell) return false; - std::map<unsigned int, TextCommand*>::iterator + std::map<unsigned int, TextCommand*>::const_iterator i = mSpells.find(spell->getId()); if (i == mSpells.end()) { @@ -184,8 +182,8 @@ std::string SpellManager::parseCommand(std::string command, if (!player_node) return command; - std::string name = ""; - std::string id = ""; + std::string name(""); + std::string id(""); std::string name2; if (target) @@ -342,7 +340,7 @@ void SpellManager::save() std::string SpellManager::autoComplete(std::string partName) { - std::vector<TextCommand*>::iterator i = mSpellsVector.begin(); + std::vector<TextCommand*>::const_iterator i = mSpellsVector.begin(); std::string newName = ""; TextCommand *newCommand = NULL; diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp index 2c5bd253d..67171524c 100644 --- a/src/spellshortcut.cpp +++ b/src/spellshortcut.cpp @@ -72,4 +72,4 @@ void SpellShortcut::load() unsigned int SpellShortcut::getSpellsCount() const { return SPELL_SHORTCUT_ITEMS; -}
\ No newline at end of file +} diff --git a/src/text.h b/src/text.h index 5249be967..2b0eaa97b 100644 --- a/src/text.h +++ b/src/text.h @@ -95,12 +95,14 @@ class FlashText : public Text /** * Remove the text from the screen */ - virtual ~FlashText() {} + virtual ~FlashText() + { } /** * Flash the text for so many refreshes. */ - void flash(int time) {mTime = time; } + void flash(int time) + { mTime = time; } /** * Draws the text. diff --git a/src/textcommand.cpp b/src/textcommand.cpp index 665668c7e..1402576d1 100644 --- a/src/textcommand.cpp +++ b/src/textcommand.cpp @@ -35,18 +35,18 @@ TextCommand::TextCommand(unsigned int id, std::string symbol, std::string icon, unsigned int basicLvl, MagicSchool school, unsigned int schoolLvl, int mana) : + mCommand(command), + mSymbol(symbol), + mTargetType(type), + mIcon(icon), + mId(id), + mMana(mana), + mSchool(school), + mBaseLvl(basicLvl), + mSchoolLvl(schoolLvl), + mCommandType(TEXT_COMMAND_MAGIC), mImage(0) { - mId = id; - mCommand = command; - mSymbol = symbol; - mTargetType = type; - mIcon = icon; - mBaseLvl = basicLvl; - mSchool = school; - mSchoolLvl = schoolLvl; - mMana = mana; - mCommandType = TEXT_COMMAND_MAGIC; loadImage(); } @@ -54,36 +54,34 @@ TextCommand::TextCommand(unsigned int id, std::string symbol, TextCommand::TextCommand(unsigned int id, std::string symbol, std::string command, SpellTarget type, std::string icon) : + mCommand(command), + mSymbol(symbol), + mTargetType(type), + mIcon(icon), + mId(id), + mMana(0), + mSchool(SKILL_MAGIC), + mBaseLvl(0), + mSchoolLvl(0), + mCommandType(TEXT_COMMAND_TEXT), mImage(0) { - mId = id; - mCommand = command; - mSymbol = symbol; - mTargetType = type; - mIcon = icon; - mCommandType = TEXT_COMMAND_TEXT; - mBaseLvl = 0; - mSchool = SKILL_MAGIC; - mSchoolLvl = 0; - mMana = 0; - mCommandType = TEXT_COMMAND_TEXT; loadImage(); } TextCommand::TextCommand(unsigned int id) : + mCommand(""), + mSymbol(""), + mTargetType(NOTARGET), + mIcon(""), + mId(id), + mMana(0), + mSchool(SKILL_MAGIC), + mBaseLvl(0), + mSchoolLvl(0), + mCommandType(TEXT_COMMAND_TEXT), mImage(0) { - mId = id; - mCommand = ""; - mSymbol = ""; - mTargetType = NOTARGET; - mIcon = ""; - mCommandType = TEXT_COMMAND_TEXT; - mBaseLvl = 0; - mSchool = SKILL_MAGIC; - mSchoolLvl = 0; - mMana = 0; - mCommandType = TEXT_COMMAND_TEXT; loadImage(); } @@ -114,4 +112,4 @@ void TextCommand::loadImage() if (!mImage) mImage = Theme::getImageFromTheme("unknown-item.png"); -}
\ No newline at end of file +} diff --git a/src/textmanager.cpp b/src/textmanager.cpp index c9da12e92..7c1be58cf 100644 --- a/src/textmanager.cpp +++ b/src/textmanager.cpp @@ -48,7 +48,7 @@ void TextManager::moveText(Text *text, int x, int y) void TextManager::removeText(const Text *text) { for (TextList::iterator ptr = mTextList.begin(), - pEnd = mTextList.end(); ptr != pEnd; ++ptr) + pEnd = mTextList.end(); ptr != pEnd; ++ptr) { if (*ptr == text) { @@ -64,8 +64,9 @@ TextManager::~TextManager() void TextManager::draw(gcn::Graphics *graphics, int xOff, int yOff) { - for (TextList::iterator bPtr = mTextList.begin(), ePtr = mTextList.end(); - bPtr != ePtr; ++bPtr) + for (TextList::const_iterator bPtr = mTextList.begin(), + ePtr = mTextList.end(); + bPtr != ePtr; ++ bPtr) { (*bPtr)->draw(graphics, xOff, yOff); } diff --git a/src/units.cpp b/src/units.cpp index db9faadd1..edf9c749a 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -208,8 +208,10 @@ std::string formatUnit(int value, int type) ul = ud.levels[i]; if (ul.count) + { nextAmount = levelAmount / ul.count; - levelAmount %= ul.count; + levelAmount %= ul.count; + } if (levelAmount > 0) output = strprintf("%d%s", levelAmount, pl.symbol.c_str()) + output; diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 5b1ccb5bc..6d1c675d3 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -1,6 +1,7 @@ /* * Retrieve string pasted depending on OS mechanisms. * Copyright (C) 2001-2010 Wormux Team + * Copyright (C) 2011 ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -90,6 +91,40 @@ bool retrieveBuffer(std::string& text, std::string::size_type& pos) CloseClipboard(); return ret; } + +bool sendBuffer(std::string& text) +{ + int wCharsLen = MultiByteToWideChar(CP_UTF8, 0, text.c_str(), -1, NULL, 0); + if (!wCharsLen) + return false; + + HANDLE h; + WCHAR *out; + h = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, wCharsLen * sizeof(WCHAR)); + out = (WCHAR*)GlobalLock(h); + + MultiByteToWideChar(CP_UTF8, 0, text.c_str(), -1, out, wCharsLen); + + if (!OpenClipboard(0)) + { + GlobalUnlock(h); + GlobalFree(h); + return false; + } + GlobalUnlock(h); + EmptyClipboard(); + if (!SetClipboardData(CF_UNICODETEXT, out)) + { + GlobalFree(h); + CloseClipboard(); + return false; + } + GlobalFree(h); + CloseClipboard(); + + return true; +} + #elif defined(__APPLE__) #ifdef Status @@ -243,6 +278,11 @@ bool retrieveBuffer(std::string& text, std::string::size_type& pos) } } +bool sendBuffer(std::string& text) +{ + return false; +} + #elif USE_X11 static char* getSelection2(Display *dpy, Window us, Atom selection, Atom request_target) @@ -362,9 +402,56 @@ bool retrieveBuffer(std::string& text, std::string::size_type& pos) } return false; } + +bool sendBuffer(std::string& text) +{ + pid_t pid; + int fd[2]; + + if (pipe(fd)) + return false; + + if ((pid = fork()) == -1) + { // fork error + return false; + } + else if (!pid) + { // child + close(fd[1]); + + if (fd[0] != STDIN_FILENO) + { + if (dup2(fd[0], STDIN_FILENO) != STDIN_FILENO) + { + close(fd[0]); + exit(1); + } + close(fd[0]); + } + execl("/usr/bin/xsel", "xsel", "-i", (char *)0); + exit(1); + } + + // parent + close(fd[0]); + const int len = strlen(text.c_str()); + if (write(fd[1], text.c_str(), len) != len) + { + close(fd[1]); + return false; + } + close(fd[1]); + return true; +} + #else bool retrieveBuffer(std::string&, std::string::size_type&) { return false; } + +bool sendBuffer(std::string& text) +{ + return false; +} #endif diff --git a/src/utils/copynpaste.h b/src/utils/copynpaste.h index d09105139..03596d5d1 100644 --- a/src/utils/copynpaste.h +++ b/src/utils/copynpaste.h @@ -31,3 +31,4 @@ */ bool retrieveBuffer(std::string& text, std::string::size_type& pos); +bool sendBuffer(std::string& text); diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp index dab01a1ea..1e7143300 100644 --- a/src/utils/sha256.cpp +++ b/src/utils/sha256.cpp @@ -254,7 +254,7 @@ void SHA256Update(SHA256Context *ctx, SHA256Transform(ctx, ctx->block, 1); SHA256Transform(ctx, shifted_message, block_nb); rem_len = new_len % SHA256_BLOCK_SIZE; - memcpy(ctx->block, &shifted_message[block_nb << 6],rem_len); + memcpy(ctx->block, &shifted_message[block_nb << 6], rem_len); ctx->len = rem_len; ctx->tot_len += (block_nb + 1) << 6; } @@ -283,7 +283,7 @@ std::string SHA256Hash(const char *src, int len) SHA256Final(&ctx, bytehash); // Convert it to hex const char* hxc = "0123456789abcdef"; - std::string hash = ""; + std::string hash(""); for (int i = 0; i < SHA256_DIGEST_SIZE; i++) { hash += hxc[bytehash[i] / 16]; diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 176c5499c..6c50d4019 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -174,6 +174,24 @@ const std::string findSameSubstring(const std::string &str1, return str1.substr(0, minLength); } +const std::string findSameSubstringI(const std::string &s1, + const std::string &s2) +{ + std::string str1 = s1; + std::string str2 = s2; + toLower(str1); + toLower(str2); + + int minLength = str1.length() > str2.length() + ? static_cast<int>(str2.length()) : static_cast<int>(str1.length()); + for (int f = 0; f < minLength; f ++) + { + if (str1.at(f) != str2.at(f)) + return s1.substr(0, f); + } + return s1.substr(0, minLength); +} + unsigned long findI(std::string str, std::string subStr) { str = toLower(str); @@ -185,10 +203,11 @@ unsigned long findI(std::string text, std::vector<std::string> &list) { std::string str = toLower(text); unsigned long idx; - for (std::vector<std::string>::iterator i = list.begin(); + for (std::vector<std::string>::const_iterator i = list.begin(); i != list.end(); ++i) { - std::string subStr = toLower(*i); + std::string subStr = *i; + subStr = toLower(subStr); idx = str.find(subStr); if (idx != std::string::npos) return idx; @@ -446,12 +465,12 @@ std::string combineDye2(std::string file, std::string dye) if (pos != std::string::npos) { std::string dye1 = file.substr(pos + 1); - std::string str = ""; + std::string str(""); file = file.substr(0, pos); std::list<std::string> list1 = splitToStringList(dye1, ';'); std::list<std::string> list2 = splitToStringList(dye, ';'); - std::list<std::string>::iterator it1, it1_end = list1.end(); - std::list<std::string>::iterator it2, it2_end = list2.end(); + std::list<std::string>::const_iterator it1, it1_end = list1.end(); + std::list<std::string>::const_iterator it2, it2_end = list2.end(); for (it1 = list1.begin(), it2 = list2.begin(); it1 != it1_end && it2 != it2_end; ++it1, ++it2) { @@ -485,8 +504,8 @@ std::vector<std::string> getLang() std::string packList(std::list<std::string> &list) { - std::list<std::string>::iterator i = list.begin(); - std::string str = ""; + std::list<std::string>::const_iterator i = list.begin(); + std::string str(""); while (i != list.end()) { str = str + (*i) + "|"; diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 25fe11e2d..273fa0c8c 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -116,6 +116,9 @@ std::string removeColors(std::string msg); const std::string findSameSubstring(const std::string &str1, const std::string &str2); +const std::string findSameSubstringI(const std::string &str1, + const std::string &str2); + /** * Compares the two strings case-insensitively. * diff --git a/src/vector.h b/src/vector.h index 87e9c647a..0f10bae96 100644 --- a/src/vector.h +++ b/src/vector.h @@ -46,10 +46,10 @@ class Vector /** * Constructor. */ - Vector(float x, float y, float z = 0.0f): - x(x), - y(y), - z(z) + Vector(float x0, float y0, float z0 = 0.0f): + x(x0), + y(y0), + z(z0) {} /** |
