summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSocapex <philippe_groarke@yahoo.ca>2013-01-19 21:02:01 -0500
committerSocapex <philippe_groarke@yahoo.ca>2013-01-19 21:02:01 -0500
commitdf606ace309acaf0c78f52e1f98eabed6c844ae2 (patch)
treed9799b0e4a507d9eacbbafc1755eecea03f0b373
parentd0169223b889a115b486e974e5b287c3ccb00d85 (diff)
parent678d4e70999ade5a36862039875aa5564291d09d (diff)
downloadplus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz
plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2
plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz
plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip
Merge remote-tracking branch 'upstream/master' into osx
-rw-r--r--ChangeLog28
-rw-r--r--README2
-rw-r--r--README.txt2
-rwxr-xr-xbuild/packevol2
-rwxr-xr-xbuild/packwin2
-rwxr-xr-xconfigure.ac2
-rw-r--r--data/graphics/flags/CMakeLists.txt1
-rw-r--r--data/graphics/flags/Makefile.am1
-rw-r--r--data/graphics/flags/nl_BE.pngbin0 -> 420 bytes
-rw-r--r--data/graphics/gui/listbox.xml1
-rw-r--r--data/themes/jewelry/CMakeLists.txt2
-rw-r--r--data/themes/jewelry/Makefile.am2
-rw-r--r--data/themes/jewelry/listbox.xml1
-rw-r--r--data/themes/jewelry/ministatus.xml11
-rw-r--r--data/themes/jewelry/window.pngbin28543 -> 28535 bytes
-rw-r--r--data/themes/jewelry/windowmenu.xml8
-rw-r--r--data/translations/help/ru.po186
-rw-r--r--po/ar.po427
-rw-r--r--po/bg.po427
-rw-r--r--po/ca.po427
-rw-r--r--po/cs.po427
-rw-r--r--po/da.po427
-rw-r--r--po/de.po447
-rw-r--r--po/el.po427
-rw-r--r--po/en_GB.po427
-rw-r--r--po/eo.po427
-rw-r--r--po/es.po477
-rw-r--r--po/et.po427
-rw-r--r--po/fa.po427
-rw-r--r--po/fi.po427
-rw-r--r--po/fr.po474
-rw-r--r--po/he.po427
-rw-r--r--po/hr.po427
-rw-r--r--po/hu.po427
-rw-r--r--po/id.po427
-rw-r--r--po/it.po427
-rw-r--r--po/ja.po607
-rw-r--r--po/ka.po427
-rw-r--r--po/manaplus.pot425
-rw-r--r--po/nb.po427
-rw-r--r--po/nl.po427
-rw-r--r--po/nl_BE.po427
-rw-r--r--po/pl.po427
-rw-r--r--po/pt.po427
-rw-r--r--po/pt_BR.po427
-rw-r--r--po/ru.po427
-rw-r--r--po/sk.po427
-rw-r--r--po/sq.po427
-rw-r--r--po/sv.po427
-rw-r--r--po/sv_SE.po427
-rw-r--r--po/te.po427
-rw-r--r--po/th.po427
-rw-r--r--po/tr.po427
-rw-r--r--po/vls.po427
-rw-r--r--po/zh_CN.po427
-rw-r--r--po/zh_HK.po427
-rw-r--r--po/zh_TW.po427
-rw-r--r--src/actionmanager.cpp18
-rw-r--r--src/actionmanager.h2
-rw-r--r--src/actor.cpp2
-rw-r--r--src/actor.h2
-rw-r--r--src/actorsprite.cpp2
-rw-r--r--src/actorsprite.h2
-rw-r--r--src/actorspritelistener.h2
-rw-r--r--src/actorspritemanager.cpp31
-rw-r--r--src/actorspritemanager.h2
-rw-r--r--src/animatedsprite.cpp2
-rw-r--r--src/animatedsprite.h2
-rw-r--r--src/animationdelayload.cpp2
-rw-r--r--src/animationdelayload.h2
-rw-r--r--src/animationparticle.cpp2
-rw-r--r--src/animationparticle.h2
-rw-r--r--src/auctionmanager.cpp2
-rw-r--r--src/auctionmanager.h2
-rw-r--r--src/avatar.cpp2
-rw-r--r--src/avatar.h2
-rw-r--r--src/being.cpp2
-rw-r--r--src/being.h2
-rw-r--r--src/channel.cpp2
-rw-r--r--src/channel.h2
-rw-r--r--src/channelmanager.cpp2
-rw-r--r--src/channelmanager.h2
-rw-r--r--src/chatlogger.cpp2
-rw-r--r--src/chatlogger.h2
-rw-r--r--src/client.cpp41
-rw-r--r--src/client.h6
-rw-r--r--src/commandhandler.cpp2
-rw-r--r--src/commandhandler.h2
-rw-r--r--src/commands.cpp4
-rw-r--r--src/commands.h2
-rw-r--r--src/compoundsprite.cpp2
-rw-r--r--src/compoundsprite.h2
-rw-r--r--src/configlistener.h2
-rw-r--r--src/configuration.cpp2
-rw-r--r--src/configuration.h2
-rw-r--r--src/debug.h2
-rw-r--r--src/defaults.cpp6
-rw-r--r--src/defaults.h2
-rw-r--r--src/depricatedevent.cpp2
-rw-r--r--src/depricatedevent.h2
-rw-r--r--src/emoteshortcut.cpp2
-rw-r--r--src/emoteshortcut.h2
-rw-r--r--src/equipment.h2
-rw-r--r--src/flooritem.cpp2
-rw-r--r--src/flooritem.h2
-rw-r--r--src/game.cpp2
-rw-r--r--src/game.h2
-rw-r--r--src/graphics.cpp2
-rw-r--r--src/graphics.h2
-rw-r--r--src/graphicsmanager.cpp2
-rw-r--r--src/graphicsmanager.h2
-rw-r--r--src/graphicsvertexes.cpp2
-rw-r--r--src/graphicsvertexes.h2
-rw-r--r--src/gui/beingpopup.cpp2
-rw-r--r--src/gui/beingpopup.h2
-rw-r--r--src/gui/buydialog.cpp2
-rw-r--r--src/gui/buydialog.h2
-rw-r--r--src/gui/buyselldialog.cpp2
-rw-r--r--src/gui/buyselldialog.h2
-rw-r--r--src/gui/changeemaildialog.cpp2
-rw-r--r--src/gui/changeemaildialog.h2
-rw-r--r--src/gui/changepassworddialog.cpp2
-rw-r--r--src/gui/changepassworddialog.h2
-rw-r--r--src/gui/charcreatedialog.cpp2
-rw-r--r--src/gui/charcreatedialog.h2
-rw-r--r--src/gui/charselectdialog.cpp2
-rw-r--r--src/gui/charselectdialog.h2
-rw-r--r--src/gui/chatwindow.cpp5
-rw-r--r--src/gui/chatwindow.h2
-rw-r--r--src/gui/confirmdialog.cpp2
-rw-r--r--src/gui/confirmdialog.h2
-rw-r--r--src/gui/connectiondialog.cpp2
-rw-r--r--src/gui/connectiondialog.h2
-rw-r--r--src/gui/debugwindow.cpp2
-rw-r--r--src/gui/debugwindow.h2
-rw-r--r--src/gui/didyouknowwindow.cpp2
-rw-r--r--src/gui/didyouknowwindow.h2
-rw-r--r--src/gui/editserverdialog.cpp4
-rw-r--r--src/gui/editserverdialog.h2
-rw-r--r--src/gui/equipmentwindow.cpp2
-rw-r--r--src/gui/equipmentwindow.h2
-rw-r--r--src/gui/focushandler.cpp2
-rw-r--r--src/gui/focushandler.h2
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/gui/gui.h2
-rw-r--r--src/gui/helpwindow.cpp2
-rw-r--r--src/gui/helpwindow.h2
-rw-r--r--src/gui/inventorywindow.cpp4
-rw-r--r--src/gui/inventorywindow.h2
-rw-r--r--src/gui/itemamountwindow.cpp2
-rw-r--r--src/gui/itemamountwindow.h2
-rw-r--r--src/gui/itempopup.cpp2
-rw-r--r--src/gui/itempopup.h2
-rw-r--r--src/gui/logindialog.cpp4
-rw-r--r--src/gui/logindialog.h2
-rw-r--r--src/gui/minimap.cpp2
-rw-r--r--src/gui/minimap.h2
-rw-r--r--src/gui/ministatuswindow.cpp16
-rw-r--r--src/gui/ministatuswindow.h2
-rw-r--r--src/gui/npcdialog.cpp2
-rw-r--r--src/gui/npcdialog.h2
-rw-r--r--src/gui/npcpostdialog.cpp2
-rw-r--r--src/gui/npcpostdialog.h2
-rw-r--r--src/gui/okdialog.cpp2
-rw-r--r--src/gui/okdialog.h2
-rw-r--r--src/gui/outfitwindow.cpp2
-rw-r--r--src/gui/outfitwindow.h2
-rw-r--r--src/gui/palette.cpp2
-rw-r--r--src/gui/palette.h2
-rw-r--r--src/gui/popupmenu.cpp29
-rw-r--r--src/gui/popupmenu.h4
-rw-r--r--src/gui/questswindow.cpp2
-rw-r--r--src/gui/quitdialog.cpp2
-rw-r--r--src/gui/quitdialog.h2
-rw-r--r--src/gui/registerdialog.cpp2
-rw-r--r--src/gui/registerdialog.h2
-rw-r--r--src/gui/sdlfont.cpp2
-rw-r--r--src/gui/sdlfont.h2
-rw-r--r--src/gui/sdlinput.cpp2
-rw-r--r--src/gui/sdlinput.h2
-rw-r--r--src/gui/selldialog.cpp2
-rw-r--r--src/gui/selldialog.h2
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/gui/serverdialog.h2
-rw-r--r--src/gui/setup.cpp2
-rw-r--r--src/gui/setup.h2
-rw-r--r--src/gui/setup_audio.cpp4
-rw-r--r--src/gui/setup_audio.h2
-rw-r--r--src/gui/setup_chat.cpp2
-rw-r--r--src/gui/setup_chat.h2
-rw-r--r--src/gui/setup_colors.cpp2
-rw-r--r--src/gui/setup_colors.h2
-rw-r--r--src/gui/setup_input.cpp2
-rw-r--r--src/gui/setup_input.h2
-rw-r--r--src/gui/setup_joystick.cpp22
-rw-r--r--src/gui/setup_joystick.h3
-rw-r--r--src/gui/setup_other.cpp2
-rw-r--r--src/gui/setup_other.h2
-rw-r--r--src/gui/setup_perfomance.cpp2
-rw-r--r--src/gui/setup_perfomance.h2
-rw-r--r--src/gui/setup_players.cpp2
-rw-r--r--src/gui/setup_players.h2
-rw-r--r--src/gui/setup_relations.cpp2
-rw-r--r--src/gui/setup_relations.h2
-rw-r--r--src/gui/setup_theme.cpp2
-rw-r--r--src/gui/setup_touch.cpp2
-rw-r--r--src/gui/setup_touch.h2
-rw-r--r--src/gui/setup_video.cpp2
-rw-r--r--src/gui/setup_video.h2
-rw-r--r--src/gui/setup_visual.cpp2
-rw-r--r--src/gui/setup_visual.h2
-rw-r--r--src/gui/setupactiondata.h2
-rw-r--r--src/gui/shopwindow.cpp2
-rw-r--r--src/gui/shopwindow.h2
-rw-r--r--src/gui/shortcutwindow.cpp2
-rw-r--r--src/gui/shortcutwindow.h2
-rw-r--r--src/gui/skilldialog.cpp2
-rw-r--r--src/gui/skilldialog.h2
-rw-r--r--src/gui/socialwindow.cpp2
-rw-r--r--src/gui/socialwindow.h2
-rw-r--r--src/gui/specialswindow.cpp2
-rw-r--r--src/gui/specialswindow.h2
-rw-r--r--src/gui/speechbubble.cpp2
-rw-r--r--src/gui/speechbubble.h2
-rw-r--r--src/gui/statuswindow.cpp39
-rw-r--r--src/gui/statuswindow.h7
-rw-r--r--src/gui/textdialog.cpp2
-rw-r--r--src/gui/textdialog.h2
-rw-r--r--src/gui/textpopup.cpp2
-rw-r--r--src/gui/textpopup.h2
-rw-r--r--src/gui/theme.cpp2
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/gui/tradewindow.cpp2
-rw-r--r--src/gui/tradewindow.h2
-rw-r--r--src/gui/unregisterdialog.cpp2
-rw-r--r--src/gui/unregisterdialog.h2
-rw-r--r--src/gui/updaterwindow.cpp2
-rw-r--r--src/gui/updaterwindow.h2
-rw-r--r--src/gui/userpalette.cpp2
-rw-r--r--src/gui/userpalette.h2
-rw-r--r--src/gui/viewport.cpp7
-rw-r--r--src/gui/viewport.h4
-rw-r--r--src/gui/widgets/avatarlistbox.cpp2
-rw-r--r--src/gui/widgets/avatarlistbox.h2
-rw-r--r--src/gui/widgets/battletab.cpp2
-rw-r--r--src/gui/widgets/battletab.h2
-rw-r--r--src/gui/widgets/browserbox.cpp3
-rw-r--r--src/gui/widgets/browserbox.h2
-rw-r--r--src/gui/widgets/button.cpp2
-rw-r--r--src/gui/widgets/button.h2
-rw-r--r--src/gui/widgets/channeltab.cpp2
-rw-r--r--src/gui/widgets/channeltab.h2
-rw-r--r--src/gui/widgets/chattab.cpp2
-rw-r--r--src/gui/widgets/chattab.h2
-rw-r--r--src/gui/widgets/checkbox.cpp2
-rw-r--r--src/gui/widgets/checkbox.h2
-rw-r--r--src/gui/widgets/container.cpp2
-rw-r--r--src/gui/widgets/container.h2
-rw-r--r--src/gui/widgets/desktop.cpp2
-rw-r--r--src/gui/widgets/desktop.h2
-rw-r--r--src/gui/widgets/dropdown.cpp5
-rw-r--r--src/gui/widgets/dropdown.h3
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.h2
-rw-r--r--src/gui/widgets/extendedlistbox.cpp7
-rw-r--r--src/gui/widgets/extendedlistbox.h3
-rw-r--r--src/gui/widgets/extendedlistmodel.h2
-rw-r--r--src/gui/widgets/extendednamesmodel.cpp2
-rw-r--r--src/gui/widgets/extendednamesmodel.h2
-rw-r--r--src/gui/widgets/flowcontainer.cpp2
-rw-r--r--src/gui/widgets/flowcontainer.h2
-rw-r--r--src/gui/widgets/guildchattab.cpp2
-rw-r--r--src/gui/widgets/guildchattab.h2
-rw-r--r--src/gui/widgets/guitable.cpp2
-rw-r--r--src/gui/widgets/guitable.h2
-rw-r--r--src/gui/widgets/horizontcontainer.cpp2
-rw-r--r--src/gui/widgets/horizontcontainer.h2
-rw-r--r--src/gui/widgets/icon.cpp2
-rw-r--r--src/gui/widgets/icon.h2
-rw-r--r--src/gui/widgets/inttextfield.cpp2
-rw-r--r--src/gui/widgets/inttextfield.h2
-rw-r--r--src/gui/widgets/itemcontainer.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.h2
-rw-r--r--src/gui/widgets/itemlinkhandler.cpp22
-rw-r--r--src/gui/widgets/itemlinkhandler.h2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h2
-rw-r--r--src/gui/widgets/label.cpp2
-rw-r--r--src/gui/widgets/label.h2
-rw-r--r--src/gui/widgets/layout.cpp2
-rw-r--r--src/gui/widgets/layout.h2
-rw-r--r--src/gui/widgets/layouthelper.cpp2
-rw-r--r--src/gui/widgets/layouthelper.h2
-rw-r--r--src/gui/widgets/linkhandler.h2
-rw-r--r--src/gui/widgets/listbox.cpp2
-rw-r--r--src/gui/widgets/listbox.h2
-rw-r--r--src/gui/widgets/mouseevent.h2
-rw-r--r--src/gui/widgets/namesmodel.cpp2
-rw-r--r--src/gui/widgets/namesmodel.h2
-rw-r--r--src/gui/widgets/passwordfield.cpp2
-rw-r--r--src/gui/widgets/passwordfield.h2
-rw-r--r--src/gui/widgets/playerbox.cpp2
-rw-r--r--src/gui/widgets/playerbox.h2
-rw-r--r--src/gui/widgets/popup.cpp2
-rw-r--r--src/gui/widgets/popup.h2
-rw-r--r--src/gui/widgets/popuplist.cpp13
-rw-r--r--src/gui/widgets/popuplist.h6
-rw-r--r--src/gui/widgets/progressbar.cpp2
-rw-r--r--src/gui/widgets/progressbar.h2
-rw-r--r--src/gui/widgets/progressindicator.cpp2
-rw-r--r--src/gui/widgets/progressindicator.h2
-rw-r--r--src/gui/widgets/radiobutton.cpp2
-rw-r--r--src/gui/widgets/radiobutton.h2
-rw-r--r--src/gui/widgets/radiogroup.cpp2
-rw-r--r--src/gui/widgets/radiogroup.h2
-rw-r--r--src/gui/widgets/scrollarea.cpp2
-rw-r--r--src/gui/widgets/scrollarea.h2
-rw-r--r--src/gui/widgets/setupitem.cpp2
-rw-r--r--src/gui/widgets/setupitem.h2
-rw-r--r--src/gui/widgets/setuptab.cpp2
-rw-r--r--src/gui/widgets/setuptab.h2
-rw-r--r--src/gui/widgets/setuptabscroll.cpp2
-rw-r--r--src/gui/widgets/setuptabscroll.h2
-rw-r--r--src/gui/widgets/setuptouchitem.cpp2
-rw-r--r--src/gui/widgets/setuptouchitem.h2
-rw-r--r--src/gui/widgets/shopitems.cpp2
-rw-r--r--src/gui/widgets/shopitems.h2
-rw-r--r--src/gui/widgets/shoplistbox.cpp2
-rw-r--r--src/gui/widgets/shoplistbox.h2
-rw-r--r--src/gui/widgets/shortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/shortcutcontainer.h2
-rw-r--r--src/gui/widgets/slider.cpp2
-rw-r--r--src/gui/widgets/slider.h2
-rw-r--r--src/gui/widgets/sliderlist.cpp2
-rw-r--r--src/gui/widgets/sliderlist.h2
-rw-r--r--src/gui/widgets/tab.cpp2
-rw-r--r--src/gui/widgets/tab.h2
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/gui/widgets/tabbedarea.h2
-rw-r--r--src/gui/widgets/tablemodel.cpp2
-rw-r--r--src/gui/widgets/tablemodel.h2
-rw-r--r--src/gui/widgets/tabstrip.cpp2
-rw-r--r--src/gui/widgets/tabstrip.h2
-rw-r--r--src/gui/widgets/textbox.cpp2
-rw-r--r--src/gui/widgets/textbox.h2
-rw-r--r--src/gui/widgets/textfield.cpp2
-rw-r--r--src/gui/widgets/textfield.h2
-rw-r--r--src/gui/widgets/textpreview.cpp2
-rw-r--r--src/gui/widgets/textpreview.h2
-rw-r--r--src/gui/widgets/tradetab.cpp2
-rw-r--r--src/gui/widgets/tradetab.h2
-rw-r--r--src/gui/widgets/vertcontainer.cpp2
-rw-r--r--src/gui/widgets/vertcontainer.h2
-rw-r--r--src/gui/widgets/whispertab.cpp2
-rw-r--r--src/gui/widgets/whispertab.h2
-rw-r--r--src/gui/widgets/widget2.h2
-rw-r--r--src/gui/widgets/widgetgroup.cpp2
-rw-r--r--src/gui/widgets/widgetgroup.h2
-rw-r--r--src/gui/widgets/window.cpp2
-rw-r--r--src/gui/widgets/window.h2
-rw-r--r--src/gui/widgets/windowcontainer.cpp2
-rw-r--r--src/gui/widgets/windowcontainer.h2
-rw-r--r--src/gui/windowmenu.cpp4
-rw-r--r--src/gui/windowmenu.h2
-rw-r--r--src/gui/worldselectdialog.cpp2
-rw-r--r--src/gui/worldselectdialog.h2
-rw-r--r--src/guichan/actionevent.cpp2
-rw-r--r--src/guichan/basiccontainer.cpp2
-rw-r--r--src/guichan/cliprectangle.cpp2
-rw-r--r--src/guichan/color.cpp2
-rw-r--r--src/guichan/event.cpp2
-rw-r--r--src/guichan/exception.cpp2
-rw-r--r--src/guichan/focushandler.cpp2
-rw-r--r--src/guichan/font.cpp2
-rw-r--r--src/guichan/graphics.cpp2
-rw-r--r--src/guichan/gui.cpp2
-rw-r--r--src/guichan/image.cpp2
-rw-r--r--src/guichan/include/guichan/actionevent.hpp2
-rw-r--r--src/guichan/include/guichan/actionlistener.hpp2
-rw-r--r--src/guichan/include/guichan/basiccontainer.hpp2
-rw-r--r--src/guichan/include/guichan/cliprectangle.hpp2
-rw-r--r--src/guichan/include/guichan/color.hpp2
-rw-r--r--src/guichan/include/guichan/deathlistener.hpp2
-rw-r--r--src/guichan/include/guichan/event.hpp2
-rw-r--r--src/guichan/include/guichan/exception.hpp2
-rw-r--r--src/guichan/include/guichan/focushandler.hpp2
-rw-r--r--src/guichan/include/guichan/focuslistener.hpp2
-rw-r--r--src/guichan/include/guichan/font.hpp2
-rw-r--r--src/guichan/include/guichan/graphics.hpp2
-rw-r--r--src/guichan/include/guichan/gui.hpp2
-rw-r--r--src/guichan/include/guichan/image.hpp2
-rw-r--r--src/guichan/include/guichan/input.hpp2
-rw-r--r--src/guichan/include/guichan/inputevent.hpp2
-rw-r--r--src/guichan/include/guichan/key.hpp2
-rw-r--r--src/guichan/include/guichan/keyevent.hpp2
-rw-r--r--src/guichan/include/guichan/keyinput.hpp2
-rw-r--r--src/guichan/include/guichan/keylistener.hpp2
-rw-r--r--src/guichan/include/guichan/listmodel.hpp2
-rw-r--r--src/guichan/include/guichan/mouseevent.hpp2
-rw-r--r--src/guichan/include/guichan/mouseinput.hpp2
-rw-r--r--src/guichan/include/guichan/mouselistener.hpp2
-rw-r--r--src/guichan/include/guichan/platform.hpp2
-rw-r--r--src/guichan/include/guichan/rectangle.hpp2
-rw-r--r--src/guichan/include/guichan/sdl/sdlgraphics.hpp2
-rw-r--r--src/guichan/include/guichan/sdl/sdlpixel.hpp2
-rw-r--r--src/guichan/include/guichan/selectionevent.hpp2
-rw-r--r--src/guichan/include/guichan/selectionlistener.hpp2
-rw-r--r--src/guichan/include/guichan/widget.hpp2
-rw-r--r--src/guichan/include/guichan/widgetlistener.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/button.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/checkbox.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/container.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/label.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/listbox.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/radiobutton.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/scrollarea.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/slider.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/textbox.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/textfield.hpp2
-rw-r--r--src/guichan/include/guichan/widgets/window.hpp2
-rw-r--r--src/guichan/inputevent.cpp2
-rw-r--r--src/guichan/key.cpp2
-rw-r--r--src/guichan/keyevent.cpp2
-rw-r--r--src/guichan/keyinput.cpp2
-rw-r--r--src/guichan/mouseevent.cpp2
-rw-r--r--src/guichan/mouseinput.cpp2
-rw-r--r--src/guichan/rectangle.cpp2
-rw-r--r--src/guichan/sdl/sdlgraphics.cpp2
-rw-r--r--src/guichan/selectionevent.cpp2
-rw-r--r--src/guichan/widget.cpp2
-rw-r--r--src/guichan/widgets/button.cpp2
-rw-r--r--src/guichan/widgets/checkbox.cpp2
-rw-r--r--src/guichan/widgets/container.cpp2
-rw-r--r--src/guichan/widgets/label.cpp2
-rw-r--r--src/guichan/widgets/listbox.cpp2
-rw-r--r--src/guichan/widgets/radiobutton.cpp2
-rw-r--r--src/guichan/widgets/scrollarea.cpp2
-rw-r--r--src/guichan/widgets/slider.cpp2
-rw-r--r--src/guichan/widgets/textbox.cpp2
-rw-r--r--src/guichan/widgets/textfield.cpp2
-rw-r--r--src/guichan/widgets/window.cpp2
-rw-r--r--src/guild.cpp2
-rw-r--r--src/guild.h2
-rw-r--r--src/guildmanager.cpp2
-rw-r--r--src/guildmanager.h2
-rw-r--r--src/imageparticle.cpp2
-rw-r--r--src/imageparticle.h2
-rw-r--r--src/imagesprite.cpp2
-rw-r--r--src/imagesprite.h2
-rw-r--r--src/inputevent.cpp2
-rw-r--r--src/inputevent.h2
-rw-r--r--src/inputmanager.cpp2
-rw-r--r--src/inputmanager.h2
-rw-r--r--src/inventory.cpp2
-rw-r--r--src/inventory.h2
-rw-r--r--src/item.cpp2
-rw-r--r--src/item.h2
-rw-r--r--src/itemshortcut.cpp2
-rw-r--r--src/itemshortcut.h2
-rw-r--r--src/joystick.cpp53
-rw-r--r--src/joystick.h4
-rw-r--r--src/keyboardconfig.cpp2
-rw-r--r--src/keyboardconfig.h2
-rw-r--r--src/keyboarddata.h2
-rw-r--r--src/keydata.h2
-rw-r--r--src/keyevent.cpp2
-rw-r--r--src/keyevent.h2
-rw-r--r--src/keyinput.cpp2
-rw-r--r--src/keyinput.h2
-rw-r--r--src/listener.cpp2
-rw-r--r--src/listener.h2
-rw-r--r--src/localconsts.h5
-rw-r--r--src/localplayer.cpp2
-rw-r--r--src/localplayer.h2
-rw-r--r--src/logger.cpp2
-rw-r--r--src/logger.h2
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h6
-rw-r--r--src/map.cpp2
-rw-r--r--src/map.h2
-rw-r--r--src/maplayer.cpp2
-rw-r--r--src/maplayer.h2
-rw-r--r--src/mgl.cpp2
-rw-r--r--src/mgl.h2
-rw-r--r--src/mobileopenglgraphics.cpp10
-rw-r--r--src/mobileopenglgraphics.h2
-rw-r--r--src/mouseinput.cpp2
-rw-r--r--src/mouseinput.h2
-rw-r--r--src/mumblemanager.cpp2
-rw-r--r--src/mumblemanager.h2
-rw-r--r--src/net/adminhandler.h2
-rw-r--r--src/net/buysellhandler.h2
-rw-r--r--src/net/charhandler.cpp2
-rw-r--r--src/net/charhandler.h2
-rw-r--r--src/net/chathandler.h2
-rw-r--r--src/net/download.cpp2
-rw-r--r--src/net/download.h2
-rw-r--r--src/net/ea/adminhandler.cpp2
-rw-r--r--src/net/ea/adminhandler.h2
-rw-r--r--src/net/ea/beinghandler.cpp2
-rw-r--r--src/net/ea/beinghandler.h2
-rw-r--r--src/net/ea/buysellhandler.cpp2
-rw-r--r--src/net/ea/buysellhandler.h2
-rw-r--r--src/net/ea/charserverhandler.cpp2
-rw-r--r--src/net/ea/charserverhandler.h2
-rw-r--r--src/net/ea/chathandler.cpp2
-rw-r--r--src/net/ea/chathandler.h2
-rw-r--r--src/net/ea/eaprotocol.h2
-rw-r--r--src/net/ea/gamehandler.cpp2
-rw-r--r--src/net/ea/gamehandler.h2
-rw-r--r--src/net/ea/gui/guildtab.cpp2
-rw-r--r--src/net/ea/gui/guildtab.h2
-rw-r--r--src/net/ea/gui/partytab.cpp2
-rw-r--r--src/net/ea/gui/partytab.h2
-rw-r--r--src/net/ea/guildhandler.cpp2
-rw-r--r--src/net/ea/guildhandler.h2
-rw-r--r--src/net/ea/inventoryhandler.cpp2
-rw-r--r--src/net/ea/inventoryhandler.h2
-rw-r--r--src/net/ea/itemhandler.cpp2
-rw-r--r--src/net/ea/itemhandler.h2
-rw-r--r--src/net/ea/loginhandler.cpp2
-rw-r--r--src/net/ea/loginhandler.h2
-rw-r--r--src/net/ea/network.cpp2
-rw-r--r--src/net/ea/network.h2
-rw-r--r--src/net/ea/npchandler.cpp2
-rw-r--r--src/net/ea/npchandler.h2
-rw-r--r--src/net/ea/partyhandler.cpp2
-rw-r--r--src/net/ea/partyhandler.h2
-rw-r--r--src/net/ea/playerhandler.cpp2
-rw-r--r--src/net/ea/playerhandler.h2
-rw-r--r--src/net/ea/specialhandler.cpp2
-rw-r--r--src/net/ea/specialhandler.h2
-rw-r--r--src/net/ea/token.h2
-rw-r--r--src/net/ea/tradehandler.cpp2
-rw-r--r--src/net/ea/tradehandler.h2
-rw-r--r--src/net/eathena/adminhandler.cpp2
-rw-r--r--src/net/eathena/adminhandler.h2
-rw-r--r--src/net/eathena/beinghandler.cpp2
-rw-r--r--src/net/eathena/beinghandler.h2
-rw-r--r--src/net/eathena/buysellhandler.cpp2
-rw-r--r--src/net/eathena/buysellhandler.h2
-rw-r--r--src/net/eathena/charserverhandler.cpp2
-rw-r--r--src/net/eathena/charserverhandler.h2
-rw-r--r--src/net/eathena/chathandler.cpp2
-rw-r--r--src/net/eathena/chathandler.h2
-rw-r--r--src/net/eathena/gamehandler.cpp2
-rw-r--r--src/net/eathena/gamehandler.h2
-rw-r--r--src/net/eathena/generalhandler.cpp39
-rw-r--r--src/net/eathena/generalhandler.h2
-rw-r--r--src/net/eathena/gui/guildtab.cpp2
-rw-r--r--src/net/eathena/gui/guildtab.h2
-rw-r--r--src/net/eathena/gui/partytab.cpp2
-rw-r--r--src/net/eathena/gui/partytab.h2
-rw-r--r--src/net/eathena/guildhandler.cpp2
-rw-r--r--src/net/eathena/guildhandler.h2
-rw-r--r--src/net/eathena/inventoryhandler.cpp2
-rw-r--r--src/net/eathena/inventoryhandler.h2
-rw-r--r--src/net/eathena/itemhandler.cpp2
-rw-r--r--src/net/eathena/itemhandler.h2
-rw-r--r--src/net/eathena/loginhandler.cpp2
-rw-r--r--src/net/eathena/loginhandler.h2
-rw-r--r--src/net/eathena/messagehandler.cpp2
-rw-r--r--src/net/eathena/messagehandler.h2
-rw-r--r--src/net/eathena/messagein.cpp2
-rw-r--r--src/net/eathena/messagein.h2
-rw-r--r--src/net/eathena/messageout.cpp2
-rw-r--r--src/net/eathena/messageout.h2
-rw-r--r--src/net/eathena/network.cpp2
-rw-r--r--src/net/eathena/network.h2
-rw-r--r--src/net/eathena/npchandler.cpp2
-rw-r--r--src/net/eathena/npchandler.h2
-rw-r--r--src/net/eathena/partyhandler.cpp2
-rw-r--r--src/net/eathena/partyhandler.h2
-rw-r--r--src/net/eathena/playerhandler.cpp2
-rw-r--r--src/net/eathena/playerhandler.h2
-rw-r--r--src/net/eathena/protocol.h2
-rw-r--r--src/net/eathena/specialhandler.cpp2
-rw-r--r--src/net/eathena/specialhandler.h2
-rw-r--r--src/net/eathena/tradehandler.cpp2
-rw-r--r--src/net/eathena/tradehandler.h2
-rw-r--r--src/net/gamehandler.h2
-rw-r--r--src/net/generalhandler.h2
-rw-r--r--src/net/guildhandler.h2
-rw-r--r--src/net/inventoryhandler.h2
-rw-r--r--src/net/logindata.h2
-rw-r--r--src/net/loginhandler.h2
-rw-r--r--src/net/messagehandler.h2
-rw-r--r--src/net/messagein.cpp2
-rw-r--r--src/net/messagein.h2
-rw-r--r--src/net/messageout.cpp2
-rw-r--r--src/net/messageout.h2
-rw-r--r--src/net/net.cpp2
-rw-r--r--src/net/net.h2
-rw-r--r--src/net/npchandler.h2
-rw-r--r--src/net/packetcounters.cpp2
-rw-r--r--src/net/packetcounters.h2
-rw-r--r--src/net/partyhandler.h2
-rw-r--r--src/net/playerhandler.h2
-rw-r--r--src/net/serverinfo.h2
-rw-r--r--src/net/specialhandler.h2
-rw-r--r--src/net/tmwa/adminhandler.cpp2
-rw-r--r--src/net/tmwa/adminhandler.h2
-rw-r--r--src/net/tmwa/beinghandler.cpp2
-rw-r--r--src/net/tmwa/beinghandler.h2
-rw-r--r--src/net/tmwa/buysellhandler.cpp2
-rw-r--r--src/net/tmwa/buysellhandler.h2
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
-rw-r--r--src/net/tmwa/charserverhandler.h2
-rw-r--r--src/net/tmwa/chathandler.cpp2
-rw-r--r--src/net/tmwa/chathandler.h2
-rw-r--r--src/net/tmwa/gamehandler.cpp2
-rw-r--r--src/net/tmwa/gamehandler.h2
-rw-r--r--src/net/tmwa/generalhandler.cpp39
-rw-r--r--src/net/tmwa/generalhandler.h2
-rw-r--r--src/net/tmwa/gui/guildtab.cpp2
-rw-r--r--src/net/tmwa/gui/guildtab.h2
-rw-r--r--src/net/tmwa/gui/partytab.cpp2
-rw-r--r--src/net/tmwa/gui/partytab.h2
-rw-r--r--src/net/tmwa/guildhandler.cpp2
-rw-r--r--src/net/tmwa/guildhandler.h2
-rw-r--r--src/net/tmwa/inventoryhandler.cpp2
-rw-r--r--src/net/tmwa/inventoryhandler.h2
-rw-r--r--src/net/tmwa/itemhandler.cpp2
-rw-r--r--src/net/tmwa/itemhandler.h2
-rw-r--r--src/net/tmwa/loginhandler.cpp2
-rw-r--r--src/net/tmwa/loginhandler.h2
-rw-r--r--src/net/tmwa/messagehandler.cpp2
-rw-r--r--src/net/tmwa/messagehandler.h2
-rw-r--r--src/net/tmwa/messagein.cpp2
-rw-r--r--src/net/tmwa/messagein.h2
-rw-r--r--src/net/tmwa/messageout.cpp2
-rw-r--r--src/net/tmwa/messageout.h2
-rw-r--r--src/net/tmwa/network.cpp2
-rw-r--r--src/net/tmwa/network.h2
-rw-r--r--src/net/tmwa/npchandler.cpp2
-rw-r--r--src/net/tmwa/npchandler.h2
-rw-r--r--src/net/tmwa/partyhandler.cpp2
-rw-r--r--src/net/tmwa/partyhandler.h2
-rw-r--r--src/net/tmwa/playerhandler.cpp2
-rw-r--r--src/net/tmwa/playerhandler.h2
-rw-r--r--src/net/tmwa/protocol.h2
-rw-r--r--src/net/tmwa/questhandler.cpp2
-rw-r--r--src/net/tmwa/questhandler.h2
-rw-r--r--src/net/tmwa/specialhandler.cpp2
-rw-r--r--src/net/tmwa/specialhandler.h2
-rw-r--r--src/net/tmwa/tradehandler.cpp2
-rw-r--r--src/net/tmwa/tradehandler.h2
-rw-r--r--src/net/tradehandler.h2
-rw-r--r--src/net/worldinfo.h2
-rw-r--r--src/normalopenglgraphics.cpp11
-rw-r--r--src/normalopenglgraphics.h2
-rw-r--r--src/particle.cpp2
-rw-r--r--src/particle.h2
-rw-r--r--src/particlecontainer.cpp2
-rw-r--r--src/particlecontainer.h2
-rw-r--r--src/particleemitter.cpp2
-rw-r--r--src/particleemitter.h2
-rw-r--r--src/particleemitterprop.h2
-rw-r--r--src/party.cpp2
-rw-r--r--src/party.h2
-rw-r--r--src/playerinfo.cpp2
-rw-r--r--src/playerinfo.h2
-rw-r--r--src/playerrelations.cpp2
-rw-r--r--src/playerrelations.h2
-rw-r--r--src/position.cpp2
-rw-r--r--src/position.h2
-rw-r--r--src/properties.h2
-rw-r--r--src/resources/action.cpp2
-rw-r--r--src/resources/action.h2
-rw-r--r--src/resources/ambientlayer.cpp2
-rw-r--r--src/resources/ambientlayer.h2
-rw-r--r--src/resources/animation.cpp2
-rw-r--r--src/resources/animation.h2
-rw-r--r--src/resources/atlasmanager.cpp2
-rw-r--r--src/resources/atlasmanager.h2
-rw-r--r--src/resources/beinginfo.cpp2
-rw-r--r--src/resources/beinginfo.h2
-rw-r--r--src/resources/chardb.cpp2
-rw-r--r--src/resources/chardb.h2
-rw-r--r--src/resources/colordb.cpp2
-rw-r--r--src/resources/colordb.h2
-rw-r--r--src/resources/cursor.cpp2
-rw-r--r--src/resources/cursor.h2
-rw-r--r--src/resources/dye.cpp2
-rw-r--r--src/resources/dye.h2
-rw-r--r--src/resources/emotedb.cpp2
-rw-r--r--src/resources/emotedb.h2
-rw-r--r--src/resources/fboinfo.h2
-rw-r--r--src/resources/image.cpp2
-rw-r--r--src/resources/image.h2
-rw-r--r--src/resources/imagehelper.cpp2
-rw-r--r--src/resources/imagehelper.h2
-rw-r--r--src/resources/imageset.cpp2
-rw-r--r--src/resources/imageset.h2
-rw-r--r--src/resources/imagewriter.cpp2
-rw-r--r--src/resources/imagewriter.h2
-rw-r--r--src/resources/itemdb.cpp2
-rw-r--r--src/resources/itemdb.h2
-rw-r--r--src/resources/iteminfo.cpp2
-rw-r--r--src/resources/iteminfo.h2
-rw-r--r--src/resources/mapdb.cpp2
-rw-r--r--src/resources/mapdb.h2
-rw-r--r--src/resources/mapreader.cpp2
-rw-r--r--src/resources/mapreader.h2
-rw-r--r--src/resources/monsterdb.cpp2
-rw-r--r--src/resources/monsterdb.h2
-rw-r--r--src/resources/npcdb.cpp2
-rw-r--r--src/resources/npcdb.h2
-rw-r--r--src/resources/openglimagehelper.cpp2
-rw-r--r--src/resources/openglimagehelper.h2
-rw-r--r--src/resources/resource.cpp2
-rw-r--r--src/resources/resource.h2
-rw-r--r--src/resources/resourcemanager.cpp2
-rw-r--r--src/resources/resourcemanager.h2
-rw-r--r--src/resources/sdlimagehelper.cpp2
-rw-r--r--src/resources/sdlimagehelper.h2
-rw-r--r--src/resources/sdlmusic.cpp2
-rw-r--r--src/resources/sdlmusic.h2
-rw-r--r--src/resources/soundeffect.cpp2
-rw-r--r--src/resources/soundeffect.h2
-rw-r--r--src/resources/specialdb.cpp2
-rw-r--r--src/resources/specialdb.h2
-rw-r--r--src/resources/spritedef.cpp2
-rw-r--r--src/resources/spritedef.h2
-rw-r--r--src/resources/subimage.cpp2
-rw-r--r--src/resources/subimage.h2
-rw-r--r--src/resources/wallpaper.cpp2
-rw-r--r--src/resources/wallpaper.h2
-rw-r--r--src/rotationalparticle.cpp2
-rw-r--r--src/rotationalparticle.h2
-rw-r--r--src/safeopenglgraphics.cpp11
-rw-r--r--src/safeopenglgraphics.h2
-rw-r--r--src/shopitem.cpp2
-rw-r--r--src/shopitem.h2
-rw-r--r--src/simpleanimation.cpp2
-rw-r--r--src/simpleanimation.h2
-rw-r--r--src/soundmanager.cpp10
-rw-r--r--src/soundmanager.h2
-rw-r--r--src/sprite.h2
-rw-r--r--src/statuseffect.cpp2
-rw-r--r--src/statuseffect.h2
-rw-r--r--src/test/testlauncher.cpp2
-rw-r--r--src/test/testlauncher.h2
-rw-r--r--src/test/testmain.cpp2
-rw-r--r--src/test/testmain.h2
-rw-r--r--src/text.cpp2
-rw-r--r--src/text.h2
-rw-r--r--src/textparticle.cpp2
-rw-r--r--src/textparticle.h2
-rw-r--r--src/tileset.h2
-rw-r--r--src/touchactions.cpp2
-rw-r--r--src/touchactions.h2
-rw-r--r--src/touchmanager.cpp10
-rw-r--r--src/touchmanager.h2
-rw-r--r--src/units.cpp2
-rw-r--r--src/units.h2
-rw-r--r--src/utils/checkutils.cpp2
-rw-r--r--src/utils/checkutils.h2
-rw-r--r--src/utils/copynpaste.cpp2
-rw-r--r--src/utils/copynpaste.h2
-rw-r--r--src/utils/dtor.h2
-rw-r--r--src/utils/gettext.h2
-rw-r--r--src/utils/langs.cpp2
-rw-r--r--src/utils/langs.h2
-rw-r--r--src/utils/mathutils.h2
-rw-r--r--src/utils/mkdir.cpp2
-rw-r--r--src/utils/mkdir.h2
-rw-r--r--src/utils/mutex.h2
-rw-r--r--src/utils/paths.cpp2
-rw-r--r--src/utils/paths.h2
-rw-r--r--src/utils/perfomance.cpp2
-rw-r--r--src/utils/perfomance.h2
-rw-r--r--src/utils/physfsrwops.cpp2
-rw-r--r--src/utils/physfsrwops.h2
-rw-r--r--src/utils/process.cpp2
-rw-r--r--src/utils/process.h2
-rw-r--r--src/utils/sha256.cpp2
-rw-r--r--src/utils/sha256.h2
-rw-r--r--src/utils/specialfolder.cpp2
-rw-r--r--src/utils/specialfolder.h2
-rw-r--r--src/utils/stringutils.cpp2
-rw-r--r--src/utils/stringutils.h2
-rw-r--r--src/utils/stringvector.h2
-rw-r--r--src/utils/translation/podict.cpp2
-rw-r--r--src/utils/translation/podict.h2
-rw-r--r--src/utils/translation/poparser.cpp2
-rw-r--r--src/utils/translation/poparser.h2
-rw-r--r--src/utils/translation/translationmanager.cpp2
-rw-r--r--src/utils/translation/translationmanager.h2
-rw-r--r--src/utils/xml.cpp2
-rw-r--r--src/utils/xml.h2
-rw-r--r--src/variabledata.h2
-rw-r--r--src/vector.cpp2
-rw-r--r--src/vector.h2
-rw-r--r--src/winver.h2
-rwxr-xr-xtools/update-copyright.sh2
796 files changed, 10061 insertions, 9485 deletions
diff --git a/ChangeLog b/ChangeLog
index 056819a8a..90f2c3998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2013-01-20 New release 1.3.1.20
+fix: macosx fixes.
+fix: collision masks.
+fix: crash on exit on windows.
+fix: minor changes in black&black theme.
+fix; servers deletion from servers list.
+fix: language selection in last ubuntu.
+fix: environment variables usage.
+fix: different game sound fixes.
+fix: shortcuts window resize issue in software draw mode.
+add: extend theming.
+add: http registrations in register dialog.
+add: updated jewelry theme.
+add: support for outlined texts in some windows and controls.
+add: show flag icons in language selection list.
+add: chat command to dump environment variables (/dumpe)
+add: open broweser in MacOSX.
+add: popup menu for text fields.
+add: for sound "strike" alias "miss".
+add: different sounds from different weapons.
+add: option to show/hide onscreen keyboard.
+add: actions for onscreen buttons (touch tab).
+add: configurable number of onscreen buttons.
+add: talk to very close npc by only talk key (T).
+add: better stats line in copy to chat stats.
+add: context menu for hyper links.
+add: detect joystick button.
+
2012-12-23 New release 1.2.12.23
fix: reset in memory password if password was wrong.
fix: dont show opengl restart mesasge in settings under Android.
diff --git a/README b/README
index 9ef656eda..4efc479b2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.2.12.23 Date: 2012-12-23
+ Version: 1.3.1.20 Date: 2013-01-20
Development team:
- See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 0dcbad42f..9a3c93f5c 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.2.12.23 Date: 2012-12-23
+ Version: 1.3.1.20 Date: 2013-01-20
Development team:
- See AUTHORS file for a list
diff --git a/build/packevol b/build/packevol
index 1397f28d4..ef6a86057 100755
--- a/build/packevol
+++ b/build/packevol
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../libs/dll/ \
- -DPRODUCT_VERSION="1.2.12.23" \
+ -DPRODUCT_VERSION="1.3.1.20" \
-DEXESUFFIX=/src \
-DUPX=true \
evol.nsi
diff --git a/build/packwin b/build/packwin
index e48950bba..f1f510ce1 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../libs/dll/ \
- -DPRODUCT_VERSION="1.2.12.23" \
+ -DPRODUCT_VERSION="1.3.1.20" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/configure.ac b/configure.ac
index 2433d27cc..b6b5cbc09 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.2.12.23], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.3.1.20], [akaras@inbox.ru], [manaplus])
AM_INIT_AUTOMAKE([1.9])
AC_CONFIG_HEADERS([config.h:config.h.in])
AC_LANG_CPLUSPLUS
diff --git a/data/graphics/flags/CMakeLists.txt b/data/graphics/flags/CMakeLists.txt
index 02a07eaba..4dfe2eaec 100644
--- a/data/graphics/flags/CMakeLists.txt
+++ b/data/graphics/flags/CMakeLists.txt
@@ -9,6 +9,7 @@ SET(FILES
id.png
it.png
jp.png
+ nl_BE.png
pl.png
pt_BR.png
pt.png
diff --git a/data/graphics/flags/Makefile.am b/data/graphics/flags/Makefile.am
index 4396903f6..281f9238b 100644
--- a/data/graphics/flags/Makefile.am
+++ b/data/graphics/flags/Makefile.am
@@ -11,6 +11,7 @@ flags_DATA = \
id.png \
it.png \
jp.png \
+ nl_BE.png \
pl.png \
pt_BR.png \
pt.png \
diff --git a/data/graphics/flags/nl_BE.png b/data/graphics/flags/nl_BE.png
new file mode 100644
index 000000000..4688a684d
--- /dev/null
+++ b/data/graphics/flags/nl_BE.png
Binary files differ
diff --git a/data/graphics/gui/listbox.xml b/data/graphics/gui/listbox.xml
index 6e7cf6080..5e1a5872d 100644
--- a/data/graphics/gui/listbox.xml
+++ b/data/graphics/gui/listbox.xml
@@ -4,5 +4,6 @@
<option name="imagePadding" value="1" />
<option name="textPadding" value="34" />
<option name="spacing" value="2" />
+ <option name="itemPadding" value="1" />
</widget>
</skinset>
diff --git a/data/themes/jewelry/CMakeLists.txt b/data/themes/jewelry/CMakeLists.txt
index 3d6622bad..41826c02c 100644
--- a/data/themes/jewelry/CMakeLists.txt
+++ b/data/themes/jewelry/CMakeLists.txt
@@ -37,6 +37,7 @@ SET (FILES
listbox.xml
login.xml
map.xml
+ ministatus.xml
mouse.png
npc.xml
ok.xml
@@ -68,6 +69,7 @@ SET (FILES
textfield.xml
window.png
window.xml
+ windowmenu.xml
world.xml
)
diff --git a/data/themes/jewelry/Makefile.am b/data/themes/jewelry/Makefile.am
index 328173e7d..70234a5f0 100644
--- a/data/themes/jewelry/Makefile.am
+++ b/data/themes/jewelry/Makefile.am
@@ -40,6 +40,7 @@ gui_DATA = \
listbox.xml \
login.xml \
map.xml \
+ ministatus.xml \
mouse.png \
npc.xml \
ok.xml \
@@ -71,6 +72,7 @@ gui_DATA = \
textfield.xml \
window.png \
window.xml \
+ windowmenu.xml \
world.xml
EXTRA_DIST = \
diff --git a/data/themes/jewelry/listbox.xml b/data/themes/jewelry/listbox.xml
index aae6fd337..c18750726 100644
--- a/data/themes/jewelry/listbox.xml
+++ b/data/themes/jewelry/listbox.xml
@@ -4,6 +4,7 @@
<option name="padding" value="8" />
<option name="textPadding" value="48" />
<option name="imagePadding" value="2" />
+ <option name="itemPadding" value="1" />
<option name="spacing" value="0" />
</widget>
diff --git a/data/themes/jewelry/ministatus.xml b/data/themes/jewelry/ministatus.xml
new file mode 100644
index 000000000..7db6eda92
--- /dev/null
+++ b/data/themes/jewelry/ministatus.xml
@@ -0,0 +1,11 @@
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+
+ <option name="padding" value="5" />
+ <option name="spacing" value="3" />
+
+ <option name="iconPadding" value="3" />
+ <option name="iconSpacing" value="2" />
+
+ </widget>
+</skinset>
diff --git a/data/themes/jewelry/window.png b/data/themes/jewelry/window.png
index e18b47f4f..f8f091225 100644
--- a/data/themes/jewelry/window.png
+++ b/data/themes/jewelry/window.png
Binary files differ
diff --git a/data/themes/jewelry/windowmenu.xml b/data/themes/jewelry/windowmenu.xml
new file mode 100644
index 000000000..06f20bf2f
--- /dev/null
+++ b/data/themes/jewelry/windowmenu.xml
@@ -0,0 +1,8 @@
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+
+ <option name="padding" value="4" />
+ <option name="spacing" value="3" />
+
+ </widget>
+</skinset>
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 742c6ca86..af64fd034 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -4,11 +4,13 @@
# Andrei Karas <akaras@inbox.ru>, 2012.
# <BoBaH4spam@ukr.net>, 2012.
# Dan Sagunov <danilka.pro@gmail.com>, 2012.
+# <ratrex@mail.ru>, 2013.
+# Victor <ratrex@mail.ru>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-10-17 17:34+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2013-01-18 07:21+0000\n"
+"Last-Translator: RatreX <ratrex@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +54,7 @@ msgid ""
" the item. To reorder items within the shortcut-window simply click and drag\n"
" them between the boxes. To remove items you simply drag them outside of the\n"
" window and drop them."
-msgstr ""
+msgstr " Чтобы добавить предмет на панель Ñрлыков, щелкните по предмету в окне ÑнарÑжениÑ,\n затем щелкните в Ñчейке на панели Ñрлыков, в которой вы хотите закрепить предмет.\n Чтобы переназначить предметы на панели Ñрлыков, проÑто щелкните и тащите их между Ñчейками. Чтобы убрать предмет, проÑто перетащите его за пределы границы панели Ñрлыков\n и отпуÑтите."
msgid "##2F2##P \"Status Window\""
msgstr "##2F2##P \"Окно СоÑтоÑние\""
@@ -113,7 +115,7 @@ msgstr "##2KeyPad[8]##P \"Выключить / Включить Ð
msgid ""
" - ##2allow whispers##P: Do you wish to allow arbitrary players to send\n"
" private messages to you in-game?"
-msgstr ""
+msgstr " - ##2разрешить шепот##P: Разрешить другим игрокам приÑылать\nвам приватные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² игре?"
msgid "##PMagic skills can be obtain by doing quests and missions in game."
msgstr "##PМагичеÑкие ÑƒÐ¼ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ быть приобретены путем Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ²ÐµÑтов и миÑÑий в игре."
@@ -137,11 +139,11 @@ msgid "##2a##P \"Target Closest\""
msgstr "##2a##P \"Выбор цели Ð´Ð»Ñ Ð°Ñ‚Ð°ÐºÐ¸\""
msgid "##2Party level2:##P enables a char to create a party."
-msgstr ""
+msgstr "##2Группа уровень2:##P включает возможноÑÑ‚ÑŒ Ñоздавать группу."
msgid ""
"Website: @@http://manaplus.evolonline.org/|http://manaplus.evolonline.org/@@"
-msgstr ""
+msgstr "Интернет Ñайт: @@http://manaplus.evolonline.org/|http://manaplus.evolonline.org/@@"
msgid "##2y##P \"Quick Drop N Items from 0 slot\""
msgstr "##2y##P \"БыÑтро выброÑить N вещей из Ñлота 0\""
@@ -190,7 +192,7 @@ msgstr "/addattack МОÐСТР - добавить монÑтра в ÑпиÑоÐ
msgid ""
" - ##2friend##P: You consider this player a friend. The player may chat,\n"
" message your in private, or trade with you at any point."
-msgstr ""
+msgstr " - ##2друг##P: Ð’Ñ‹ Ñчитаете Ñтого игрока другом. Игрок может пиÑать в чат,\n поÑылать вам приватные ÑообщениÑ, торговать Ñ Ð²Ð°Ð¼Ð¸ в любом меÑте."
msgid ""
"You can walk to warps automatically.\n"
@@ -211,7 +213,7 @@ msgid "##2LeftAlt + 8##P \"Emote Shortcut 8\""
msgstr "##2LeftAlt + 8##P \"Ð­Ð¼Ð¾Ñ†Ð¸Ñ 8\""
msgid "##2RightWinKey##P \"Ignore input 2\""
-msgstr ""
+msgstr "##2ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° Win##P \"Игнорировать ввод 2\""
msgid "/outfit N - wear outfit number N."
msgstr "/outfit N - одевает нарÑд номер N."
@@ -246,18 +248,18 @@ msgid ""
msgstr " - ##2ignored##P: Ð’Ñ‹ полноÑтью игнорируете Ñтого игрока. Ð’Ñ‹ не будете видеть его вÑплывающие ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ Ñмоции."
msgid "##2RightShift + key##P \"Move to navigation point\""
-msgstr ""
+msgstr "##2Правый Shift + Ñимвол##P \"ДвигатьÑÑ Ðº точке навигации\""
msgid ""
"You can do basic searching in help by using command\n"
"##2?text"
-msgstr ""
+msgstr "Ð’Ñ‹ можете иÑпользовать проÑтой поиÑк по Ñправке иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ\n##2?текÑÑ‚"
msgid "##24##P \"Item Shortcut 4\""
-msgstr ""
+msgstr "##24##P \"Ярлык предмета 4\""
msgid "##2PageUP##P \"Scroll Chat Up\""
-msgstr ""
+msgstr "##2PageUP##P \"Прокрутить чат вверх\""
msgid "/unignore NICK - Remove nick from ignore list."
msgstr "/unignore ИГРОК - убрать игрока из ÑпиÑка игнорированиÑ."
@@ -287,10 +289,10 @@ msgid "Other skills:"
msgstr "Другие умениÑ:"
msgid "##2MenuKey##P \"Item Shortcuts Key\""
-msgstr ""
+msgstr "##2Клавиша Menu##P \"Ярлык предмета Ñимвол\""
msgid "##28##P \"Item Shortcut 8\""
-msgstr ""
+msgstr "##28##P \"Ярлык предмета 8\""
msgid ""
"You can use mumble voice chat for talking with other players.\n"
@@ -301,10 +303,10 @@ msgid "##2RightAlt##P \"Copy Outfit\""
msgstr "##2RightAlt##P \"Копировать коÑтюм\""
msgid "Here contributors from parent projects"
-msgstr ""
+msgstr "ЗдеÑÑŒ учаÑтники из родительÑких проектов"
msgid "##20##P \"Item Shortcut 10\""
-msgstr ""
+msgstr "##20##P \"Ярлык предмета 10\""
msgid ""
"You can restore yellow bar settings,\n"
@@ -336,13 +338,13 @@ msgid "##2LeftAlt + EmoteKey##P \"Smilie\""
msgstr "##2LeftAlt + EmoteKey##P \"Смайл\""
msgid "##22##P \"Item Shortcut 2\""
-msgstr ""
+msgstr "##22##P \"Ярлык предмета 2\""
msgid "KEYBOARD:"
msgstr "КЛÐВИÐТУРÐ:"
msgid "##2Semicolon(;)##P \"Set Direction Down\""
-msgstr ""
+msgstr "##2Точка Ñ Ð·Ð°Ð¿Ñтой (;)##P \"УÑтановить направление Вниз\""
msgid ""
"You can hide/show bars and buttons by right click and select menu item."
@@ -364,7 +366,7 @@ msgid "ABOUT MANAPLUS"
msgstr "Об игре MANAPLUS"
msgid "##2KeyPad0##P \"Change move type\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° 0##P \"Сменить тип движениÑ\""
msgid "Search results"
msgstr "Результат поиÑка"
@@ -390,10 +392,10 @@ msgid "/ignore NICK - add nick to ignore list."
msgstr "/ignore ИГРОК - добавить игрока в ÑпиÑок игнорированиÑ."
msgid "##23##P \"Item Shortcut 3\""
-msgstr ""
+msgstr "##23##P \"Ярлык предмета 3\""
msgid "##29##P \"Item Shortcut 9\""
-msgstr ""
+msgstr "##29##P \"Ярлык предмета 9\""
msgid "/outfit next - wear next outfit."
msgstr "/outfit next - надеть Ñледующий коÑтюм."
@@ -416,13 +418,13 @@ msgid "##2KeyPad[+]##P \"Toggle camera mode\""
msgstr "##2KeyPad[+]##P \"Переключить режим камеры\""
msgid "##2Home##P \"Item Shortcut 15\""
-msgstr ""
+msgstr "##2Home##P \"Ярлык предмета 15\""
msgid "/clear - clear current chat tab."
msgstr "/clear - очиÑтить текущую вкладку чата."
msgid "##2KeyPad[9]##P \"Next chat tab line\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° [9]##P \"Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ° чата\""
msgid "Chat commands"
msgstr "Команды чата"
@@ -434,10 +436,10 @@ msgid "/blacklist NICK - add nick to blacklist relation list."
msgstr "/blacklist ИГРОК - добавить игрока в черный ÑпиÑок."
msgid "##2Comma(,)##P \"Switch magic attack\""
-msgstr ""
+msgstr "##2ЗапÑÑ‚Ð°Ñ (,)##P \"Сменить магичеÑкую атаку\""
msgid "##2Tab##P \"Chat Auto Complete\""
-msgstr ""
+msgstr "##2Tab##P \"ÐвтоподÑтановка в чате\""
msgid "##2LeftAlt + 5##P \"Emote Shortcut 5\""
msgstr "##2LeftAlt + 5##P \"Ð­Ð¼Ð¾Ñ†Ð¸Ñ 5\""
@@ -446,13 +448,13 @@ msgid ""
" - ##2save player list##P: Should your acquaintance list be saved when you\n"
" quit the game? If you enable this option, your list will survive when you\n"
" quit and re-start."
-msgstr ""
+msgstr " - ##2Ñохранить ÑпиÑок игрока##P: Следует ли ÑохранÑÑ‚ÑŒ ÑпиÑок знакомÑтв, когда вы\n выходите из игры? ЕÑли включить Ñту опцию, ваш ÑпиÑок будет Ñохранен, когда вы\n выходите или делаете реÑтарт."
msgid "##2PageDOWN##P \"Scroll Chat Down\""
-msgstr ""
+msgstr "##2PageDOWN##P \"Прокрутить чат Вниз\""
msgid "##2KeyPad[2]##P \"Enable / Disable away mode\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° [2]##P \"Включить / Выключить режим отÑутÑтвиÑ\""
msgid "##2j##P \"Commands Window\""
msgstr "##2j##P \"Окно команд\""
@@ -498,14 +500,14 @@ msgstr "##2i##P \"Switch Quick Drop Counter\""
msgid ""
"##2ManaPlus##P is extended client based on old code from ##2Mana##P client.\n"
" Added many features, improved perfomance, stability, security and more."
-msgstr ""
+msgstr "##2ManaPlus##P Ñто раÑширенный клиент оÑнованный на Ñтаром коде клиента ##2Mana##P.\n Добавлено много возможноÑтей, улучшена производительноÑÑ‚ÑŒ, ÑтабильноÑÑ‚ÑŒ, безопаÑноÑÑ‚ÑŒ и многое другое."
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large\n"
" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
-msgstr ""
+msgstr "##2ManaPlus##P - Ñто ÑÐµÑ€ÑŒÐµÐ·Ð½Ð°Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð° по Ñозданию инновационного\nÑвободного MMORPG-клиента Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ иÑходным кодом.\nИгра иÑпользует 2D графику и нацелена на Ñоздание огромных\nи разнообразных интерактивных миров. Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ GPL позволÑет\nбыть уверенным в том, что игра никогда не отвернетÑÑ Ð¾Ñ‚ ВаÑ."
msgid "##2LeftAlt + 2##P \"Emote Shortcut 2\""
msgstr "##2LeftAlt + 2##P \"Ð­Ð¼Ð¾Ñ†Ð¸Ñ 2\""
@@ -523,13 +525,13 @@ msgid ""
" - ##2neutral##P: As far as the game is concerned, this is the same as not\n"
" having the player listed: the player may chat with you, but may only trade\n"
" or whisper if you have this option allowed for everyone."
-msgstr ""
+msgstr " - ##2нейтрайльный##P: КаÑаемо игры, Ñто то же Ñамое, что не\n иметь игрока в ÑпиÑке: игрок может общатьÑÑ Ñ Ð²Ð°Ð¼Ð¸ в чате, но торговать\n или Ñлать приватные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ тогда, когда у Ð²Ð°Ñ Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð° Ð´Ð»Ñ Ð²Ñех."
msgid "Skills"
msgstr "УмениÑ"
msgid "##2Party Level1:##P enables a char to join a party."
-msgstr ""
+msgstr "##2Группа Уровень1:##P Включает возможноÑÑ‚ÑŒ вÑтупать в группу."
msgid ""
" There you will find a list of all players you are acquainted with, as well as\n"
@@ -548,17 +550,17 @@ msgid "##2F1##P \"Help Window\""
msgstr "##2F1##P \"Окно помощи\""
msgid "##2g##P \"Change Attack Weapon Type\""
-msgstr ""
+msgstr "##2g##P \"Смена типа атаки оружием\""
msgid ""
"If client working very slow, you can improve speed\n"
"by reading this: @@http://manaplus.evolonline.org/slowpc|http://manaplus.evolonline.org/slowpc@@"
-msgstr ""
+msgstr "ЕÑли клиент работает очень медленно, вы можете увеличить ÑкороÑÑ‚ÑŒ\nпрочитав материал по ÑÑылке: @@http://manaplus.evolonline.org/slowpc|http://manaplus.evolonline.org/slowpc@@"
msgid ""
" The player list lists all of your acquaintances. They are categorised as one\n"
" of the following:"
-msgstr ""
+msgstr " СпиÑок игрока отображает вÑе ваши знакомÑтва. Они клаÑÑифицируютÑÑ ÐºÐ°Ðº один\n из Ñледующих:"
msgid "/outfit prev - wear previous outfit."
msgstr "/outfit prev - надеть предыдущий коÑтюм."
@@ -566,13 +568,13 @@ msgstr "/outfit prev - надеть предыдущий коÑтюм."
msgid ""
"##P This file lists all contributors up to the current release. Check the wiki\n"
"##P for the currently active development team."
-msgstr ""
+msgstr "##P Этот файл отображает вÑех разработчиков вплоть до текущей верÑии. Перейдите на wiki\n##P чтобы узнать текущий активный ÑоÑтав команды разработчиков."
msgid "Contributors to client/server development"
msgstr "Ð’ разработке клиентÑкой и Ñерверной чаÑти принимали учаÑтие"
msgid "##2KeyPad[1]##P \"Change Follow mode\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° [1]##P \"Сменить режим Следовать\""
msgid "SHORTCUTS:"
msgstr "БЫСТРЫЕ КЛÐВИШИ"
@@ -584,10 +586,10 @@ msgid "/emote N - use emotion number N."
msgstr "/emote N - иÑпользовать Ñмоцию N."
msgid "##2Minus(-)##P \"Item Shortcut 11\""
-msgstr ""
+msgstr "##2ÐœÐ¸Ð½ÑƒÑ (-)##P \"Ярлык предмета 11\""
msgid "##2Esc##P \"Deactivate Chat Input\""
-msgstr ""
+msgstr "##2Esc##P \"Отменить ввод в чат\""
msgid "Player relations"
msgstr "ÐžÑ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ игроками"
@@ -607,7 +609,7 @@ msgid "##2RIGHT##P \"Move Right\""
msgstr "##2RIGHT##P \"ДвигатьÑÑ Ð²Ð¿Ñ€Ð°Ð²Ð¾\""
msgid "##2RightBracket(])##P \"Copy Equiped to Outfit\""
-msgstr ""
+msgstr "##2ÐŸÑ€Ð°Ð²Ð°Ñ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð½Ð°Ñ Ñкобка (])##P \"Копировать одетое в Экипировку\""
msgid "##2DOWN##P \"Move Down\""
msgstr "##2DOWN##P \"ДвигатьÑÑ Ð²Ð½Ð¸Ð·\""
@@ -618,22 +620,22 @@ msgstr "##2n##P \"Выбор цели - NPC\""
msgid ""
"About yellow bar you can read here:\n"
"@@http://manaplus.evolonline.org/yellowbar|http://manaplus.evolonline.org/yellowbar@@"
-msgstr ""
+msgstr "Ð’Ñе о желтой панели вы можете прочеÑÑ‚ÑŒ здеÑÑŒ:\n@@http://manaplus.evolonline.org/yellowbar|http://manaplus.evolonline.org/yellowbar@@"
msgid "##2LeftAlt + 3##P \"Emote Shortcut 3\""
-msgstr ""
+msgstr "##2Левый Alt + 3##P \"Ярлык Ñмоций 3\""
msgid "##2Backslash(/)##P \"Change Crazy Move mode\""
-msgstr ""
+msgstr "##2ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð°Ñ Ñ‡ÐµÑ€Ñ‚Ð° (/)##P \"Сменить режим СумаÑшедших движений\""
msgid "##2F8##P \"Item Shortcut Window\""
-msgstr ""
+msgstr "##2F8##P \"Окно Ñрлыков предметов\""
msgid "##2w##P \"Quick drop Window\""
-msgstr ""
+msgstr "##2w##P \"Окно выброÑа\""
msgid "##2u##P \"Quick Drop N Items\""
-msgstr ""
+msgstr "##2u##P \"БыÑтро выброÑить N предметов\""
msgid "You can change any key in keyboard settings."
msgstr "Ð’Ñ‹ можете изменить любую клавишу в наÑтройках"
@@ -651,10 +653,10 @@ msgid "/disregard NICK - add nick to disregarded list."
msgstr "/disregard NICK - добавлÑет NICK в ÑпиÑок нехороших ников."
msgid "##2F9##P \"Setup Window\""
-msgstr ""
+msgstr "##2F9##P \"Окно наÑтроек\""
msgid "##2F5##P \"Skill Window\""
-msgstr ""
+msgstr "##2F5##P \"Окно навыков\""
msgid "Commands"
msgstr "Команды"
@@ -665,38 +667,38 @@ msgstr "/undress NICK - ÑнÑÑ‚ÑŒ вÑÑŽ одежду Ñ NICK. Только мÐ
msgid ""
" Otherwise see the @@team|Development Team@@ section to have a list of\n"
" developers and how to contact them."
-msgstr ""
+msgstr " Ð’ противном Ñлучае Ñмотрите Ñекцию @@команда|Команда Разработчиков@@, чтобы получить ÑпиÑок\n разработчиков и информацию, как Ñ Ð½Ð¸Ð¼Ð¸ ÑвÑзатьÑÑ."
msgid "##2Quote(')##P \"Set Direction Right\""
-msgstr ""
+msgstr "##2Кавычка (')##P \"УÑтановить направление Вправо\""
msgid "##2F4##P \"Equipment Window\""
msgstr "##2F4##P \"Окно ÑнарÑжениÑ\""
msgid "/away, /away MSG - set away mode."
-msgstr ""
+msgstr "/away, /away СООБЩЕÐИЕ - уÑтановить режим отÑутÑтвиÑ."
msgid ""
"/mail NICK MSG - send offline message to NICK. Working only in tmw server."
-msgstr ""
+msgstr "/mail ÐИК СООБЩЕÐИЕ - поÑлать оффлайн Ñообщение игроку ÐИК. Работает только на tmw Ñерверах."
msgid "##2k##P \"Set Direction Left\""
-msgstr ""
+msgstr "##2k##P \"УÑтановить направление Влево\""
msgid ""
" - ##2disregarded##P: You wish to disregard this player, meaning that his or\n"
" her chat messages are not logged and trade requests and whispers are\n"
" ignored."
-msgstr ""
+msgstr " - ##2проигнорированный##P: Ð’Ñ‹ хотите проигнорировать Ñтого игрока, Ñто означает что его или\n её чат ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð½Ðµ будут отображатьÑÑ, также будут проигнорированы запроÑÑ‹ на торговлю и \nприватные ÑообщениÑ."
msgid "##2o##P \"Change Pickup Type\""
-msgstr ""
+msgstr "##2o##P \"Сменить тип Подбора\""
msgid "##2BackQuote(`)##P \"Outfits Window\""
-msgstr ""
+msgstr "##2ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð°Ñ ÐºÐ°Ð²Ñ‹Ñ‡ÐºÐ° (`)##P \"Окно Ñкипировки\""
msgid "##2Period(.)##P \"Change Move to Target type\""
-msgstr ""
+msgstr "##2Точка (.)##P \"Сменить ÑпоÑоб Ð¡Ð»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ðº цели\""
msgid "##2F10##P \"Debug Window\""
msgstr "##2F10##P \"Окно отладки\""
@@ -704,18 +706,18 @@ msgstr "##2F10##P \"Окно отладки\""
msgid ""
"##2 @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@\n"
" or visit IRC channel:"
-msgstr ""
+msgstr "##2 @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@\n или поÑетите IRC канал:"
msgid ""
" - ##2allow trading##P: Do you wish to allow trade requests from arbitrary\n"
" players?"
-msgstr ""
+msgstr " - ##2разрешить торговлю##P: Хотите ли вы разрешить запроÑÑ‹ на торговлю от других\n игроков?"
msgid "Whispers commands"
msgstr "Команды привата"
msgid "##2LeftAlt + Insert##P \"Emote Shortcut 14\""
-msgstr ""
+msgstr "##2Левый Alt + Insert##P \"Ярлык Ñмоций 14\""
msgid ""
" Left click to execute default action: walk, pick up an item, attack a monster\n"
@@ -726,51 +728,51 @@ msgstr " Левый клик - дейÑтвие по умолчанию: идтÐ
msgid ""
"You can see other player equiped items,\n"
"by right click on player and select in context menu \"Show Items\"."
-msgstr ""
+msgstr "Ð’Ñ‹ можете видеть Ñкипировку других игроков,\nщелкните на игроке правой кнопкой мыши и выберите \"Показать предметы\"."
msgid "##2d##P \"Move to Home location\""
-msgstr ""
+msgstr "##2d##P \"ДвигатьÑÑ Ðº Своему маркеру\""
msgid "Whispers"
msgstr "Приват (шепот, whisper)"
msgid "##2LeftAlt + 0##P \"Emote Shortcut 10\""
-msgstr ""
+msgstr "##2Левый Alt + 0##P \"Ярлык Ñмоций 10\""
msgid "/help - show small help about chat commands. "
-msgstr ""
+msgstr "/help - отображает небольшую Ñправку о чат командах. "
msgid ""
"You can set any client resolution. In settings in video tab,\n"
"click on \"custom\" and enter for example: 900x500 and press ok."
-msgstr ""
+msgstr "Ð’Ñ‹ можете уÑтановить любое разрешение. Ð’ наÑтройках на вкладке видео,\nщелкните по Ñтроке \"произвольное\" и введите например: 900x500 и нажмите ok."
msgid "/attack - attack target."
-msgstr ""
+msgstr "/attack - атаковать цель."
msgid "##2f##P \"Change Map View Mode\""
-msgstr ""
+msgstr "##2f##P \"Сменить режим Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°Ñ€Ñ‚Ñ‹\""
msgid ""
" You may find that not all communication is to your liking. While most people\n"
" are nice, some may offend you or try to make your life harder-- since this is\n"
" an open game, there is nothing the developers can do to prevent this."
-msgstr ""
+msgstr "Ð’Ñ‹ можете обнаружить, что не вÑÑ‘ общение вам по вкуÑу. Ð¥Ð¾Ñ‚Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½Ñтво людей\n дружелюбны, некоторые могут оÑкорбить Ð²Ð°Ñ Ð¸Ð»Ð¸ Ñделать вашу жизнь Ñложнее-- так как Ñто\n Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð°Ñ Ð¸Ð³Ñ€Ð°, здеÑÑŒ разработчики ничего не могут поделать, чтобы предотвратить Ñто."
msgid "About"
msgstr "Об игре"
msgid "##2KeyPad[9]##P \"Next Chat Tab\""
-msgstr ""
+msgstr "##2Цифрова клавиша [9]##P \"Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ° чата\""
msgid "##2KeyPad[7]##P \"Previous chat tab line\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° [7]##P \"ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ñтрока вкладки чата\""
msgid "##2Trade:##P enables the ability to trade with others."
-msgstr ""
+msgstr "##2ТорговлÑ:##P включает возможноÑÑ‚ÑŒ торговли Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸."
msgid "##2LeftAlt + Backspace##P \"Emote Shortcut 13\""
-msgstr ""
+msgstr "##2Левый Alt + Backspace##P \"Ярлык Ñмоций 13\""
msgid "##2p##P \"Screenshot\""
msgstr "##2p##P \"Скриншот\""
@@ -782,25 +784,25 @@ msgid "##2b##P \"Use magic attack\""
msgstr "##2b##P \"ИÑпользовать магичеÑкую атаку\""
msgid "##2KeyPad[4]##P \"Change Imitation mode\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° [4]##P \"Сменить режим ПодражаниÑ\""
msgid "##2Tab##P \"Emulate right click from keyboard\""
-msgstr ""
+msgstr "##2Tab##P \"Эмулировать правую кнопку мыши Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹\""
msgid "##2LeftBracket([)##P \"Bot Checker Window\""
-msgstr ""
+msgstr "##2Ð›ÐµÐ²Ð°Ñ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð½Ð°Ñ Ñкобка ([)##P \"Окно проверки бота\""
msgid "##2l##P \"Set Direction Up\""
-msgstr ""
+msgstr "##2l##P \"УÑтановить направление Вверх\""
msgid "/serverignoreall - ignore all whispers on server side."
-msgstr ""
+msgstr "/serverignoreall - игнорировать вÑе приватные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð½Ð° Ñтороне Ñервера."
msgid "##2v##P \"Move to Target\""
msgstr "##2v##P \"ДвигатьÑÑ Ðº цели\""
msgid "##2KeyPad[7]##P \"Previous Chat Tab\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° [7]##P \"ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ° чата\""
msgid ""
"##2 SDL, SDL_image, SDL_mixer (Media framework)\n"
@@ -810,16 +812,16 @@ msgid ""
"##2 PhysFS (Data files)\n"
"##2 libcurl (HTTP downloads)\n"
"##2 zlib (Archives)"
-msgstr ""
+msgstr "##2 SDL, SDL_image, SDL_mixer (Медиа Ñ„Ñ€Ñймворк)\n##2 SDL_net (Сетевой Ñ„Ñ€Ñймворк)\n##2 Guichan (ГрафичеÑкий фреймворк)\n##2 libxml2 (XML парÑинг и запиÑÑŒ)\n##2 PhysFS (Файлы данных)\n##2 libcurl (HTTP загрузки)\n##2 zlib (Ðрхивы)"
msgid "##2h##P \"Hide Windows\""
-msgstr ""
+msgstr "##2h##P \"СпрÑтать окна\""
msgid "##2Version:##6%VER%"
msgstr "##2ВерÑиÑ:##6%VER%"
msgid "##2Equals(=)##P \"Item Shortcut 12\""
-msgstr ""
+msgstr "##2Равно (=)##P \"Ярлык предмета 12\""
msgid ""
" However, you can protect yourself from such players by ignoring them. Right-\n"
@@ -827,13 +829,13 @@ msgid ""
" `Disregard' (see below). You can fine-tune your player relations in the\n"
" `Setup' menu, which lists all the players you have added to it. To open this\n"
" menu, select `Setup' in the upper right corner of the screen, then `Relations'."
-msgstr ""
+msgstr "Впрочем, вы можете защититьÑÑ Ð¾Ñ‚ таких игроков, Ð¸Ð³Ð½Ð¾Ñ€Ð¸Ñ€ÑƒÑ Ð¸Ñ…. Правым-⎠кликом на игроке откройте контекÑтное меню, затем выберите `Игнорировать' или⎠`Пренебречь' (Ñм. выше). Ð’Ñ‹ можете наÑтраивать Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ñ Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°Ð¼Ð¸ в меню ⎠`ÐаÑтройка', которое показывает вÑех игроков, добавленных туда. Чтобы открыть Ñто⎠меню, выберите `ÐаÑтройка' в правом верхнем углу Ñкрана, затем `Игроки'."
msgid "/follow NICK - start follow mode."
-msgstr ""
+msgstr "/follow ÐИК- Ñледовать за данным игроком."
msgid "/navigate x y - move to position x,y in current map in any distance."
-msgstr ""
+msgstr "/navigate x y - двигатьÑÑ Ð² позицию x,y на текущей карте на любом раÑÑтоÑнии."
msgid "SKILLS"
msgstr "УМЕÐИЯ"
@@ -842,28 +844,28 @@ msgid "Art or images contributors"
msgstr "Художники"
msgid "##27##P \"Item Shortcut 7\""
-msgstr ""
+msgstr "##27##P \"Ярлык предмета 7\""
msgid "##2F12##P \"Emote Shortcut Window\""
-msgstr ""
+msgstr "##2F12##P \"Окно Ñрлыков Ñмоций\""
msgid "Actions"
msgstr "ДейÑтвиÑ"
msgid "##2Insert##P \"Item Shortcut 14\""
-msgstr ""
+msgstr "##2Insert##P \"Ярлык предмета 14\""
msgid "Sound effects"
-msgstr ""
+msgstr "Звуковые Ñффекты"
msgid "##2F6##P \"Minimap Window\""
-msgstr ""
+msgstr "##2F6##P \"Окно миникарты\""
msgid "##2c##P \"Quick heal target or self\""
-msgstr ""
+msgstr "##2c##P \"БыÑтрое лечение цели или ÑебÑ\""
msgid "##2KeyPad[5]##P \"Set home location/Set arrow\""
-msgstr ""
+msgstr "##2Ð¦Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° [5]##P \"УÑтановить Ñвой маркер/УÑтановить Ñтрелку\""
msgid "##26##P \"Item Shortcut 6\""
-msgstr ""
+msgstr "##26##P \"Ярлык предмета 6\""
diff --git a/po/ar.po b/po/ar.po
index cd0b55975..cb9dc4cdd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "تثبيت"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "مرئية"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "خطأ"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -414,22 +414,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -438,8 +438,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "شراء"
@@ -457,7 +457,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -465,7 +465,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -477,8 +477,8 @@ msgid "Quit"
msgstr "مغادرة"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -488,8 +488,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "بيع"
@@ -498,21 +498,22 @@ msgstr "بيع"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "إلغاء"
@@ -787,7 +788,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -800,9 +801,9 @@ msgstr "نعم"
msgid "No"
msgstr "لا"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1026,8 +1027,8 @@ msgid "Equipment"
msgstr "العتاد"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "تجريد من العتاد"
@@ -1061,47 +1062,47 @@ msgid "Inventory"
msgstr "الجردة"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "استعمال العتاد"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "استخدام"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "قسم"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "إسقاط"
@@ -1345,18 +1346,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "المستوى: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1377,7 +1378,7 @@ msgstr ""
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1412,346 +1413,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2450,7 +2455,7 @@ msgid "Music volume"
msgstr "حجم صوت الموسيقا"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2727,31 +2732,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "إضغط على الزرّ لبدأ المعايرة"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "معايرة"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "تÙعيل عصا الألعاب"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "عصا الألعاب"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "إيقاÙ"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3944,39 +3953,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4458,7 +4467,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5916,54 +5925,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 134a8fe61..05a1480e6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -468,8 +468,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -478,21 +478,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -767,7 +768,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index e0f9cdeba..946a803a7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "sortir"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -468,8 +468,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -478,21 +478,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -767,7 +768,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr "si"
msgid "No"
msgstr "no"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 6bf32884f..03f5e6bcc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
"cs/)\n"
@@ -30,7 +30,7 @@ msgstr "Ignorovat příchozí žádosti o obchodování"
msgid "Accepting incoming trade requests"
msgstr "Akceptovat příchozí žádosti o obchodování"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Viditelný na mapě"
@@ -56,54 +56,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Nastavení"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Výkon"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Zavřít"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Přihlašuji se"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Požaduji postavy"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Zaměňuji herní servery"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -112,50 +112,50 @@ msgstr "Zaměňuji herní servery"
msgid "Error"
msgstr "Chyba"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Požaduji registraÄní detaily"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Změna hesla"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Změna emailu"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s neexistuje a vytvoÅ™ení selhalo. KonÄím."
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Neplatný host updatů: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Chyba při vytváření adresáře s updaty!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Chyba: %s neexistuje a nelze ho vytvoÅ™it. UkonÄuji."
@@ -405,22 +405,22 @@ msgstr "Vynulovat"
msgid "Name"
msgstr "Jméno"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "ZaútoÄ"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Promluv"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Jdi sem"
@@ -429,8 +429,8 @@ msgid "Result"
msgstr "Výsledek"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Nákup"
@@ -448,7 +448,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -456,7 +456,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -468,8 +468,8 @@ msgid "Quit"
msgstr "UkonÄit"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "VÅ¡e"
@@ -479,8 +479,8 @@ msgstr "VÅ¡e"
msgid "Shop"
msgstr "Obchod"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Prodej"
@@ -489,21 +489,22 @@ msgstr "Prodej"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Zrušit"
@@ -778,7 +779,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr "Přítomni: %s; %d hráÄů je přítomno."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šeptání pro %s: %s"
@@ -791,9 +792,9 @@ msgstr "Ano"
msgid "No"
msgstr "Ne"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignorovat"
@@ -1017,8 +1018,8 @@ msgid "Equipment"
msgstr "Vybavení"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Odstranit z vybavení"
@@ -1052,47 +1053,47 @@ msgid "Inventory"
msgstr "Inventář"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Vybavit"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Použít"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Upustit..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Rozdělit"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Výstroje"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Uložit"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Vzít"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Upustit"
@@ -1330,18 +1331,18 @@ msgstr "stavový řádek"
msgid "job bar"
msgstr "pruh práce"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Úroveň: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Úroveň: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Potřebuješ"
@@ -1362,7 +1363,7 @@ msgstr "Odeslat"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Vyprázdnit"
@@ -1397,346 +1398,350 @@ msgstr "Výstroj pro \"Away\""
msgid "Key: %s"
msgstr "Klávesa: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Obchod"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Å eptat"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "VyléÄit"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Vykopnout z gildy"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Změnit pozici v gildě"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Pozvat do gildy"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Vykopnout hráÄe"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Přidat komentář"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Vykopnout"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Vložit do seznamu ignorovaných"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Vložit jméno do chatu"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "HráÄi"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Vykopnout z party"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Sebrat"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Vložit do chatu"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "OznaÄit na mapÄ›"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Přejmenovat"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Odebrat"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Kouzla"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Upravit kouzlo"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Vypnout zvýrazňování"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Zapnout zvýrazňování"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Neodebírat jméno"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Odebrat jméno"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Zapnout \"away\""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Vypnout \"away\""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Odejít"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Pozvat do party"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Změň hodnost v guildě"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "PÅ™ejmenovat znaÄku na mapÄ›"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Jméno: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "HráÄův komentář"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Komentář: "
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Přidat do transakce"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Přidat 10 do transakce"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Přidat polovinu do transakce"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Vlož do obchodu vše-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Přidat vše do transakce"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Uschovat 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Uschovat polovinu"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr "Ulož vše-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Uschovat všechny"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Upustit vše"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Vzít 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Vzít polovinu"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr "Vyber vše-1"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Vzít všechny"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Skrýt"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Zobrazit"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Resetovat žlutý pruh"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Zkopírovat do chatu"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Posunout nahoru"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Posunout dolů"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Svléct"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Být přátelé"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Přehlížet"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Vymazat"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Odignorovat"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "KompletnÄ› ignorovat"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Následovat"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "imitovat"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Koupit (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Prodat (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Zobrazit věci"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Vyjmi ze seznamu sběru"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Přidej do seznamu sběru"
@@ -2435,7 +2440,7 @@ msgid "Music volume"
msgstr "Hlasitost hudby"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2714,31 +2719,35 @@ msgstr ""
"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
"chovat podivnÄ›."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "StisknÄ›te tlaÄítko pro zahájení kalibrace"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibrovat"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Zapnout joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Zastavit"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3934,39 +3943,39 @@ msgstr "Zvolte jméno vaší party."
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Peníze: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Práce: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Práce:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Bodů postavy: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Opravné body: %d"
@@ -4449,7 +4458,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Otevři web adresu"
@@ -5912,54 +5921,54 @@ msgstr "Vitalita"
msgid "Intelligence"
msgstr "Inteligence"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Obratnost"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Štěstí"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/da.po b/po/da.po
index e5bc50f4f..ab6b2617e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/manaplus/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ignorerer indkomne handels anmodninger"
msgid "Accepting incoming trade requests"
msgstr "Accepterer indkomne handels anmodninger"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -53,54 +53,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Opsætning"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Luk"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Forbinder til server"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Logger ind"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -109,50 +109,50 @@ msgstr ""
msgid "Error"
msgstr "Fejl"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Fejl under oprettelsen af opdateringen mappen!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -395,22 +395,22 @@ msgstr "Nulstil"
msgid "Name"
msgstr "Navn"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Angrib"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Snak"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -419,8 +419,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Køb"
@@ -438,7 +438,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -446,7 +446,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -458,8 +458,8 @@ msgid "Quit"
msgstr "Afslut"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Maks"
@@ -469,8 +469,8 @@ msgstr "Maks"
msgid "Shop"
msgstr "butik"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Sælg"
@@ -479,21 +479,22 @@ msgstr "Sælg"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Fortryd"
@@ -768,7 +769,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Hvisker til %s: %s"
@@ -781,9 +782,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1007,8 +1008,8 @@ msgid "Equipment"
msgstr "Udstyr"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Tag af"
@@ -1042,47 +1043,47 @@ msgid "Inventory"
msgstr "Inventarliste"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Tag på"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Brug"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Opdel"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Gem på lager"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Hent fra lager"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Smid"
@@ -1318,18 +1319,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Niveau: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1350,7 +1351,7 @@ msgstr "Send forespørgsel"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1385,346 +1386,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Handl"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Brugere"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2423,7 +2428,7 @@ msgid "Music volume"
msgstr "Lydstyrke på musik"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2700,31 +2705,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Tryk på knappen for at starte justeringen."
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Justering"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Aktiver joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stop"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3917,39 +3926,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Penge: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Copy text \t\r\nJob: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4431,7 +4440,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5885,54 +5894,54 @@ msgstr "Helbred"
msgid "Intelligence"
msgstr "Intelligens"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Behændighed"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Held"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/de.po b/po/de.po
index 5e982e1c9..96b9c5f71 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@
# <jack@krass.com>, 2011.
# Marco Jäger <>, 2012.
# Marco Jäger <linuxcobra@gmx.de>, 2012.
-# <mr.x@aon.at>, 2012.
+# <mr.x@aon.at>, 2012-2013.
# <Necromong@inbox.ru>, 2011.
# Philipp <philipp.krueger1@googlemail.com>, 2012.
# Rosemarie Tauber <horos@online.de>, 2012.
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
"de/)\n"
@@ -38,7 +38,7 @@ msgstr "Ignoriere eingehende Handelsanfragen"
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Sichtbar auf der Karte"
@@ -64,54 +64,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Einstellungen"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Leistung"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Themen"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Schließen"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Verbinde zum Server"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Anmelden"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -120,50 +120,50 @@ msgstr "Charakterserver wechseln"
msgid "Error"
msgstr "Fehler"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Passwort ändern"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Erfolgreich abgemeldet."
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komm jeder Zeit wieder..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -410,22 +410,22 @@ msgstr "Zurücksetzten"
msgid "Name"
msgstr "Name"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Angriff"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Sprechen"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Bewegen"
@@ -434,8 +434,8 @@ msgid "Result"
msgstr "Resultat"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Kaufen"
@@ -453,7 +453,7 @@ msgstr "Menge:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -461,7 +461,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -473,8 +473,8 @@ msgid "Quit"
msgstr "Beenden"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max"
@@ -484,8 +484,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Laden"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Verkaufen"
@@ -494,21 +494,22 @@ msgstr "Verkaufen"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Abbrechen"
@@ -783,7 +784,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ; %d Spieler sind anwesend."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüstern zu %s: %s"
@@ -796,9 +797,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignorieren"
@@ -1022,8 +1023,8 @@ msgid "Equipment"
msgstr "Ausrüstung"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Ablegen"
@@ -1057,47 +1058,47 @@ msgid "Inventory"
msgstr "Inventar"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Ausrüsten"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Benutzen"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Aufteilen"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Ausrüstung"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Aufbewahren"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Abholen"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Wegwerfen"
@@ -1335,18 +1336,18 @@ msgstr "Status Balken"
msgid "job bar"
msgstr "Job Balken"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Level: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Stufe: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Muss"
@@ -1367,7 +1368,7 @@ msgstr "Absenden"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Leeren"
@@ -1402,346 +1403,350 @@ msgstr "Abwesend-Outfit"
msgid "Key: %s"
msgstr "Taste: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Handeln"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Flüstern"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Heilen"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Aus Gilde werfen"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Rang in Gilde ändern"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "In Gilde einladen"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Spieler rauswerfen"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Atombombe"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Kommentar hinzufügen"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Rauswerfen"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Entferne aus Angriffsliste"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Hinzufügen zur bevorzugten Angriffsliste"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Hinzufügen zur normalen Angriffsliste"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Hinzufügen zur Ignorierenliste"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Füge Name dem Chat hinzu"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Spieler"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Aus Gruppe werfen"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Aufheben"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Karteneinstellung"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Umbenennen"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Entfernen"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Warp"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Bewege Kamera"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "Leere Ausrüstungsfenster"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Zaubersprüche"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Bearbeite Zauberspruch"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Hervorhebung abschalten"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Hervorhebung einschalten"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Lösche den Namen nicht"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Lösche Name"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Aktiviere abwesend"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Deaktiviere abwesend"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Verlassen"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Kopiere in die Zwischenablage"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Lade zu Gruppe ein"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Position der Gilde ändern"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Kartenzeichen umbenennen"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Name:"
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Spieler Kommentar"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Kommentar:"
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "10 zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Die Hälfte zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Alles zum Handel hinzufügen-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Alles zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "10 aufbewahren"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Die Hälfte aufbewahren"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
-msgstr ""
+msgstr "Alles ablegen-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Alles aufbewahren"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Alles fallenlassen"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "10 abholen"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Die Hälfte abholen"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
-msgstr ""
+msgstr "Alles aufnehmen-1"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Alles abholen"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr "Fächer des Wegwerffensters leeren"
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Verstecken"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Zeigen"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Setze gelben Balken zurück"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Kopiere zu Chat"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(normal)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Nach oben"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Nach unten"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Ausziehen"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
-msgstr ""
+msgstr "Kopieren"
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
+msgstr "Einfügen"
+
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Befreunden"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Missachten"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Schwarze Liste"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Als Feind setzen"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Löschen"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Nicht mehr Ignorieren"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Ignoriere komplett"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Folgen"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imitation"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Kaufen(?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Verkaufen(?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Zeige Items"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Von der Aufhebeliste entfernen"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Zur Aufhebeliste hinzufügen"
@@ -2440,7 +2445,7 @@ msgid "Music volume"
msgstr "Lautstärke der Musik"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2719,31 +2724,35 @@ msgstr ""
"Konflikt zwischen \"%s\" und \"%s\" Tasten.Ändere die Tastenbelegung oder "
"das Spiel lässt sich nicht richtig steuern."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Knopf drücken um die Kalibrierung zu starten"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibrieren"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Joystick aktivieren"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "Benutze Joystick wenn das Client-Fenster inaktiv ist"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stopp"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "Drehe den Joystick und drücke keine Tasten"
@@ -3365,15 +3374,15 @@ msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
#: src/gui/setup_touch.cpp:34
msgid "Small"
-msgstr ""
+msgstr "Klein"
#: src/gui/setup_touch.cpp:36
msgid "Medium"
-msgstr ""
+msgstr "Mittel"
#: src/gui/setup_touch.cpp:37
msgid "Large"
-msgstr ""
+msgstr "Groß"
#: src/gui/setup_touch.cpp:54
msgid "Touch"
@@ -3401,7 +3410,7 @@ msgstr ""
#: src/gui/setup_touch.cpp:77
msgid "Joystick size"
-msgstr ""
+msgstr "Joystickgröße"
#: src/gui/setup_touch.cpp:81
msgid "Onscreen buttons"
@@ -3948,39 +3957,39 @@ msgstr "Name deiner Gruppe wählen."
msgid "Specials"
msgstr "Special"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Charakterpunkte: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Korrekturpunkte: %d"
@@ -4467,7 +4476,7 @@ msgstr "/kick > Jemanden aus deiner Gilde werfen"
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "URL öffnen"
@@ -4526,7 +4535,7 @@ msgstr ""
#. TRANSLATORS: short button name for quests window.
#: src/gui/windowmenu.cpp:91
msgid "QE"
-msgstr ""
+msgstr "QE"
#. TRANSLATORS: short button name for bot checker window.
#: src/gui/windowmenu.cpp:94
@@ -5536,7 +5545,7 @@ msgstr "Dieser Benutzername ist bereits in Verwendung."
#: src/net/ea/loginhandler.cpp:268
msgid "Incorrect email."
-msgstr ""
+msgstr "Falsche E-Mail-Adresse"
#: src/net/ea/loginhandler.cpp:271
msgid "Username permanently erased."
@@ -5947,54 +5956,54 @@ msgstr "Gesundheit"
msgid "Intelligence"
msgstr "Intelligenz"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Ausdauer"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Glück"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Verteidigung:"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "M.Angriff:"
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "M.Verteidigung:"
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Genauigkeit"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Ausweichen"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Kritisch"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Angriffsverzögerung"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Lauf-Verzögerung:"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Angriffsreichweite"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Schaden pro Sek."
diff --git a/po/el.po b/po/el.po
index 9e8cb0d75..d47037574 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/manaplus/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr "Αποδεχόμενος τα εισεÏχόμενα αιτήματα του εμποÏίου"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "ΡÏθμισεις"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Κλείσιμο"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "ΣÏνδεση σε τονδιακομιστή"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "ΣÏνδεση"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Μπαίνοντας στον κόσμο του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï "
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Αναζητώντας χαÏακτήÏες"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "ΣÏνδεση με τον διακομιστή του παιχνιδιοÏ"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
msgid "Error"
msgstr "Σφάλμα"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "ΑναζητοÏνται τα στοιχεία της εγγÏαφής"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Αλλαγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Αλλαγή ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "ΗλεκτÏονικό ταχυδÏομείο άλλαξε με επιτυχία!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "ΔιαγÏαφή Επιτυχής"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Αντίο, να επιστÏέψεις κάθε στιγμή ..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr " %s δεν υπάÏχει και δεν μποÏεί να δημιουÏγηθεί!Έξοδος."
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "ΆκυÏα ενημέÏωση υποδοχής: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Σφάλμα κατά τη δημιουÏγία του καταλόγου ενημεÏώσεων!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Σφάλμα: %s δεν υπάÏχει και δεν μποÏεί να δημιουÏγηθεί! Εγκατάλειψη."
@@ -394,22 +394,22 @@ msgstr "ΕπαναφοÏά"
msgid "Name"
msgstr "Όνομα"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Επίθεση"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Συζήτηση"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Κίνηση"
@@ -418,8 +418,8 @@ msgid "Result"
msgstr "Αποτέλεσμα"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "ΑγοÏά"
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -445,7 +445,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "Έξοδος"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max"
@@ -468,8 +468,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Κατάστημα"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Πουλήστε"
@@ -478,21 +478,22 @@ msgstr "Πουλήστε"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "ΑκÏÏωση"
@@ -767,7 +768,7 @@ msgstr "Συζήτηση"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "ΨιθυÏίζοντας στο %s: %s"
@@ -780,9 +781,9 @@ msgstr "Îαι"
msgid "No"
msgstr "Δεν"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "ΠαÏάβλεψη"
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr "Εξοπλισμός"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Equip"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "ΧÏήση"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Πέτα ..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "ΔιαίÏεση"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "ΡοÏχα"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Κατάστημα"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Ανάκτηση"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Πέτα"
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "ΧÏειάζεστε"
@@ -1349,7 +1350,7 @@ msgstr "Υποβολή"
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Σαφή"
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr "Κλειδί: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "ΠÏοσθήκη στη συζήτηση"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "ΞόÏκια"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Μετονομασία υπογÏάψει χάÏτη "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Όνομα:"
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Κατάστημα 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Αποθήκευσε τα μισά"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "ΑποθηκεÏστε όλα τα"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Ανέκτησε τα μισά"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Ανέκτησε όλα"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index b8d402a71..febaf3193 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ignoring incoming trade requests"
msgid "Accepting incoming trade requests"
msgstr "Accepting incoming trade requests"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -53,54 +53,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Setup"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Close"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Connecting to server"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Logging in"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Entering game world"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Requesting characters"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Connecting to the game server"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Changing game servers"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -109,50 +109,50 @@ msgstr "Changing game servers"
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Requesting registration details"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Password Change"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Error creating updates directory!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -395,22 +395,22 @@ msgstr "Reset"
msgid "Name"
msgstr "Name"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Attack"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Talk"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -419,8 +419,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Buy"
@@ -438,7 +438,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -446,7 +446,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -458,8 +458,8 @@ msgid "Quit"
msgstr "Exit"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max"
@@ -469,8 +469,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Shop"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Sell"
@@ -479,21 +479,22 @@ msgstr "Sell"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Cancel"
@@ -768,7 +769,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Whispering to %s: %s"
@@ -781,9 +782,9 @@ msgstr "Yes"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1007,8 +1008,8 @@ msgid "Equipment"
msgstr "Equipment"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Unequip"
@@ -1042,47 +1043,47 @@ msgid "Inventory"
msgstr "Inventory"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Equip"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Use"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Split"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Store"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Retrieve"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Drop"
@@ -1318,18 +1319,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1350,7 +1351,7 @@ msgstr "Submit"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1385,346 +1386,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Trade"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Players"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2423,7 +2428,7 @@ msgid "Music volume"
msgstr "Music volume"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2700,31 +2705,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Press the button to start calibration"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Calibrate"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Enable joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stop"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3917,39 +3926,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Money: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4431,7 +4440,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5885,54 +5894,54 @@ msgstr "Vitality"
msgid "Intelligence"
msgstr "Intelligence"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Dexterity"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Luck"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 27540d12a..33c42488e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -468,8 +468,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -478,21 +478,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -767,7 +768,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/es.po b/po/es.po
index f487456e6..34e6dc130 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,16 +8,16 @@
# Mr Pirate <salahbubuli44@gmail.com>, 2012.
# <mtorres2022@gmail.com>, 2012.
# <narus.tmw@gmail.com>, 2012.
-# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011-2012.
+# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011-2013.
# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
# Nelson <nelson6eeduardo65@gmail.com>, 2011.
-# <owen942009@gmail.com>, 2012.
+# <owen942009@gmail.com>, 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
"language/es/)\n"
@@ -35,7 +35,7 @@ msgstr "Ignorando las peticiones de intercambio"
msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Visible sobre el mapa"
@@ -61,54 +61,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Configuración"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Rendimiento"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Cerrar"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Cargando personajes"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -117,50 +117,50 @@ msgstr "Cambiando servidores del juego"
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, 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."
@@ -333,7 +333,7 @@ msgstr "Borrado:"
#: src/commands.cpp:1018
msgid "Environment variables dumped"
-msgstr ""
+msgstr "Variables de entorno vaciadas"
#: src/commands.cpp:1111 src/commands.cpp:1118
msgid "Resource images:"
@@ -396,7 +396,7 @@ msgstr "Comentario: %s"
#: src/gui/botcheckerwindow.cpp:270
msgid "Bot Checker"
-msgstr "Bot Checker"
+msgstr "Inspector de Bot"
#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:83
msgid "Reset"
@@ -406,22 +406,22 @@ msgstr "Restablecer"
msgid "Name"
msgstr "Nombre"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Hablar"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Mover"
@@ -430,8 +430,8 @@ msgid "Result"
msgstr "Resultado"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Comprar"
@@ -449,7 +449,7 @@ msgstr "Cantidad:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -457,7 +457,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -469,8 +469,8 @@ msgid "Quit"
msgstr "Salir"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Máximo"
@@ -480,8 +480,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Tienda"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Vender"
@@ -490,21 +490,22 @@ msgstr "Vender"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Cancelar"
@@ -783,7 +784,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores están presentes."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Susurrando a %s: %s"
@@ -796,9 +797,9 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignorar"
@@ -1023,8 +1024,8 @@ msgid "Equipment"
msgstr "Equipamiento"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Quitárselo"
@@ -1058,47 +1059,47 @@ msgid "Inventory"
msgstr "Inventario"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Tirar..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Conjuntos"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Almacenar"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Recuperar"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Tirar"
@@ -1296,7 +1297,7 @@ msgstr "Host de actualización: %s"
#: src/gui/logindialog.cpp:325
msgid "Open register url"
-msgstr ""
+msgstr "Abrir registro de url"
#: src/gui/ministatuswindow.cpp:57
msgid "health bar"
@@ -1334,18 +1335,18 @@ msgstr "barra de estado"
msgid "job bar"
msgstr "barra de trabajo"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Nivel: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Nivel: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Necesitas"
@@ -1366,7 +1367,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Limpiar"
@@ -1401,346 +1402,350 @@ msgstr "Conjunto para modo AFK"
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Intercambio"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Susurrar"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Sanar"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Sacar del clan"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Cambiar posición en el clan"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Invitar al clan"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Sacar jugador"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Eliminar"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Agregar comentario"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Sacar"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Remover de la lista de ataque"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Añadir a la lista de ataque prioritaria"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Agregar a la lista de ataque"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Agregar a la lista de ignorados"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Agregar nombre al chat"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Jugadores"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Sacar del grupo"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Recoger"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Añadir al chat"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Mapa Objeto"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Renombrar"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Quitar"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Deformar"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Mover cámara"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "Limpiar vestimenta"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Hechizos"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Editar hechizo"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Deshabilitar resaltado"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Habilitar resaltado"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "No remover nombre"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Remover nombre"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Habilitar ausencia"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Deshabilitar ausencia"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Dejar"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Copiar al portapapeles"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Invitar a grupo"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Cambiar posición del Clan"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Renombrar señal del mapa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nombre: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Comentario del jugador "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Comentario: "
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Agregar al intercambio"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Agregar el intercambio todo-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr "Almacenar todo-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Almacenar todo"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Tirar todo"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr "Recuperar todo-1"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr "Limpiar ventana de lanzamiento"
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Copiar al chat"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(predeterminado)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Bajar"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Desvestir"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
-msgstr ""
+msgstr "Copiar"
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
+msgstr "Pegar"
+
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Ser amigo"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Desatender"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Lista negra"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Fijar como enemigo"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Borrar"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Des-ignorar"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imitación"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Mostrar artículos"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Remover de lista de recogido"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Agregar a lista de recogido"
@@ -1928,7 +1933,7 @@ msgstr "Seleccionar OK"
#: src/gui/setupactiondata.h:161
msgid "Stop or sit"
-msgstr ""
+msgstr "Detener o sentar"
#: src/gui/setupactiondata.h:166
msgid "Return to safe video mode"
@@ -2286,7 +2291,7 @@ msgstr "Tecla modificadora"
#: src/gui/setupactiondata.h:1155
msgid "Show onscreen keyboard"
-msgstr ""
+msgstr "Mostrar teclado en pantalla"
#: src/gui/setupactiondata.h:1169
msgid "Move Keys"
@@ -2441,7 +2446,7 @@ msgid "Music volume"
msgstr "Volumen de Música"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2530,7 +2535,7 @@ msgstr "Ocultar automáticamente la ventana del chat."
#: src/gui/setup_chat.cpp:59
msgid "Protect chat focus."
-msgstr ""
+msgstr "Proteger foco del chat."
#: src/gui/setup_chat.cpp:63 src/gui/setup_colors.cpp:79
msgid "Colors"
@@ -2722,31 +2727,35 @@ msgstr ""
"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
"puede presentar un comportamiento raro."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Presiona el botón para empezar la calibración"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Calibrar"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Habilitar la palanca de mando"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "Usar la palanca de mando si la ventana del cliente está inactiva"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Palanca de Mando"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Parar"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "Girar la palanca y no presionar los botones"
@@ -3001,7 +3010,7 @@ msgstr "Habilitar registro OpenGl"
#: src/gui/setup_other.cpp:250
msgid "Enable input log"
-msgstr ""
+msgstr "Habilitar registro de entrada"
#: src/gui/setup_other.cpp:253
msgid "Low traffic mode"
@@ -3388,39 +3397,39 @@ msgstr "Tocar"
#: src/gui/setup_touch.cpp:62
msgid "Onscreen keyboard"
-msgstr ""
+msgstr "Teclado en pantalla"
#: src/gui/setup_touch.cpp:64
msgid "Show onscreen keyboard icon"
-msgstr ""
+msgstr "Mostrar ícono del teclado en pantalla"
#: src/gui/setup_touch.cpp:67
msgid "Keyboard icon action"
-msgstr ""
+msgstr "Acción del ícono del teclado"
#: src/gui/setup_touch.cpp:72
msgid "Onscreen joystick"
-msgstr ""
+msgstr "Palanca de mando en pantalla"
#: src/gui/setup_touch.cpp:74
msgid "Show onscreen joystick"
-msgstr ""
+msgstr "Mostrar la palanca de mando (joystick) en la pantalla"
#: src/gui/setup_touch.cpp:77
msgid "Joystick size"
-msgstr ""
+msgstr "Tamaño de la palanca de mando"
#: src/gui/setup_touch.cpp:81
msgid "Onscreen buttons"
-msgstr ""
+msgstr "Botones en pantalla"
#: src/gui/setup_touch.cpp:83
msgid "Show onscreen buttons"
-msgstr ""
+msgstr "Mostrar botones en pantalla"
#: src/gui/setup_touch.cpp:86
msgid "Buttons format"
-msgstr ""
+msgstr "Formato de los botones"
#: src/gui/setup_touch.cpp:89
msgid "Buttons size"
@@ -3429,7 +3438,7 @@ msgstr "Tamaño del Botón "
#: src/gui/setup_touch.cpp:92 src/gui/setup_touch.cpp:96
#, c-format
msgid "Button %u action"
-msgstr ""
+msgstr "Acción del botón %u"
#: src/gui/setup_video.cpp:180
msgid "Software"
@@ -3641,7 +3650,7 @@ msgstr "Gamma"
#: src/gui/setup_visual.cpp:135
msgid "Enable gamma control"
-msgstr ""
+msgstr "Habilitar control gamma"
#: src/gui/setup_visual.cpp:145
msgid "Vsync"
@@ -3707,7 +3716,7 @@ msgstr "básico"
#: src/gui/skilldialog.cpp:428
msgid "basic, 1"
-msgstr ""
+msgstr "básico, 1"
#: src/gui/skilldialog.cpp:464
#, c-format
@@ -3949,39 +3958,39 @@ msgstr "Escoge el nombre del grupo."
msgid "Specials"
msgstr "Especiales"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Dinero: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Trabajo: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Trabajo:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Puntos del personaje: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Puntos de corrección: %d"
@@ -4466,7 +4475,7 @@ msgstr "/kick > Expulsar a alguien del clan en el que estás."
msgid "Eq."
msgstr "Eq."
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Abrir url"
@@ -5946,54 +5955,54 @@ msgstr "Vitalidad"
msgid "Intelligence"
msgstr "Inteligencia"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Destreza"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Suerte"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Defensa"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "Ataque M."
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "Defensa M."
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Precisión"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Evasión"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Crítico"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Retardo de Ataque"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Retardo de Marcha"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Alcance de Ataque"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Daño por segundo."
@@ -6010,12 +6019,12 @@ msgstr "%s quiere comerciar contigo, aceptas?"
#: src/net/ea/tradehandler.cpp:134
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr ""
+msgstr "El intercambio con %s no es posible. El otro personaje está muy lejos."
#: src/net/ea/tradehandler.cpp:138
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
-msgstr ""
+msgstr "El intercambio con %s no es posible. El personaje no existe."
#: src/net/ea/tradehandler.cpp:142
msgid "Trade cancelled due to an unknown reason."
@@ -6034,7 +6043,7 @@ msgstr "Intercambio con %s cancelado."
#: src/net/ea/tradehandler.cpp:171
#, c-format
msgid "Unhandled trade cancel packet with %s"
-msgstr ""
+msgstr "Cancelar paquete de intercambio sin controlar con %s"
#: src/net/ea/tradehandler.cpp:237
msgid "Failed adding item. Trade partner is over weighted."
diff --git a/po/et.po b/po/et.po
index c9702bcb2..2988db665 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Sulge"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "Viga"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -468,8 +468,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -478,21 +478,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -767,7 +768,7 @@ msgstr "Vestlus"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr "Jah"
msgid "No"
msgstr "Ei"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Raha: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/fa.po b/po/fa.po
index b0a3844ae..67d5371e8 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "خطا"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -389,22 +389,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -413,8 +413,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -432,7 +432,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -440,7 +440,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -452,8 +452,8 @@ msgid "Quit"
msgstr "خروج"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "حداکثر"
@@ -463,8 +463,8 @@ msgstr "حداکثر"
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -473,21 +473,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "انصراÙ"
@@ -762,7 +763,7 @@ msgstr "چت"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -775,9 +776,9 @@ msgstr "بلی"
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1001,8 +1002,8 @@ msgid "Equipment"
msgstr "تجهیزات"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1036,47 +1037,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1310,18 +1311,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1342,7 +1343,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1377,346 +1378,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2415,7 +2420,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2692,31 +2697,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3909,39 +3918,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4423,7 +4432,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5876,54 +5885,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 1e3652636..664fba370 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -27,7 +27,7 @@ msgstr "Et huomioi kaupankäyntipyyntöjä"
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Näkyvillä kartalla"
@@ -53,54 +53,54 @@ msgstr "P"
msgid "I"
msgstr "-"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Asetukset"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Tehokkuus"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Kuva"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Teemat"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Sulje"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Kirjaudun sisään"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -109,50 +109,50 @@ msgstr "Vaihdan pelipalvelinta"
msgid "Error"
msgstr "Virhe"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Sähköpostin vaihto"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, 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."
@@ -399,22 +399,22 @@ msgstr "Nollaa"
msgid "Name"
msgstr "Nimi"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Hyökkää"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Keskustele"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Liiku"
@@ -423,8 +423,8 @@ msgid "Result"
msgstr "Tulos"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Osta"
@@ -442,7 +442,7 @@ msgstr "Määrä:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -450,7 +450,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -462,8 +462,8 @@ msgid "Quit"
msgstr "Sulje"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max"
@@ -473,8 +473,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Kauppa"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Myy"
@@ -483,21 +483,22 @@ msgstr "Myy"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Peru"
@@ -772,7 +773,7 @@ msgstr "Keskustelu"
msgid "Present: %s; %d players are present."
msgstr "Läsnä: %s; %d pelaajaa paikalla."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
@@ -785,9 +786,9 @@ msgstr "Kyllä"
msgid "No"
msgstr "Ei"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ohita"
@@ -1011,8 +1012,8 @@ msgid "Equipment"
msgstr "Varusteet"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -1046,47 +1047,47 @@ msgid "Inventory"
msgstr "Tavarat"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Ota käyttöön"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Käytä"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Pudota..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Jaa"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Asukokonaisuudet"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Varastoi"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Ota"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Pudota"
@@ -1322,18 +1323,18 @@ msgstr "tilapalkki"
msgid "job bar"
msgstr "työpalkki"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Taso: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Taso: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Tarvitaan"
@@ -1354,7 +1355,7 @@ msgstr "Lähetä"
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Tyhjennä"
@@ -1389,346 +1390,350 @@ msgstr "Poissaoloasu"
msgid "Key: %s"
msgstr "Näppäin: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Tee kaupat"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Kuiskaa"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Paranna"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Potki killasta"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Muuta kilta-asemaa"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Kutsu kiltaan"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Potki pelaaja"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Pommita"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Lisää kommentti"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Potki"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Poista hyökkäyslistasta"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Lisää prioriteettihyökkäyslistalle"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Lisää hyökkäyslistaan"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Lisää ohitettavien listaan"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Lisää nimi keskusteluun"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Pelaajat"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Potki ryhmästä"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Poimi"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Lisää keskusteluun"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Karttaolio"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Poista"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Warppaa"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "Poista asu"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Loitsut"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Muokkaa loitsua"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Estä korostus"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Salli korostus"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Älä poista nimeä"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Poista nimi"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Ota poissaolo käyttöön"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Poista poissaolo käytöstä"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Eroa"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Kopioi leikepöydälle"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Kutsu ryhmään"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Muuta asemaa killassa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Muuta merkin nimeä "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nimi: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Pelaajakommentti "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Kommentti: "
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Lisää kauppaan"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Lisää 10 kauppaan"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Lisää puolet kauppaan"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Lisää kaikki kauppaan"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Varastoi 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Varastoi puolet"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Varastoi kaikki"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Pudota kaikki"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Ota 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Ota puolet"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Ota kaikki"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Piilota"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Näytä"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Kopioi keskusteluun"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(oletus)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Siirrä ylös"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Siirrä alas"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Riisu"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Ystävysty"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Vaimenna"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Musta lista"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Aseta viholliseksi"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Pyyhi"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Huomioi jälleen"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Jätä täysin huomiotta"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Seuraa"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Matki"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Osta (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Myy (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Näytä tavarat"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2427,7 +2432,7 @@ msgid "Music volume"
msgstr "Musiikin voimakkuus"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2706,31 +2711,35 @@ msgstr ""
"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
"ole hyvä ja poista päällekkäisyydet. "
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibroi"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Ota peliohjain käyttöön"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "Käytä peliohjainta jos asiakasikkuna ei ole aktiivinen"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Peliohjain"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Lopeta"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3925,39 +3934,39 @@ msgstr "Anna ryhmällesi nimi."
msgid "Specials"
msgstr "Erikoisuudet"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Rahat: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "VP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Kok:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Työ: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Työ:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Hahmopisteitä: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Korjauspisteitä: %d"
@@ -4440,7 +4449,7 @@ msgstr "/kick > Poista käyttäjä killastasi"
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5910,54 +5919,54 @@ msgstr "Elinvoima"
msgid "Intelligence"
msgstr "Älykkyys"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Näppäryys"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Tuuri"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Puolustus"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "T.-hyökkäys"
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "T.-puolustus"
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Tarkkuus"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Välttö"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Täysosuma"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Hyökkäysviive"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Kävelyviive"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Hyökkäyskantama"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Vahinko sekunnissa."
diff --git a/po/fr.po b/po/fr.po
index aaeb64583..f8447ddff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,8 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <aligetmw@hotmail.fr>, 2012.
+# <aligetmw@hotmail.fr>, 2013.
+# <aligetmw@hotmail.fr>, 2012-2013.
# Andrei Karas <akaras@inbox.ru>, 2011.
# <andycootlapin@hotmail.fr>, 2012.
# <antoinebcn@hotmail.com>, 2011.
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 14:34+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
"fr/)\n"
"Language: fr\n"
@@ -34,7 +35,7 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Visible sur la carte"
@@ -60,54 +61,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Configuration"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Vidéo"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Thèmes"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Fermer"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Entrée dans le monde de jeu"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -116,50 +117,50 @@ msgstr "Changement de serveur de jeu"
msgid "Error"
msgstr "Erreur"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "À bientôt, Revenez quand vous voulez..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -334,7 +335,7 @@ msgstr "Effacé :"
#: src/commands.cpp:1018
msgid "Environment variables dumped"
-msgstr ""
+msgstr "Variables d'environnement effacées"
#: src/commands.cpp:1111 src/commands.cpp:1118
msgid "Resource images:"
@@ -408,22 +409,22 @@ msgstr "Réinitialiser"
msgid "Name"
msgstr "Nom"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Attaquer"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Parler"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Déplacement"
@@ -432,8 +433,8 @@ msgid "Result"
msgstr "Résultat"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Acheter"
@@ -451,7 +452,7 @@ msgstr "Montant :"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -459,7 +460,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -471,8 +472,8 @@ msgid "Quit"
msgstr "Quitter"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max."
@@ -482,8 +483,8 @@ msgstr "Max."
msgid "Shop"
msgstr "Boutique"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Vendre"
@@ -492,21 +493,22 @@ msgstr "Vendre"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Annuler"
@@ -781,7 +783,7 @@ msgstr "Conversation"
msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Message envoyé à %s : %s"
@@ -794,9 +796,9 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignorer"
@@ -1020,8 +1022,8 @@ msgid "Equipment"
msgstr "Équipement"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Retirer"
@@ -1055,47 +1057,47 @@ msgid "Inventory"
msgstr "Inventaire"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Équiper"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Utiliser"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Jeter..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Partager"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Costumes"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Entreposer"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Récupérer"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Jeter"
@@ -1293,7 +1295,7 @@ msgstr "Hôte de mise à jour : %s"
#: src/gui/logindialog.cpp:325
msgid "Open register url"
-msgstr ""
+msgstr "Ouvrir l'URL d'inscription"
#: src/gui/ministatuswindow.cpp:57
msgid "health bar"
@@ -1331,18 +1333,18 @@ msgstr "Barre de statut"
msgid "job bar"
msgstr "Barre de compétences"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Niveau : %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Niveau : %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Restant"
@@ -1363,7 +1365,7 @@ msgstr "Soumettre"
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Effacer"
@@ -1398,346 +1400,350 @@ msgstr "Équipement en absence"
msgid "Key: %s"
msgstr "Touche : %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Échange"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Message"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Soigner"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Sortir de la guilde"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Changer la position dans la guilde"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Inviter dans la guilde"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Sortir le joueur"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Annihiler"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Ajouter commentaire"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Virer"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Enlever de la liste d'attaque"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Ajouter à la liste de priorités d'attaque"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Ajouter à la liste d'attaque"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Ajouter à la liste d'ignorés"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Ajouter le nom dans la boite de dialogue"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Joueurs"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Sortir du groupe"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Ramasser"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Ajouter à la conversation"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Objet de carte"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Renommer"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Enlever"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Téléportation"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Bouger la caméra"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "Effacer la tenue"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Sortilèges"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Éditer le sortilège"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Désactiver la surbrillance"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Activer la surbrillance"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Ne pas enlever les noms"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Enlève le nom"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Active la fonction Absence"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Désactive la fonction Absence"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Quitter"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Copier vers le presse-papier"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Inviter dans le groupe"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Changer de position dans la guilde"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Renommer le panneau de carte"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nom : "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Le joueur commente "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Commentaire : "
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Ajouter à la transaction"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Ajouter pour échanger tout-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr "Tout entreposer-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Entreposer tout"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Jeter tout"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr "Tout retirer-1"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr "Vider la fenêtre de dépôt"
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Copier dans la conversation"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(défaut)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Aller vers le bas"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Déshabiller"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
-msgstr ""
+msgstr "Copier"
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
-msgstr ""
+msgstr "Coller"
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr "Ouvrir lien"
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Être ami"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Éviter"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Liste noire"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Définir comme ennemi"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Éliminer"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Ne plus ignorer"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Ignorer complètement"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Suivre"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imiter"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Acheter (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Vendre (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Montrer les objets"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Retirer de la liste de ramassage"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Ajouter à la liste de ramassage"
@@ -1923,7 +1929,7 @@ msgstr "Sélectionner OK"
#: src/gui/setupactiondata.h:161
msgid "Stop or sit"
-msgstr ""
+msgstr "S'arrêter et s’asseoir"
#: src/gui/setupactiondata.h:166
msgid "Return to safe video mode"
@@ -2281,7 +2287,7 @@ msgstr "Modifier la touche"
#: src/gui/setupactiondata.h:1155
msgid "Show onscreen keyboard"
-msgstr ""
+msgstr "Afficher le clavier d'écran"
#: src/gui/setupactiondata.h:1169
msgid "Move Keys"
@@ -2436,8 +2442,8 @@ msgid "Music volume"
msgstr "Volume de la musique"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
-msgstr ""
+msgid "Enable music fade out"
+msgstr "Activer l'effacement de la musique"
#: src/gui/setup_audio.cpp:89
msgid "Audio frequency"
@@ -2715,31 +2721,35 @@ msgstr ""
"Conflit entre les touches \"%s\" and \"%s\". Changes au moins l'une de "
"celles-ci ou bien attends-toi à un possible comportement étrange du jeu."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Presser le bouton pour démarrer la calibration"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Calibrer"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr "Détecter les joysticks"
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Activer la manette de jeu"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "Utiliser le joystick si la fenêtre est au second plan."
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Manette"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stop"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "Tournes le manche et n'appuies pas sur les boutons"
@@ -3195,7 +3205,7 @@ msgstr "Quand vous ignorez :"
#: src/gui/setup_theme.cpp:85
msgid "Very small (9)"
-msgstr "Très petit (9)"
+msgstr "Très petite (9)"
#: src/gui/setup_theme.cpp:86
msgid "Tiny (10)"
@@ -3211,7 +3221,7 @@ msgstr "Moyenne (12)"
#: src/gui/setup_theme.cpp:89
msgid "Normal (13)"
-msgstr "Normal (13)"
+msgstr "Normale (13)"
#: src/gui/setup_theme.cpp:90
msgid "Large (14)"
@@ -3223,15 +3233,15 @@ msgstr "Très large (15)"
#: src/gui/setup_theme.cpp:92
msgid "Big (16)"
-msgstr "Grand (16)"
+msgstr "Grande (16)"
#: src/gui/setup_theme.cpp:93
msgid "Very big (17)"
-msgstr "Très grand (17)"
+msgstr "Très grande (17)"
#: src/gui/setup_theme.cpp:94
msgid "Huge (18)"
-msgstr "Enorme (18)"
+msgstr "Énorme (18)"
#: src/gui/setup_theme.cpp:95
msgid "Very huge (19)"
@@ -3377,23 +3387,23 @@ msgstr "Toucher"
#: src/gui/setup_touch.cpp:62
msgid "Onscreen keyboard"
-msgstr ""
+msgstr "Clavier d'écran"
#: src/gui/setup_touch.cpp:64
msgid "Show onscreen keyboard icon"
-msgstr ""
+msgstr "Afficher l'icône du clavier d'écran"
#: src/gui/setup_touch.cpp:67
msgid "Keyboard icon action"
-msgstr ""
+msgstr "Action de l'icône clavier"
#: src/gui/setup_touch.cpp:72
msgid "Onscreen joystick"
-msgstr ""
+msgstr "Joystick d'écran"
#: src/gui/setup_touch.cpp:74
msgid "Show onscreen joystick"
-msgstr ""
+msgstr "Afficher le joystick d'écran"
#: src/gui/setup_touch.cpp:77
msgid "Joystick size"
@@ -3401,15 +3411,15 @@ msgstr "Taille de Joystick"
#: src/gui/setup_touch.cpp:81
msgid "Onscreen buttons"
-msgstr ""
+msgstr "Boutons d'écran"
#: src/gui/setup_touch.cpp:83
msgid "Show onscreen buttons"
-msgstr ""
+msgstr "Afficher les boutons d'écran"
#: src/gui/setup_touch.cpp:86
msgid "Buttons format"
-msgstr ""
+msgstr "Format des boutons"
#: src/gui/setup_touch.cpp:89
msgid "Buttons size"
@@ -3418,7 +3428,7 @@ msgstr "Taille des boutons"
#: src/gui/setup_touch.cpp:92 src/gui/setup_touch.cpp:96
#, c-format
msgid "Button %u action"
-msgstr ""
+msgstr "Bouton d'action %u"
#: src/gui/setup_video.cpp:180
msgid "Software"
@@ -3947,39 +3957,39 @@ msgstr "Choisis le nom du groupe."
msgid "Specials"
msgstr "Cpt. spéciales"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Argent : %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "Vie :"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp :"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "PM :"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Métier : %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Compétence :"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Points de caractéristiques du personnage : %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Points de correction : %d"
@@ -4468,7 +4478,7 @@ msgstr "/kick > Éjecter quelqu'un du groupe dont tu fais partie"
msgid "Eq."
msgstr "Eq."
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Ouvrir l'adresse"
@@ -5961,54 +5971,54 @@ msgstr "Vitalité"
msgid "Intelligence"
msgstr "Intelligence"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Dextérité"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Chance"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Défense"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "Attaque M."
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "Défense M."
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Précision"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Esquive"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Coup critique"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Temps de l'attaque"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Temps de déplacement"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Portée de l'attaque"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Dégâts par s."
diff --git a/po/he.po b/po/he.po
index 1a938c5cf..512db4b7c 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "×ž×ª×¢×œ× ×ž×”×¦×¢×•×ª סחר נכנסות"
msgid "Accepting incoming trade requests"
msgstr "מ×שר הצעות סחר נכנסות"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "הגדרות"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "ויד×ו"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "סגור"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "שגי××”"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "שגי××” ביצירת ספריית העדכוני×!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr "×פס"
msgid "Name"
msgstr "ש×"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "תקוף"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "דבר"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "קנה"
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "יצי××”"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "מקסימו×"
@@ -468,8 +468,8 @@ msgstr "מקסימו×"
msgid "Shop"
msgstr "חנות"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "מכר"
@@ -478,21 +478,22 @@ msgstr "מכר"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "בטל"
@@ -767,7 +768,7 @@ msgstr "שיחה"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "לוחש ×ל %s: %s"
@@ -780,9 +781,9 @@ msgstr "כן"
msgid "No"
msgstr "ל×"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr "לבוש"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "הורד"
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr "ציוד"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "השתמש"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "השתמש"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "פצל"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "×חסן"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "החזר"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "השלך"
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "רמה: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr "שלח"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "סחרר"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "שחקני×"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr "עוצמת מוזיקה"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "כייל"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "×פשר ×’'ויסטיק"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "ג'ויסטיק"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "עצור"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "כסף: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "×—×™×™×:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "נסיון:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "קס×:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "עבודה: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "עבודה:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr "חיוניות"
msgid "Intelligence"
msgstr "תבונה"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "מיומנות"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "מזל"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index c582f4080..c07716abd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Podešavanje"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Slika"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Zatvori"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "Greška"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -399,22 +399,22 @@ msgstr "Poništi"
msgid "Name"
msgstr "Ime"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Napad"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Govori"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -423,8 +423,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Kupi"
@@ -442,7 +442,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -450,7 +450,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -462,8 +462,8 @@ msgid "Quit"
msgstr "Izlaz"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max"
@@ -473,8 +473,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Trgovina"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Prodaj"
@@ -483,21 +483,22 @@ msgstr "Prodaj"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Poništi"
@@ -772,7 +773,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Å aptaj prema %s: %s"
@@ -785,9 +786,9 @@ msgstr "Da"
msgid "No"
msgstr "Ne"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1011,8 +1012,8 @@ msgid "Equipment"
msgstr "Oprema"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Skini opremu"
@@ -1046,47 +1047,47 @@ msgid "Inventory"
msgstr "Zalihe"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Opremi"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Upotrijebi"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Razdvoji"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Pohrani"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Preuzmi"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Ispusti"
@@ -1324,18 +1325,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Nivo: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1356,7 +1357,7 @@ msgstr "Dostavi"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1391,346 +1392,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Trgovanje"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "IgraÄi"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2429,7 +2434,7 @@ msgid "Music volume"
msgstr "Glasnoća glazbe"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2706,31 +2711,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Pritisnite tipku za poÄetak kalibracije"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibriraj"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Omogući igraću palicu"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Igraća palica"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Zaustavi"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3923,39 +3932,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Novac: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Zadatak: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Zadatak:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4437,7 +4446,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5892,54 +5901,54 @@ msgstr "Vitalnost"
msgid "Intelligence"
msgstr "Inteligencija"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Spretnost"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Sreća"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index bed625dde..71429644b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Kereskedési kérelmek elutasítása"
msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Beállítások"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Videó"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Bezár"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "Hiba"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Hiba a frissítési könyvtár létrehozása közben!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr "Alaphelyzet"
msgid "Name"
msgstr "Név"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Támadás"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Csevegés"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Vétel"
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "Kilépés"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max."
@@ -468,8 +468,8 @@ msgstr "Max."
msgid "Shop"
msgstr "Ãœzlet"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Eladás"
@@ -478,21 +478,22 @@ msgstr "Eladás"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Mégse"
@@ -767,7 +768,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Üzenet %s számára: %s"
@@ -780,9 +781,9 @@ msgstr "Igen"
msgid "No"
msgstr "Nem"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr "Felszerelés"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Nem használ"
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr "Táska"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Használ"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Bevet"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Felosztás"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Raktároz"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Magához vesz"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Eldob"
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Szint: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr "Küldés"
msgid "NPC"
msgstr "Gépjátékos"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Ãœzlet"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Játékosok"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr "Zene hangereje"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibrálás"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Joystick engedélyezése"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Leállít"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Pénz: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "Élet:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "TP:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "Varázserő:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Munka: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Munka:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr "Egészség"
msgid "Intelligence"
msgstr "Intelligencia"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Ügyesség"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Szerencse"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/id.po b/po/id.po
index 320faff43..1319f2d07 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
"language/id/)\n"
@@ -29,7 +29,7 @@ msgstr "Abaikan permohonan transaksi"
msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Terlihat di peta"
@@ -55,54 +55,54 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Pengaturan"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Tutup"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Terhubung dengan server"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Masuk"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Memasuki arena permainan"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Pemilihan karakter"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Pergantian server"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -111,50 +111,50 @@ msgstr "Pergantian server"
msgid "Error"
msgstr "Kesalahan"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Ubah sandi"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Perubahan email"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -395,22 +395,22 @@ msgstr "Reset"
msgid "Name"
msgstr "Nama"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Pukul"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Berbicara"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Jalan"
@@ -419,8 +419,8 @@ msgid "Result"
msgstr "Hasil"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Beli"
@@ -438,7 +438,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -446,7 +446,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -458,8 +458,8 @@ msgid "Quit"
msgstr "Keluar"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max"
@@ -469,8 +469,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Toko"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Jual"
@@ -479,21 +479,22 @@ msgstr "Jual"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Batal"
@@ -768,7 +769,7 @@ msgstr "Obrolan"
msgid "Present: %s; %d players are present."
msgstr "Kehadiran: %s; %d pemain yang hadir."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
@@ -781,9 +782,9 @@ msgstr "Ya"
msgid "No"
msgstr "Tidak"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Abaikan"
@@ -1007,8 +1008,8 @@ msgid "Equipment"
msgstr "Perlengkapan"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Lepaskan"
@@ -1042,47 +1043,47 @@ msgid "Inventory"
msgstr "Perbekalan"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Pakai"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Gunakan"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Buang..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Pecah"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Setelan"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Simpan"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Kembalikan"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Buang"
@@ -1316,18 +1317,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Tingkatan: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Butuh"
@@ -1348,7 +1349,7 @@ msgstr "Masukan"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Hapus"
@@ -1383,346 +1384,350 @@ msgstr "Setelan saat bepergian"
msgid "Key: %s"
msgstr "Kunci: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Tukar"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Berbisik"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Menyembuhkan"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Keluarkan dari organisasi"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Ubah posisi di organisasi"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Undang ke organisasi"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "keluarkan pemain"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Penambahan komentar"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "keluarkan"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Hapus dari daftar menyerang"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Tambahkan prioritas daftar menyerang"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Tambahkan ke daftar menyerang"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Tambahkan ke daftar Abaikan"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Tambahkan nama ke Obrolan"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Pemain"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Keluarkan dari kelompok"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Ambil"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Ambil ke obrolan"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Daftar barang"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Ganti nama"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Mantra"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Edit mantra"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Nonaktifkan sorotan"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Aktifkan sorotan"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "hapus nama"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Undang ke kelompok"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Ubah posisi Organisasi"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Ubah nama tanda peta"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nama:"
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Komentar pemain"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "komentar"
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Tambahkan semua ke Penukaran"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Masukkan 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Masukkan setengah"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Masukkan semua"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Buang semuanya"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Ambil 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Ambil setengah"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Ambil semua"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Tampilkan"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Atur ulang bar kuning"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Pindahkan ke chat"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(kembalikan)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Bergerak keatas"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Bergerak kebawah"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Tanggalkan pakaian"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Jadikan teman"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Batalkan pengabaian"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Mengikuti"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Tirukan"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Beli(?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Jual(?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Perlihatkan item"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2421,7 +2426,7 @@ msgid "Music volume"
msgstr "Volume Musik"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2698,31 +2703,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Tekan tombol untuk memulai kalibrasi"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibrasi"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Membolehkan joistik"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Berhenti"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3915,39 +3924,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4428,7 +4437,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5881,54 +5890,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/it.po b/po/it.po
index 763789f19..db8deaca7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
"language/it/)\n"
@@ -31,7 +31,7 @@ msgstr "Le richieste di scambio in arrivo saranno ignorate"
msgid "Accepting incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno accettate"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Visibile nella mappa"
@@ -57,54 +57,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Impostazioni"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Tema"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Chiudi"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Connessione al server"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Accesso all'account"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Accesso al gioco"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Caricamento personaggi"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -113,50 +113,50 @@ msgstr "Cambiamento server del gioco"
msgid "Error"
msgstr "Errore"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Cambia password"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Cambia Email"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Invalido aggiornamento host: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Errore durante la creazione della directory degli aggiornamenti"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, 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."
@@ -403,22 +403,22 @@ msgstr "Reimposta"
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Attacco"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Parla"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Movimento"
@@ -427,8 +427,8 @@ msgid "Result"
msgstr "Risultato"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Compra"
@@ -446,7 +446,7 @@ msgstr "Quantita':"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -454,7 +454,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -466,8 +466,8 @@ msgid "Quit"
msgstr "Esci"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Massimo"
@@ -477,8 +477,8 @@ msgstr "Massimo"
msgid "Shop"
msgstr "Negozio"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Vendi"
@@ -487,21 +487,22 @@ msgstr "Vendi"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Annulla"
@@ -776,7 +777,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr "Presente: %s; %d giocatori sono presenti."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Sussurra a %s: %s"
@@ -789,9 +790,9 @@ msgstr "Sì"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignora"
@@ -1015,8 +1016,8 @@ msgid "Equipment"
msgstr "Equipaggiamento"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Togli"
@@ -1050,47 +1051,47 @@ msgid "Inventory"
msgstr "Inventario"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Equipaggia"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Usa"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Lascia..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Dividi"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Attrezzatura"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Magazzino"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Recupera"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Lascia"
@@ -1326,18 +1327,18 @@ msgstr "Barra dello stato"
msgid "job bar"
msgstr "Barra dei punti lavoro"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Livello: %d (GM:%d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Livello: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Bisogno"
@@ -1358,7 +1359,7 @@ msgstr "Invia"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Cancella"
@@ -1393,346 +1394,350 @@ msgstr "Away outfit"
msgid "Key: %s"
msgstr "Chiave: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Commercia"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Sussurra"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Cura"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Caccia dalla gilda"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Cambia ruolo nella gilda"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Invita nell gilda"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Caccia giocatore"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Aggiungi commento"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Caccia"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Rimuovi dalla lista Attacco"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Aggiungi alla lista Attacco - Priorità"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Aggiungi alla lista Attacco"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Aggiungi alla lista Ignora"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Aggiungi nome alla chat"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Giocatori"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Caccia dal party"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Raccogli"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Aggiungi alla chat"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Oggetto mappa"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Rinomina"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Rimuovi"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Teletrasporto"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Muovi telecamera"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Spells"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Modifica Incantesimo"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Disabilita highlight"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Abilita highlight"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Rimuovi nome"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Abilita modalita' Away"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Disabilita modalita' Away"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Lascia"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Copia negli appunti"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Invita nel party"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Cambia posizione nella gilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Rinomina mappa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nome:"
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Commento giocatore:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Commento:"
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Aggiungi allo scambio"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Aggiungi 10"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Aggiungi metà"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Aggiungi tutti"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Salva 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Salva metà"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Salva tutto"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Lascia tutto"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Ritira 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Ritira metà"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Ritira tutto"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Nascondi"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Mostra"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Reset barra gialla"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Copia in Chat"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(default)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Muovi Su"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Muovi Giù"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Spogliati"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Chiedi amicizia"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Ignora"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Lista nera"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Identifica come nemico"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Elimina"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Stop Ignora"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Ignora completamente."
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Segui"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imita"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Compra (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Vendi (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Mostra Oggetti"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Rimuovi dalla lista 'Raccogli'"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Aggiungi alla lista 'Raccogli'"
@@ -2431,7 +2436,7 @@ msgid "Music volume"
msgstr "Volume musica"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2710,31 +2715,35 @@ msgstr ""
"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
"inconvenienti"
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Premi il pulsante per cominciare la calibrazione"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Calibra"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Abilita joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Ferma"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3933,39 +3942,39 @@ msgstr "Scegli un nome per il tuo party"
msgid "Specials"
msgstr "Speciali"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Soldi: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Esperienza:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Lavoro: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Lavoro:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Punti personaggio: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Punti correzione: %d"
@@ -4450,7 +4459,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Apri url"
@@ -5922,54 +5931,54 @@ msgstr "Vitalità"
msgid "Intelligence"
msgstr "Intelligenza"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Destrezza"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Fortuna"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Difesa."
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "Attacco magico."
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "Difesa Magica."
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Accuratezza"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Evasione"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Colpo critico"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Ritardo Attacco"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Ritardo Movimento"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Range d'attacco"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Danno per secondo"
diff --git a/po/ja.po b/po/ja.po
index 4a992fbd6..cd729ce8c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
#
# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
-# <HarajukuCupcakes@gmail.com>, 2011, 2012.
+# <HarajukuCupcakes@gmail.com>, 2011-2013.
# Necromonger <Necromong@inbox.ru>, 2011.
# <Necromong@inbox.ru>, 2011.
# sn0w75 <ibenrunnin@gmail.com>, 2011.
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
"language/ja/)\n"
@@ -31,7 +31,7 @@ msgstr "トレードリクエストを無効ã«ã—ã¦ã„ã¾ã™"
msgid "Accepting incoming trade requests"
msgstr "トレードリクエストを有効ã«ã—ã¾ã—ãŸ"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "マップã«è¡¨ç¤ºã•ã›ã‚‹"
@@ -57,54 +57,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "パフォーマンス"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "ビデオ"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "テーマ"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "é–‰ã˜ã‚‹"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "サーãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "ログインã—ã¦ã„ã¾ã™"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "ゲームã®ä¸–ç•Œã«ç§»å‹•ã—ã¦ã„ã¾ã™"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "キャラクターを呼ã³å‡ºã—ã¦ã„ã¾ã™"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "ゲームサーãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "ゲームサーãƒãƒ¼ã‚’変更ã—ã¦ã„ã¾ã™"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -113,50 +113,50 @@ msgstr "ゲームサーãƒãƒ¼ã‚’変更ã—ã¦ã„ã¾ã™"
msgid "Error"
msgstr "エラー"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "登録内容を呼ã³å‡ºã—ã¦ã„ã¾ã™"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "パスワード変更"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "パスワードを変更ã—ã¾ã—ãŸ"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "メールアドレス変更"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "メールアドレスを変更ã—ã¾ã—ãŸ"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "登録を解除ã—ã¾ã—ãŸ"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "ã•ã‚ˆã†ãªã‚‰ã€€ã¾ãŸä¼šã„ã¾ã—ょã†"
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%sã¯å­˜åœ¨ã—ãªã„為ã€ä½œæˆã§ãã¾ã›ã‚“"
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "無効ãªã‚¢ãƒƒãƒ—デートホスト:%s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "更新フォルダã®ä½œæˆã‚¨ãƒ©ãƒ¼"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s ã¯å­˜åœ¨ã—ãªã„為ã€ä½œæˆã§ãã¾ã›ã‚“"
@@ -397,22 +397,22 @@ msgstr "リセット"
msgid "Name"
msgstr "åå‰"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "攻撃"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "話ã™"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "å‹•ã"
@@ -421,8 +421,8 @@ msgid "Result"
msgstr "çµæžœ"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "è²·ã†"
@@ -440,7 +440,7 @@ msgstr "é‡:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -448,7 +448,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -460,8 +460,8 @@ msgid "Quit"
msgstr "終了"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "最大"
@@ -471,8 +471,8 @@ msgstr "最大"
msgid "Shop"
msgstr "店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "売る"
@@ -481,21 +481,22 @@ msgstr "売る"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "キャンセル"
@@ -770,7 +771,7 @@ msgstr "ãƒãƒ£ãƒƒãƒˆ"
msgid "Present: %s; %d players are present."
msgstr "ç¾åœ¨: %s; %d プレイヤーãŒã„ã¾ã™"
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "%sã«ã•ã•ã‚„ã中:%s"
@@ -783,9 +784,9 @@ msgstr "ã¯ã„"
msgid "No"
msgstr "ã„ã„ãˆ"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "無視"
@@ -868,7 +869,7 @@ msgstr "%d FPS (å¤ã„ OpenGL)"
#: src/gui/debugwindow.cpp:182
#, c-format
msgid "%d FPS (mobile OpenGL)"
-msgstr ""
+msgstr "%d FPS (モãƒã‚¤ãƒ«OpenGL)"
#: src/gui/debugwindow.cpp:204 src/gui/debugwindow.cpp:260
msgid "Textures count:"
@@ -1009,8 +1010,8 @@ msgid "Equipment"
msgstr "装ç€å“"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "å–外ã™"
@@ -1044,47 +1045,47 @@ msgid "Inventory"
msgstr "インベントリー"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "装ç€"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "è½ã¨ã™..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "分割"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "æœè£…"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "ä¿ç®¡"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "å–出ã™"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "è½ã¨ã™"
@@ -1157,14 +1158,14 @@ msgstr "キル: %s, åˆè¨ˆexp: %s"
#: src/gui/killstats.cpp:474
#, c-format
msgid "Avg Exp: %s"
-msgstr ""
+msgstr "å¹³å‡ Exp: %s"
#: src/gui/killstats.cpp:54 src/gui/killstats.cpp:156
#: src/gui/killstats.cpp:232 src/gui/killstats.cpp:243
#: src/gui/killstats.cpp:476
#, c-format
msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "次ã®ãƒ¬ãƒ™ãƒ«ã¾ã§ã«å¿…è¦ãªãƒ¢ãƒ–数 約: %s"
#: src/gui/killstats.cpp:56 src/gui/killstats.cpp:166
#: src/gui/killstats.cpp:250 src/gui/killstats.cpp:478
@@ -1318,18 +1319,18 @@ msgstr "情勢"
msgid "job bar"
msgstr "è·"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "レベル: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "レベル: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "å¿…è¦"
@@ -1350,7 +1351,7 @@ msgstr "決定"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "クリア"
@@ -1385,352 +1386,356 @@ msgstr "AFK中ã®æœè£…"
msgid "Key: %s"
msgstr "éµ: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "トレード"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "ã•ã•ã‚„ã"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "HP回復"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "ギルドã‹ã‚‰ä¸€æ™‚çš„ã«è¿½ã„出ã™"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "ギルドã§ã®å½¹å‰²ã‚’変更"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "ギルドã¸æ‹›å¾…"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "プレイヤーを一時的ã«è¿½ã„出ã™"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "消ã™"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "コメントをã™ã‚‹"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "追ã„出ã™"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "攻撃リストã‹ã‚‰å‰Šé™¤ã™ã‚‹"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "攻撃優先リストã¸è¿½åŠ ã™ã‚‹"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "攻撃リストã¸è¿½åŠ ã™ã‚‹"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "攻撃無視リストã¸è¿½åŠ ã™ã‚‹"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "åå‰ã‚’ãƒãƒ£ãƒƒãƒˆã¸è¿½åŠ ã™ã‚‹"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "プレイヤー"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "パーティã‹ã‚‰ä¸€æ™‚çš„ã«è¿½ã„出ã™"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "拾ã†"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "ãƒãƒ£ãƒƒãƒˆã«è¿½åŠ "
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "マップアイテム"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "åå‰ã‚’変更ã™ã‚‹"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "削除"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "ワープ"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "カメラを動ã‹ã™"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "æœè£…を削除ã™ã‚‹"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "呪文"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "呪文を編集ã™ã‚‹"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "強調表示を無効"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "強調表示を有効"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "åå‰ã‚’消ã•ãªã„"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "åå‰ã‚’削除ã™ã‚‹"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "AFKを有効ã«ã™ã‚‹"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "AFKを無効ã«ã™ã‚‹"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "退会"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "クリップボードã«ã‚³ãƒ”ー"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "パーティã¸æ‹›å¾…"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "ギルドãƒã‚¸ã‚·ãƒ§ãƒ³ã‚’変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr " マップサインã®åå‰ã‚’変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "åå‰: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "プレイヤーコメント "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "コメント: "
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "トレードウィンドウã«è¿½åŠ "
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "トレードウィンドウã«10追加ã™ã‚‹"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "トレードウィンドウã«åŠåˆ†è¿½åŠ ã™ã‚‹"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "トレードウィンドウã«å…¨ã¦è¿½åŠ ã™ã‚‹"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "10 ä¿å­˜"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "åŠåˆ†ä¿å­˜"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "全部ä¿å­˜"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "å…¨ã¦è½ã¨ã™"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "10 å–出ã™"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "åŠåˆ†å–出ã™"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "全部å–出ã™"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
-msgstr ""
+msgstr "ドロップ窓を消ã™"
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr " éžè¡¨ç¤º"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "表示"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "黄色ãƒãƒ¼ã‚’リセットã™ã‚‹"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "ãƒãƒ£ãƒƒãƒˆã¸ã‚³ãƒ”ーã™ã‚‹"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(デフォルト)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "上ã¸ç§»å‹•"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "下ã¸ç§»å‹•"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "脱ã"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
-msgstr ""
+msgstr "コピー"
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
+msgstr "ペースト"
+
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "å‹é”ã«ãªã‚‹"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "無視ã™ã‚‹"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "ブラックリスト"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "敵ã«è¨­å®šã™ã‚‹"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "消ã™"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "完全無視解除"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "完全無視"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "フォロー"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "真似"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "買ㆠ(?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "売る (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "アイテムを表示ã™ã‚‹"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
#: src/gui/questswindow.cpp:95 src/gui/windowmenu.cpp:92
msgid "Quests"
-msgstr ""
+msgstr "クエスト"
#: src/gui/questswindow.cpp:204 src/gui/setup_input.cpp:354
msgid "unknown"
@@ -1830,7 +1835,7 @@ msgstr "v%sãŒå¿…è¦"
#: src/gui/setupactiondata.h:46
msgid "Target and attack keys"
-msgstr ""
+msgstr "ターゲット・攻撃キー"
#: src/gui/setupactiondata.h:56
msgid "Target & Attack"
@@ -1866,7 +1871,7 @@ msgstr "ターゲットã‹ã‚‰å¤–ã™"
#: src/gui/setupactiondata.h:101
msgid "Target monster"
-msgstr ""
+msgstr "モブをターゲット"
#: src/gui/setupactiondata.h:106
msgid "Target NPC"
@@ -1910,15 +1915,15 @@ msgstr "OKã‚’é¸æŠžã™ã‚‹"
#: src/gui/setupactiondata.h:161
msgid "Stop or sit"
-msgstr ""
+msgstr "æ­¢ã¾ã‚‹ãƒ»åº§ã‚‹"
#: src/gui/setupactiondata.h:166
msgid "Return to safe video mode"
-msgstr ""
+msgstr "セーフビデオモードã¸æˆ»ã‚‹"
#: src/gui/setupactiondata.h:180
msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "ショートカット編集キー"
#: src/gui/setupactiondata.h:185
msgid "Item Shortcuts Key"
@@ -1926,7 +1931,7 @@ msgstr "アイテムショートカットキー"
#: src/gui/setupactiondata.h:190
msgid "Shortcuts keys"
-msgstr ""
+msgstr "ショートカットキー"
#: src/gui/setupactiondata.h:195 src/gui/setupactiondata.h:200
#: src/gui/setupactiondata.h:205 src/gui/setupactiondata.h:210
@@ -2028,7 +2033,7 @@ msgstr "豆知識窓"
#: src/gui/setupactiondata.h:409
msgid "Quests Window"
-msgstr ""
+msgstr "クエスト窓"
#: src/gui/setupactiondata.h:414
msgid "Previous Social Tab"
@@ -2040,15 +2045,15 @@ msgstr "次ソーシャルタブ"
#: src/gui/setupactiondata.h:433
msgid "Emote modifiers keys"
-msgstr ""
+msgstr "スマイリー編集キー"
#: src/gui/setupactiondata.h:438
msgid "Emote modifier key"
-msgstr ""
+msgstr "スマイリー編集キー"
#: src/gui/setupactiondata.h:443
msgid "Emote shortcuts"
-msgstr ""
+msgstr "スマイリーショートカット"
#: src/gui/setupactiondata.h:448 src/gui/setupactiondata.h:453
#: src/gui/setupactiondata.h:458 src/gui/setupactiondata.h:463
@@ -2080,7 +2085,7 @@ msgstr "スマイリーショートカット: %d"
#: src/gui/setupactiondata.h:697
msgid "Outfits keys"
-msgstr ""
+msgstr "æœè£…キー"
#: src/gui/setupactiondata.h:702
msgid "Wear Outfit"
@@ -2096,7 +2101,7 @@ msgstr "装ç€å“ã‚’æœè£…ã«ã‚³ãƒ”ー"
#: src/gui/setupactiondata.h:717
msgid "Outfits shortcuts"
-msgstr ""
+msgstr "æœè£…ショートカット"
#: src/gui/setupactiondata.h:722 src/gui/setupactiondata.h:727
#: src/gui/setupactiondata.h:732 src/gui/setupactiondata.h:737
@@ -2124,7 +2129,7 @@ msgstr ""
#: src/gui/setupactiondata.h:952 src/gui/setupactiondata.h:957
#, c-format
msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "æœè£…ショートカット %d"
#: src/gui/setupactiondata.h:971
msgid "Toggle Chat"
@@ -2268,11 +2273,11 @@ msgstr "モディファイアキー"
#: src/gui/setupactiondata.h:1155
msgid "Show onscreen keyboard"
-msgstr ""
+msgstr "オンスクリーンキーボード"
#: src/gui/setupactiondata.h:1169
msgid "Move Keys"
-msgstr ""
+msgstr "キーを移動"
#: src/gui/setupactiondata.h:1174 src/gui/setupactiondata.h:1453
msgid "Move Up"
@@ -2292,7 +2297,7 @@ msgstr "å³ã¸ç§»å‹•"
#: src/gui/setupactiondata.h:1194
msgid "Move to navigation point shortcuts"
-msgstr ""
+msgstr "ナビãƒã‚¤ãƒ³ãƒˆã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã¾ã§ç§»å‹•"
#: src/gui/setupactiondata.h:1199 src/gui/setupactiondata.h:1204
#: src/gui/setupactiondata.h:1209 src/gui/setupactiondata.h:1214
@@ -2320,7 +2325,7 @@ msgstr ""
#: src/gui/setupactiondata.h:1429 src/gui/setupactiondata.h:1434
#, c-format
msgid "Move to point Shortcut %d"
-msgstr ""
+msgstr "ショートカット %dã¾ã§ç§»å‹•"
#: src/gui/setupactiondata.h:1448
msgid "Move & selection"
@@ -2328,47 +2333,47 @@ msgstr ""
#: src/gui/setupactiondata.h:1473
msgid "Move Home"
-msgstr ""
+msgstr "ホームã¸ç§»å‹•"
#: src/gui/setupactiondata.h:1478
msgid "Move End"
-msgstr ""
+msgstr "最後ã¾ã§ç§»å‹•"
#: src/gui/setupactiondata.h:1483
msgid "Page up"
-msgstr ""
+msgstr "ページ上ã¸"
#: src/gui/setupactiondata.h:1488
msgid "Page down"
-msgstr ""
+msgstr "ページ下ã¸"
#: src/gui/setupactiondata.h:1498
msgid "Select"
-msgstr ""
+msgstr "é¸æŠž"
#: src/gui/setupactiondata.h:1503
msgid "Select2"
-msgstr ""
+msgstr "é¸æŠž2"
#: src/gui/setupactiondata.h:1518
msgid "Backspace"
-msgstr ""
+msgstr "ãƒãƒƒã‚¯ã‚¹ãƒšãƒ¼ã‚¹"
#: src/gui/setupactiondata.h:1523
msgid "Insert"
-msgstr ""
+msgstr "挿入"
#: src/gui/setupactiondata.h:1528
msgid "Tab"
-msgstr ""
+msgstr "タブ"
#: src/gui/setupactiondata.h:1533
msgid "Mod"
-msgstr ""
+msgstr "モッド"
#: src/gui/setupactiondata.h:1559
msgid "Basic"
-msgstr ""
+msgstr "基本"
#: src/gui/setupactiondata.h:1561 src/gui/windowmenu.cpp:146
msgid "Shortcuts"
@@ -2380,11 +2385,11 @@ msgstr "ウィンドウ"
#: src/gui/setupactiondata.h:1563
msgid "Emotes"
-msgstr ""
+msgstr "スマイリー"
#: src/gui/setupactiondata.h:1567
msgid "Gui"
-msgstr ""
+msgstr "GUI"
#: src/gui/setup_audio.cpp:46
msgid "(no sound)"
@@ -2423,24 +2428,24 @@ msgid "Music volume"
msgstr "音楽ã®éŸ³é‡"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
msgid "Audio frequency"
-msgstr ""
+msgstr "周波数を自動設定"
#: src/gui/setup_audio.cpp:92
msgid "mono"
-msgstr ""
+msgstr "モノ"
#: src/gui/setup_audio.cpp:93
msgid "stereo"
-msgstr ""
+msgstr "ステレオ"
#: src/gui/setup_audio.cpp:94
msgid "surround"
-msgstr ""
+msgstr "サラウンド"
#: src/gui/setup_audio.cpp:95
msgid "surround+center+lfe"
@@ -2448,7 +2453,7 @@ msgstr ""
#: src/gui/setup_audio.cpp:96
msgid "Audio channels"
-msgstr ""
+msgstr "自動ãƒãƒ£ãƒ³ãƒãƒ«"
#: src/gui/setup_audio.cpp:100
msgid "Sound effects"
@@ -2488,11 +2493,11 @@ msgstr "トレードリクエスト音"
#: src/gui/setup_audio.cpp:126
msgid "Show window sound"
-msgstr ""
+msgstr "窓ã®éŸ³ã‚’有効"
#: src/gui/setup_audio.cpp:129
msgid "Hide window sound"
-msgstr ""
+msgstr "窓ã®éŸ³ã‚’無効"
#: src/gui/setup_audio.cpp:135
msgid "Enable mumble voice chat"
@@ -2683,11 +2688,11 @@ msgstr "標準ã«æˆ»ã™"
#: src/gui/setup_input.cpp:101
msgid "Reset all keys"
-msgstr ""
+msgstr "å…¨ã¦ã®ã‚­ãƒ¼ã‚’リセット"
#: src/gui/setup_input.cpp:107
msgid "Input"
-msgstr ""
+msgstr "入力"
#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
@@ -2702,60 +2707,64 @@ msgstr ""
"\"%s\"ã¨\"%s\"キーãŒé‡è¤‡ã—ã¦ã„ã¾ã™ã€‚ ゲームプレイã«æ‚ªã„影響ãŒå‡ºã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›"
"ã‚“"
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "ボタンを押ã—ã¦ã‚«ãƒªãƒ–レーションを開始"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "カリブレーション"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "ジョイスティックを使用å¯èƒ½ã«ã™ã‚‹"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "クライアントãŒç„¡åŠ¹ã®å ´åˆã‚¸ãƒ§ã‚¤ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚’使用"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "ジョイスティック"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "åœæ­¢"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "ボタンã¯æŠ¼ã•ãªã„ã§ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚’回転ã™ã‚‹"
#: src/gui/setup_other.cpp:39
msgid "Always show"
-msgstr ""
+msgstr "常ã«è¡¨ç¤º"
#: src/gui/setup_other.cpp:40
msgid "Auto hide in small resolution"
-msgstr ""
+msgstr "ç´°ã‹ã„解åƒåº¦ã§éš ã™"
#: src/gui/setup_other.cpp:41
msgid "Always auto hide"
-msgstr ""
+msgstr "常ã«è‡ªå‹•ã§éš ã™"
#. TRANSLATORS: Proxy type selection
#: src/gui/setup_other.cpp:49
msgid "System proxy"
-msgstr ""
+msgstr "システムプロキシ"
#. TRANSLATORS: Proxy type selection
#: src/gui/setup_other.cpp:51
msgid "Direct connection"
-msgstr ""
+msgstr "直接接続"
#. TRANSLATORS: Proxy type selection
#: src/gui/setup_other.cpp:58
msgid "SOCKS5 hostname"
-msgstr ""
+msgstr "SOCKS5 ホストå"
#: src/gui/setup_other.cpp:66
msgid "Misc"
@@ -2907,7 +2916,7 @@ msgstr "ショップモードを有効ã«ã™ã‚‹"
#: src/gui/setup_other.cpp:189
msgid "Cycle npc targets"
-msgstr ""
+msgstr "NPCターゲットを回転"
#: src/gui/setup_other.cpp:192
msgid "Log NPC dialogue"
@@ -2939,19 +2948,19 @@ msgstr ""
#: src/gui/setup_other.cpp:218
msgid "Shortcut buttons"
-msgstr ""
+msgstr "ショートカットボタン"
#: src/gui/setup_other.cpp:222
msgid "Proxy server"
-msgstr ""
+msgstr "プロキシサーãƒãƒ¼"
#: src/gui/setup_other.cpp:225
msgid "Proxy type"
-msgstr ""
+msgstr "プロキシタイプ"
#: src/gui/setup_other.cpp:228
msgid "Proxy address:port"
-msgstr ""
+msgstr "プロキシアドレス:ãƒãƒ¼ãƒˆ"
#: src/gui/setup_other.cpp:234
msgid "Enable server side attack"
@@ -2971,11 +2980,11 @@ msgstr "デãƒãƒƒã‚°ãƒ­ã‚°ã‚’有効ã«ã™ã‚‹"
#: src/gui/setup_other.cpp:247
msgid "Enable OpenGL log"
-msgstr ""
+msgstr "OpenGLログを有効ã«ã™ã‚‹"
#: src/gui/setup_other.cpp:250
msgid "Enable input log"
-msgstr ""
+msgstr "入力ログを有効ã«ã™ã‚‹"
#: src/gui/setup_other.cpp:253
msgid "Low traffic mode"
@@ -3030,7 +3039,7 @@ msgstr ""
#: src/gui/setup_perfomance.cpp:75
msgid "Enable texture sampler (OpenGL)"
-msgstr ""
+msgstr "テクスãƒãƒ£ã‚µãƒ³ãƒ—ラーを有効ã«ã™ã‚‹ (OpenGL)"
#: src/gui/setup_perfomance.cpp:79
msgid "Better quality (disable for better perfomance)"
@@ -3254,7 +3263,7 @@ msgstr "インドãƒã‚·ã‚¢èªž"
#: src/gui/setup_theme.cpp:135
msgid "Italian"
-msgstr ""
+msgstr "イタリア語"
#: src/gui/setup_theme.cpp:136
msgid "Polish"
@@ -3327,7 +3336,7 @@ msgstr ""
#. TRANSLATORS: button name with information about selected theme
#: src/gui/setup_theme.cpp:227
msgid "i"
-msgstr ""
+msgstr "i"
#: src/gui/setup_theme.cpp:229
msgid "Theme"
@@ -3335,7 +3344,7 @@ msgstr "テーマ"
#: src/gui/setup_theme.cpp:394
msgid "Theme info"
-msgstr ""
+msgstr "テーマ情報"
#: src/gui/setup_theme.cpp:415
msgid "Theme Changed"
@@ -3348,23 +3357,23 @@ msgstr "設定変更ã®ç‚ºã‚¢ãƒ—リケーションをå†èµ·å‹•ã—ã¦ãã ã•ã„
#: src/gui/setup_touch.cpp:34
msgid "Small"
-msgstr ""
+msgstr "å°"
#: src/gui/setup_touch.cpp:36
msgid "Medium"
-msgstr ""
+msgstr "中"
#: src/gui/setup_touch.cpp:37
msgid "Large"
-msgstr ""
+msgstr "大"
#: src/gui/setup_touch.cpp:54
msgid "Touch"
-msgstr ""
+msgstr "タッãƒ"
#: src/gui/setup_touch.cpp:62
msgid "Onscreen keyboard"
-msgstr ""
+msgstr "オンスクリーンキーボード"
#: src/gui/setup_touch.cpp:64
msgid "Show onscreen keyboard icon"
@@ -3376,36 +3385,36 @@ msgstr ""
#: src/gui/setup_touch.cpp:72
msgid "Onscreen joystick"
-msgstr ""
+msgstr "オンスクリーンジョイスティック"
#: src/gui/setup_touch.cpp:74
msgid "Show onscreen joystick"
-msgstr ""
+msgstr "オンスクリーンジョイスティックを表示"
#: src/gui/setup_touch.cpp:77
msgid "Joystick size"
-msgstr ""
+msgstr "ジョイスティックã®ã‚µã‚¤ã‚º"
#: src/gui/setup_touch.cpp:81
msgid "Onscreen buttons"
-msgstr ""
+msgstr "オンスクリーンボタン"
#: src/gui/setup_touch.cpp:83
msgid "Show onscreen buttons"
-msgstr ""
+msgstr "オンスクリーンボタンを表示"
#: src/gui/setup_touch.cpp:86
msgid "Buttons format"
-msgstr ""
+msgstr "ボタンフォーマット"
#: src/gui/setup_touch.cpp:89
msgid "Buttons size"
-msgstr ""
+msgstr "ボタンã®ã‚µã‚¤ã‚º"
#: src/gui/setup_touch.cpp:92 src/gui/setup_touch.cpp:96
#, c-format
msgid "Button %u action"
-msgstr ""
+msgstr "ボタン %u アクション"
#: src/gui/setup_video.cpp:180
msgid "Software"
@@ -3421,7 +3430,7 @@ msgstr "セーフ OpenGL"
#: src/gui/setup_video.cpp:185
msgid "Mobile OpenGL"
-msgstr ""
+msgstr "モãƒã‚¤ãƒ«OpenGL"
#: src/gui/setup_video.cpp:222
msgid "Full screen"
@@ -3429,7 +3438,7 @@ msgstr "フルスクリーン"
#: src/gui/setup_video.cpp:225
msgid "Show cursor"
-msgstr ""
+msgstr "カーソルを表示"
#: src/gui/setup_video.cpp:227
msgid "Custom cursor"
@@ -3574,7 +3583,7 @@ msgstr "マウスã¨ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰å…¥åŠ›ã‚’グラブ"
#: src/gui/setup_visual.cpp:102
msgid "Blurring textures (OpenGL)"
-msgstr ""
+msgstr "テクスãƒãƒ£ãƒ¼ã‚’ã¼ã‹ã™ (OpenGL)"
#: src/gui/setup_visual.cpp:105
msgid "Gui opacity"
@@ -3614,7 +3623,7 @@ msgstr "ガンマ"
#: src/gui/setup_visual.cpp:135
msgid "Enable gamma control"
-msgstr ""
+msgstr "ガンマコントロールを有効ã«ã™ã‚‹"
#: src/gui/setup_visual.cpp:145
msgid "Vsync"
@@ -3626,7 +3635,7 @@ msgstr ""
#: src/gui/setup_visual.cpp:153
msgid "Allow screensaver to run"
-msgstr ""
+msgstr "スクリーンセーãƒãƒ¼ã‚’有効ã«ã™ã‚‹"
#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
@@ -3922,39 +3931,39 @@ msgstr "パーティåã‚’é¸ã‚“ã§ãã ã•ã„"
msgid "Specials"
msgstr "スペシャル"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "GP: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "ジョブ: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "ジョブãƒã‚¤ãƒ³ãƒˆ:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "キャラクターãƒã‚¤ãƒ³ãƒˆ: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "修正点: %d"
@@ -4439,11 +4448,11 @@ msgstr "/kick > プレイヤーをギルドã‹ã‚‰è¿½ã„出ã—ã¾ã™"
#. TRANSLATORS: Text under equipped items (should be small)
#: src/gui/widgets/itemcontainer.cpp:310
msgid "Eq."
-msgstr ""
+msgstr "装ç€"
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
-msgstr ""
+msgstr "URLã‚’é–‹ã"
#: src/gui/widgets/whispertab.cpp:103
msgid "/ignore > Ignore the other player"
@@ -4493,12 +4502,12 @@ msgstr "オンラインリスト"
#. TRANSLATORS: short button name for help window.
#: src/gui/windowmenu.cpp:88
msgid "HLP"
-msgstr ""
+msgstr "ヘルプ"
#. TRANSLATORS: short button name for quests window.
#: src/gui/windowmenu.cpp:91
msgid "QE"
-msgstr ""
+msgstr "QE"
#. TRANSLATORS: short button name for bot checker window.
#: src/gui/windowmenu.cpp:94
@@ -4545,7 +4554,7 @@ msgstr "INV"
#. TRANSLATORS: short button name for map window.
#: src/gui/windowmenu.cpp:122
msgid "MAP"
-msgstr ""
+msgstr "地図"
#. TRANSLATORS: short button name for skills window.
#: src/gui/windowmenu.cpp:128
@@ -4627,7 +4636,7 @@ msgstr "キー_%d"
#: src/inputmanager.cpp:314
#, c-format
msgid "JButton%d"
-msgstr ""
+msgstr "ジョイスティックボタン%d"
#: src/inputmanager.cpp:326
msgid "unknown key"
@@ -4637,7 +4646,7 @@ msgstr "ä¸æ˜Žãªã‚­ãƒ¼"
#: src/inputmanager.cpp:353
#, c-format
msgid "JB%d"
-msgstr ""
+msgstr "JB%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
#: src/inputmanager.cpp:365 src/keyboardconfig.cpp:97
@@ -4772,7 +4781,7 @@ msgstr "(a) 弓師攻撃範囲"
#: src/localplayer.cpp:1970
msgid "(B) moves to target in attack range - 1"
-msgstr ""
+msgstr "(B) 攻撃範囲 - 1ã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã¾ã§ç§»å‹•"
#: src/localplayer.cpp:1971
msgid "(?) move to target"
@@ -5504,7 +5513,7 @@ msgstr "ユーザåã¯æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™"
#: src/net/ea/loginhandler.cpp:268
msgid "Incorrect email."
-msgstr ""
+msgstr "メールアドレスãŒé•ã„ã¾ã™"
#: src/net/ea/loginhandler.cpp:271
msgid "Username permanently erased."
@@ -5904,54 +5913,54 @@ msgstr "防御力"
msgid "Intelligence"
msgstr "魔力"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "命中率"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "幸é‹"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Defense"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "M.Attack"
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "M.Defense"
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Accuracy"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Evade"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Critical"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "攻撃é…延"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr " å¾’æ­©é…延"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "攻撃è·é›¢"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "ダメージ/秒"
diff --git a/po/ka.po b/po/ka.po
index 674a00e0a..dee2d84cb 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -389,22 +389,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -413,8 +413,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -432,7 +432,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -440,7 +440,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -452,8 +452,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -463,8 +463,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -473,21 +473,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -762,7 +763,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -775,9 +776,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1001,8 +1002,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1036,47 +1037,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1310,18 +1311,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1342,7 +1343,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1377,346 +1378,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2415,7 +2420,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2692,31 +2697,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3909,39 +3918,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4423,7 +4432,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5876,54 +5885,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 1522182e1..80cf34cf2 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: 2013-01-03 22:14+0300\n"
+"POT-Creation-Date: 2013-01-18 14:19+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"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -468,8 +468,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -478,21 +478,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -767,7 +768,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4429,7 +4438,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5881,54 +5890,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 98c2d347e..730920ff2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Lukk"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "Feil"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr "Tilbakestill"
msgid "Name"
msgstr "Navn"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Kjøp"
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "Avslutt"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Maks"
@@ -468,8 +468,8 @@ msgstr "Maks"
msgid "Shop"
msgstr "Butikk"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Selg"
@@ -478,21 +478,22 @@ msgstr "Selg"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Avbryt"
@@ -767,7 +768,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nei"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr "Utstyr"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Bruk"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Del opp"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Nivå: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr "Bekreft"
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Spillere"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr "Musikk-volum"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Trykk knappen for å starte kalibrasjon"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stopp"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Penger: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Jobb: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e309d897c..ddca1e318 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/manaplus/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Inkomende handelsaanvragen negeren"
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Sluiten"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr "Reset"
msgid "Name"
msgstr "Naam"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Aanvallen"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Spreken"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Kopen"
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "Afsluiten"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Maximum"
@@ -468,8 +468,8 @@ msgstr "Maximum"
msgid "Shop"
msgstr "Winkel"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Verkopen"
@@ -478,21 +478,22 @@ msgstr "Verkopen"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Annuleren"
@@ -767,7 +768,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -780,9 +781,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Afdoen"
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr "Inventaris"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Splitsen"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Neerleggen"
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr "Indienen"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Handel"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Spelers"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr "Muziek volume"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Druk op de knop om het kalibreren te starten"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibreren"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Joystick activeren"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stoppen"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "Leven:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Ervaring:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "Magie:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr "Vitaliteit"
msgid "Intelligence"
msgstr "Intelligentie"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Vaardigheid"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Geluk"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index e2fe8da11..6f4bf9ba5 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
"language/nl_BE/)\n"
@@ -29,7 +29,7 @@ msgstr "Inkomende handelsaanvragen negeren"
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Zichtbaar op de map"
@@ -55,54 +55,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Sluiten"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -111,50 +111,50 @@ msgstr "Wijzigen spelservers"
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, 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."
@@ -400,22 +400,22 @@ msgstr "Reset"
msgid "Name"
msgstr "Naam"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Aanvallen"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Spreken"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Beweeg"
@@ -424,8 +424,8 @@ msgid "Result"
msgstr "Resultaat"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Kopen"
@@ -443,7 +443,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -451,7 +451,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -463,8 +463,8 @@ msgid "Quit"
msgstr "Afsluiten"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Maximum"
@@ -474,8 +474,8 @@ msgstr "Maximum"
msgid "Shop"
msgstr "Winkel"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Verkopen"
@@ -484,21 +484,22 @@ msgstr "Verkopen"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Annuleren"
@@ -773,7 +774,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr "Aanwezig: %s; %d speler zijn aanwezig."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -786,9 +787,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Negeer"
@@ -1012,8 +1013,8 @@ msgid "Equipment"
msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Afdoen"
@@ -1047,47 +1048,47 @@ msgid "Inventory"
msgstr "Inventaris"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Neerleggen..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Splitsen"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Kleren"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Neerleggen"
@@ -1323,18 +1324,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Niveau: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Nood"
@@ -1355,7 +1356,7 @@ msgstr "Indienen"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Wissen"
@@ -1390,346 +1391,350 @@ msgstr "Kleren om weg te gaan"
msgid "Key: %s"
msgstr "Sleutel: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Handel"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Fluister"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Genees"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Uit de gilde gooien"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "De positie binnen de gilde veranderen"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Uitnodigen voor de gilde"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Schop speler"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Nuke"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Schop"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Van de aanvalslijst verwijderen"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Aan de prioriteitsaanvalslijst toevoegen"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Aan de aanvalslijst toevoegen"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "an de negeerlijst toevoegen"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Naam aan het gesprek toevoegen"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Spelers"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Uit de groep gooien"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Raap op"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Aan chat toevoegen"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Plaats voorwerp op de kaart"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Hernoem"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Verwijder"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Spreuken"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Wijzig spreuk"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Markering afzetten"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Markering aanzetten"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Verwijder naam"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "away aanzetten"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "away afzetten"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Verlaat"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "uitnodigen voor de groep"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Wijzig uw guild positie"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Kaart bordje hernoemen "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Naam: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Plaats 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Plaats de helft"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Plaats alles"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Laat alles vallen"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Haal 10 op"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Haal de helft op"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Haal alles op"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Verberg"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Toon"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Kopieer naar chat"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(standaard)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Beweeg naar boven"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Beweeg naar beneden"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "ontkleed"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Word vriend"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Geen rekening mee houden"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Wis"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Stop Negeren"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Volledig genegeerd"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Volg"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imiteer"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Koop (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Verkoop (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Toon Voorwerpen"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2428,7 +2433,7 @@ msgid "Music volume"
msgstr "Muziek volume"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2705,31 +2710,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Druk op de knop om het kalibreren te starten"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibreren"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Joystick activeren"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stoppen"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3928,39 +3937,39 @@ msgstr "Kies uw groepsnaam."
msgid "Specials"
msgstr "Specialen"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "Leven:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Ervaring:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "Magie:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Personagepunten: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Correctiepunten: %d"
@@ -4449,7 +4458,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5925,54 +5934,54 @@ msgstr "Vitaliteit"
msgid "Intelligence"
msgstr "Intelligentie"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Handigheid"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Geluk"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Verdediging"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "M.Aanval"
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "M.Verdediging"
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Nauwkeurigheid"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Ontwijking"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Aanvalsvertraging"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Wandelvertraging"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Aanvalsbereik"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7dc3a9bb8..c23c355ad 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
"pl/)\n"
@@ -30,7 +30,7 @@ msgstr "Ignorowanie przychodzących próśb o handel"
msgid "Accepting incoming trade requests"
msgstr "Akceptowanie przychodzących próśb o handel"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Widoczne na mapie"
@@ -56,54 +56,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Konfiguracja"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Wydajność programu"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Ekran"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Skórki"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Zamknij"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "ÅÄ…czenie z serwerem"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Logowanie"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "ÅÄ…czenie siÄ™ z serwerem gry"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Zmiana serwera"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -112,50 +112,50 @@ msgstr "Zmiana serwera"
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Zmiana hasła"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Nieprawidłowy serwer aktualizacji: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "BÅ‚Ä…d podczas tworzenia katalogu aktualizacji!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
@@ -404,22 +404,22 @@ msgstr "Resetuj"
msgid "Name"
msgstr "ImiÄ™"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Atak"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Rozmowa"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Podejdź"
@@ -428,8 +428,8 @@ msgid "Result"
msgstr "Rezultat"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Kup"
@@ -447,7 +447,7 @@ msgstr "Ilość:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -455,7 +455,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -467,8 +467,8 @@ msgid "Quit"
msgstr "Wyjdź"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Maks."
@@ -478,8 +478,8 @@ msgstr "Maks."
msgid "Shop"
msgstr "Sklep"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Sprzedaj"
@@ -488,21 +488,22 @@ msgstr "Sprzedaj"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Anuluj"
@@ -777,7 +778,7 @@ msgstr "Czat"
msgid "Present: %s; %d players are present."
msgstr "%s obecny/a. %d graczy online."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Szepczesz do %s: %s"
@@ -790,9 +791,9 @@ msgstr "Tak"
msgid "No"
msgstr "Nie"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignoruj"
@@ -1016,8 +1017,8 @@ msgid "Equipment"
msgstr "Ekwipunek"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Zdejmij"
@@ -1051,47 +1052,47 @@ msgid "Inventory"
msgstr "Inwentarz"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Załóż"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Użyj"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Upuść..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Podziel"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Stroje"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Przechowaj"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Pobierz"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Upuść"
@@ -1329,18 +1330,18 @@ msgstr "pasek statusu"
msgid "job bar"
msgstr "pasek punktów umiejętności"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Poziom: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Poziom: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Potrzeba"
@@ -1361,7 +1362,7 @@ msgstr "Zatwierdź"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Wyczyść"
@@ -1396,346 +1397,350 @@ msgstr "Strój na afk"
msgid "Key: %s"
msgstr "Klawisz: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Handel"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Szept"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Lecz"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Wyrzuć z gildii"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Zmień pozycję w gildii"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "ZaproÅ› do gildii"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Wyrzuć gracza"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Wysadź w powietrze"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Dodaj komentarz"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Wyrzuć"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Usuń z listy ataku"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Dodaj do listy priorytetów"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Dodaj do listy atakowanych"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Dodaj do listy ignorowanych"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Wpisz do czatu"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Gracze"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Wyrzuć z grupy"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "PodnieÅ›"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Dodaj do czatu"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Portal"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Zmień nazwę"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Usuń"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Teleport"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Przesuwaj kamerÄ™"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "Usuń ubiór"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Zaklęcia"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Edytuj zaklęcie"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Wyłącz alarm"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "WÅ‚Ä…cz alarm"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Nie usuwaj imion"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Usuń imię"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "WÅ‚Ä…cz tryb AFK"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Wyłącz tryb AFK"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Opuść"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Skopiuj do schowka"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "ZaproÅ› do grupy"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Zmień pozycję gildii"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Zmień nazwę drogowskazu"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nick:"
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Komentarz gracza "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Komentarz: "
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Dodaj do handlu"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Dodaj 10 do handlu"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Dodaj połowę do handlu"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Dodaj wszystko do handlu"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Przechowaj 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Przechowaj połowę"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Przechowaj wszystko"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Upuść wszystko"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Odbierz 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Odbierz połowę"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Odbierz wszystko"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr "Wyczyść okno upuszczeń."
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Ukryj"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Pokaż"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Zresetuj żółty pasek"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Skopiuj do czatu"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(domyślne)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "W górę"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "W dół"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Rozbierz"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Dodaj do znajomych"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Lekceważ"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Czarna lista"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Ustaw jako wroga"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Usuń"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Odignoruj"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Całkowicie ignoruj"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Podążaj"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imituj"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Kup (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Sprzedaj (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Pokaż przedmioty"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Usuń z listy podnoszonych"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Dodaj do listy podnoszonych"
@@ -2434,7 +2439,7 @@ msgid "Music volume"
msgstr "Głośność muzyki"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2713,31 +2718,35 @@ msgstr ""
"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
"siÄ™ problemy."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibruj"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "WÅ‚Ä…cz joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "Używaj joysticka jeśli okno klienta nieaktywne"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Zatrzymaj"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "Obracaj drążkiem i nie naciskaj przycisków"
@@ -3935,39 +3944,39 @@ msgstr "Wybierz nazwÄ™ grupy."
msgid "Specials"
msgstr "Specjalne"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "PieniÄ…dze: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Praca: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Praca:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Punkty postaci: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Punkty korekcyjne: %d"
@@ -4450,7 +4459,7 @@ msgstr "/kick > Wyrzuć kogoś ze swojej gildii"
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Otwórz adres url"
@@ -5927,54 +5936,54 @@ msgstr "Witalność"
msgid "Intelligence"
msgstr "Inteligencja"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Zręczność"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Szczęście"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Obrona"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "Atak mag."
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "Obrona mag."
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% celności"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% uników"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% ciosów kryt."
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Opóźnienie ataku"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Opóźnienie chodu"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Zasięg ataku"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Obrażenia na sek."
diff --git a/po/pt.po b/po/pt.po
index a4659cfca..bc0fea2a5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
"language/pt/)\n"
@@ -29,7 +29,7 @@ msgstr "Ignorando propostas de negócios"
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Visivel no mapa"
@@ -55,54 +55,54 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Fechar"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -111,50 +111,50 @@ msgstr "Mudando servidores do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, 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."
@@ -400,22 +400,22 @@ msgstr "Resetar"
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Mover"
@@ -424,8 +424,8 @@ msgid "Result"
msgstr "Resultado"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Comprar"
@@ -443,7 +443,7 @@ msgstr "Quantidade:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -451,7 +451,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -463,8 +463,8 @@ msgid "Quit"
msgstr "Sair"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Máximo"
@@ -474,8 +474,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Vender"
@@ -484,21 +484,22 @@ msgstr "Vender"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Cancelar"
@@ -773,7 +774,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -786,9 +787,9 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignora"
@@ -1012,8 +1013,8 @@ msgid "Equipment"
msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Desequipar"
@@ -1047,47 +1048,47 @@ msgid "Inventory"
msgstr "Inventário"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Roupas"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Descartar"
@@ -1323,18 +1324,18 @@ msgstr "Barra de Status"
msgid "job bar"
msgstr "Barra de Job"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Nível: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Precisa"
@@ -1355,7 +1356,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Limpar"
@@ -1390,346 +1391,350 @@ msgstr "Roupas em modo ausente"
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Negócios"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Sussuro"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Curar"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Chutar da Guilda"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Mudar posição da Guilda"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Convidar para Guilda"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Desaparecer"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Adicionar comentário"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Remover da Lista de Ataques"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Adicionar a prioridade na lista de ataques"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Jogadores"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Chutar do grupo"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "A Remover"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Mover câmera"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "Limpar equipamento"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Editar Feitiços"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Não remova o nome"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Remover nome"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Habilitar longe do teclado"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Desabilitar longe do teclado"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "CopiaCopiar para a área de transferência"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
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:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nome: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Adicionar todos para troca-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr "Armazenar todos-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr "Recuperar todos-1"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr "Queda nítida de janela"
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Resetar barra amarela"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Copiar para o chat"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Mover a cima"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Mover a baixo"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Limpar conjunto de roupas"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Ser Amigo(a)"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Ser inimigo(a)"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Definir como inimigo(a)"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Mostar itens"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Remover lista de pegar itens"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Adicionar na lista de pegar itens"
@@ -2428,7 +2433,7 @@ msgid "Music volume"
msgstr "Volume da Música"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2707,31 +2712,35 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Aperte o botão para começar a calibrar"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Calibrar"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Habilitar joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "Usar joystick se a janela do jogo estiver inativa"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Parar"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "Gire o bastão sem precionar botões"
@@ -3928,39 +3937,39 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Dinheiro: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Pontos do personagem: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Pontos de correção: %d"
@@ -4443,7 +4452,7 @@ msgstr "/kick > Expulsa alguém da guilda em que você está"
msgid "Eq."
msgstr "Eq."
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Abrir URL"
@@ -5921,54 +5930,54 @@ msgstr "Vitalidade"
msgid "Intelligence"
msgstr "Inteligência"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Destreza"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Sorte"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Defesa"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "Atq. Mágico"
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "Def. Mágica"
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Exatidão"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Evasão"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Críticos"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Atraso de ataque"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Atraso de movimento"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Atraso de alcance"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Dano por seg."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 694b5fedd..e08beedf5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"manaplus/language/pt_BR/)\n"
@@ -32,7 +32,7 @@ msgstr "Ignorando propostas de negócios"
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Mapa visivel "
@@ -58,54 +58,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Fechar"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Fazendo login"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Requerindo personagens"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -114,50 +114,50 @@ msgstr "Mudando de servidor do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Adeus, volte sempre..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, 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:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, 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."
@@ -403,22 +403,22 @@ msgstr "Resetar"
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Mover"
@@ -427,8 +427,8 @@ msgid "Result"
msgstr "Resultado"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Comprar"
@@ -446,7 +446,7 @@ msgstr "Quantidade:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -454,7 +454,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -466,8 +466,8 @@ msgid "Quit"
msgstr "Sair"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Máximo"
@@ -477,8 +477,8 @@ msgstr "Máximo"
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Vender"
@@ -487,21 +487,22 @@ msgstr "Vender"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Cancelar"
@@ -776,7 +777,7 @@ msgstr "Chat"
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -789,9 +790,9 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Ignora"
@@ -1015,8 +1016,8 @@ msgid "Equipment"
msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Desequipar"
@@ -1050,47 +1051,47 @@ msgid "Inventory"
msgstr "Inventário"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Dividir"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Roupas"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Descartar"
@@ -1326,18 +1327,18 @@ msgstr "Barra de Status"
msgid "job bar"
msgstr "Barra de Job"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Nível: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Precisa"
@@ -1358,7 +1359,7 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Limpar"
@@ -1393,346 +1394,350 @@ msgstr "Roupas em modo ausente"
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Negócios"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Sussurro"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Cura"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Expulsar da guilda"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Mudar pos na Guilda"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "Convidar pra Guilda"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Desaparecer"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Add comentário"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Remover da lista de ataque"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Adicionar na prioridade da lista de ataques"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Jogadores"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Expulsar do grupo"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Remover"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Mover câmera "
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "Limpar conjunto de roupas"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Editar feitiços"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Não retire o nome"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Remover o nome"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Habilitar modo indisponível"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Desabilitar modo indisponível"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Copiar para a área de transferência"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
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:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Nome: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Adicionar todos para troca-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr "Armazenar todos-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr "Recuperar todos-1"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr "Queda nítida de janela"
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "Zerar barra amarela"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Copiar para chat"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Mover para cima"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Mover para baixo"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Despir"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "Ser amigo(a)"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Ser inimigo(a)"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Definir como inimigo"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "vender (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Mostrar itens"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Remover da lista de pegar"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Adicionar a lista de captura"
@@ -2431,7 +2436,7 @@ msgid "Music volume"
msgstr "Volume da Música"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2710,31 +2715,35 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Aperte o botão para começar a calibrar"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Calibrar"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Habilitar joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "Usar joystick se a janela do jogo estiver inativa"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Parar"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "Girar o bastão e não pressionar os botões"
@@ -3933,39 +3942,39 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Dinheiro: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Pontos do personagem: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Pontos de correção: %d"
@@ -4448,7 +4457,7 @@ msgstr "/kick > Expulsa alguém da guilda em que você está"
msgid "Eq."
msgstr "Eq."
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Abrir URL"
@@ -5925,54 +5934,54 @@ msgstr "Vitalidade"
msgid "Intelligence"
msgstr "Inteligência"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Destreza"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Sorte"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Defesa"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "Atq. Mágico"
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "Def. Mágica"
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% Exatidão"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% Evasão"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% Críticos"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Atraso de ataque"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Atraso de movimento"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Atraso de alcance"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Dano por seg."
diff --git a/po/ru.po b/po/ru.po
index 36c1d99fd..8240e6335 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:41+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 12:33+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
@@ -31,7 +31,7 @@ msgstr "Игнорировать Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾ торговле"
msgid "Accepting incoming trade requests"
msgstr "Принимать Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾ торговле"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "Видимые на карте"
@@ -57,54 +57,54 @@ msgstr "О"
msgid "I"
msgstr "Б"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "ÐаÑтройка"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "ПроизводительноÑÑ‚ÑŒ"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Видео"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "Темы"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Закрыть"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Идет подключение к Ñерверу..."
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "ÐвторизациÑ"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Получение ÑпиÑка перÑонажей"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Подключение к игровому Ñерверу"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Смена игрового Ñервера"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -113,50 +113,50 @@ msgstr "Смена игрового Ñервера"
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ñ€ÐµÐ³Ð¸Ñтрационных данных"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð°"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтеÑÑŒ в любое времÑ..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не ÑущеÑтвует, и не может быть Ñоздано! Выход."
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Ðекорректный Ñервер обновлений: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸ Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не ÑущеÑтвует, и не может быть Ñоздан! Выход."
@@ -408,22 +408,22 @@ msgstr "СброÑить"
msgid "Name"
msgstr "ИмÑ"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Ðтака"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Разговор"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Движение"
@@ -432,8 +432,8 @@ msgid "Result"
msgstr "Результат"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Купить"
@@ -451,7 +451,7 @@ msgstr "КоличеÑтво:"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -459,7 +459,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -471,8 +471,8 @@ msgid "Quit"
msgstr "Выход"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "МакÑ"
@@ -482,8 +482,8 @@ msgstr "МакÑ"
msgid "Shop"
msgstr "Магазин"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Продать"
@@ -492,21 +492,22 @@ msgstr "Продать"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Отмена"
@@ -781,7 +782,7 @@ msgstr "Чат"
msgid "Present: %s; %d players are present."
msgstr "ПриÑутÑтвуют: %s; Ð’Ñего %d игроков."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
@@ -794,9 +795,9 @@ msgstr "Да"
msgid "No"
msgstr "Ðет"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Игнорировать"
@@ -1020,8 +1021,8 @@ msgid "Equipment"
msgstr "СнарÑжение"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "СнÑÑ‚ÑŒ"
@@ -1055,47 +1056,47 @@ msgid "Inventory"
msgstr "Инвентарь"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Ðадеть"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "ИÑпользовать"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "БроÑить"
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Разделить"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "ÐарÑды"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "БроÑить"
@@ -1333,18 +1334,18 @@ msgstr "ÑтатуÑ"
msgid "job bar"
msgstr "работа"
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Уровень: %d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Уровень: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Ðужно"
@@ -1365,7 +1366,7 @@ msgstr "Применить"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "ОчиÑтить"
@@ -1400,346 +1401,350 @@ msgstr "нарÑд отÑутÑтвиÑ"
msgid "Key: %s"
msgstr "Клавиша: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Торговать"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "Приват"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "Лечить"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "Выкинуть из гильдии"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr "Сменить позицию в гильдии"
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr "ПриглаÑить в гильдию"
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "Кикнуть игрока"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr "Уничтожить"
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "Добавить коментарий"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr "Кикнуть"
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr "Удалить из ÑпиÑка атаки"
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "Добавить в приоритетный ÑпиÑок"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "Добавить в ÑпиÑок атаки"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr "Добавить в ÑпиÑок игнорированиÑ"
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr "Добавить Ð¸Ð¼Ñ Ð² чат"
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Игроки"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Выкинуть из группы"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "ПоднÑÑ‚ÑŒ"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Добавить в чат"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Элмент карты"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "Переименовать"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr "Удалить"
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr "Прыгнуть"
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr "Передвинуть камеру"
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr "ОчиÑтить нарÑд"
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "ЗаклинаниÑ"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr "Изменить заклинание"
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Отключить уведомление"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Включить уведомление"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr "Ðе Ñкрывать имÑ"
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "Скрывать имÑ"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "Рарешить режим отошел"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr "Запретить режим отошел"
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "Покинуть"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr "Копировать в буфер обмена"
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "ПриглаÑить в группу"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Переименовать знак на карте"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "ИмÑ: "
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "Комментарий "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "Комментарий: "
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Добавить к Ñделке"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "Добавить к Ñделке 10"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Добавить к Ñделке половину"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Добавить к торговле вÑе-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Добавить к торговле вÑе"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr "Сохранить вÑе-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Сохранить вÑе"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "БроÑить вÑе"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr "Забрать вÑе-1"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Получить вÑе"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr "ОчиÑтить окно дропов"
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "СпрÑтать"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr "ÑброÑить наÑтройки"
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr "Скопировать в чат"
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(по умолчанию)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr "Передвинуть ниже"
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr "Раздеть"
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr "Копировать"
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr "Ð’Ñтавить"
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr "Открыть ÑÑылку"
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "ПодружитьÑÑ"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr "Пренебречь"
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr "Черный ÑпиÑок"
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr "Сделать врагом"
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr "Стереть"
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr "Ðе игнорировать"
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "@@ignore|ПолноÑтью игнорировать@@"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "Следовать"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr "Имитировать"
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "Купить (?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "Продать (?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "Показать предметы"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr "Удалить из поднÑтиÑ"
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr "Сделать поднимаемым"
@@ -2438,7 +2443,7 @@ msgid "Music volume"
msgstr "ГромкоÑÑ‚ÑŒ музыки"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr "Включить плавный переход музыки"
#: src/gui/setup_audio.cpp:89
@@ -2717,31 +2722,35 @@ msgstr ""
"Конфликт клавиш \"%s\" и \"%s\".ИÑправьте их, или игра может ÑÐµÐ±Ñ Ñтранно "
"веÑти."
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Ðажмите кнопку, чтобы начать калибровку"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Калибровать"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr "Определение джойÑтика"
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "ИÑпользовать джойÑтик"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr "ИÑпользовать джойÑтик еÑли игра Ñвернута"
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "ДжойÑтик"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Стоп"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr "Вращайте Ñтик и не нажимайте другие кнопки"
@@ -3946,39 +3955,39 @@ msgstr "Выберите Ð¸Ð¼Ñ Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ¹ группы."
msgid "Specials"
msgstr "ОÑобые"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Деньги: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "ОЖ:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "Мана:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "ПрофеÑÑиÑ: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "ПрофеÑÑиÑ:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "Очки перÑонажа: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr "Очков навыков: %d"
@@ -4462,7 +4471,7 @@ msgstr "/kick > Вышвырнуть кого-либо из Вашей текуÑ
msgid "Eq."
msgstr "Од."
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr "Открыть ÑÑылку"
@@ -5934,54 +5943,54 @@ msgstr "ЖивучеÑÑ‚ÑŒ (vit)"
msgid "Intelligence"
msgstr "Интеллект (int)"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "ЛовкоÑÑ‚ÑŒ (dex)"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Удача (luk)"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "Защита"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr "Маг. Ðтака"
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr "Маг.Защита"
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "% ТочноÑти"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "% УклонениÑ"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "% КритичеÑкий удар"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "Задержка атаки"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "Задержка движениÑ"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "Зона атаки"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "Урон в Ñек."
diff --git a/po/sk.po b/po/sk.po
index 0ca6de7f6..33f55744d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Nastavenie"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Zatvoriť"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "Chyba"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -399,22 +399,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -423,8 +423,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Kúpiť"
@@ -442,7 +442,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -450,7 +450,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -462,8 +462,8 @@ msgid "Quit"
msgstr "UkonÄiÅ¥"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -473,8 +473,8 @@ msgstr ""
msgid "Shop"
msgstr "Obchod"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Predaj"
@@ -483,21 +483,22 @@ msgstr "Predaj"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Zrušiť"
@@ -772,7 +773,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Nápoveda pre %s: %s"
@@ -785,9 +786,9 @@ msgstr "Ãno"
msgid "No"
msgstr "Nie"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1011,8 +1012,8 @@ msgid "Equipment"
msgstr "Vybavenie"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Odstrojiť"
@@ -1046,47 +1047,47 @@ msgid "Inventory"
msgstr "Inventár"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Vystrojiť"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Použiť"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Zahodiť"
@@ -1324,18 +1325,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1356,7 +1357,7 @@ msgstr ""
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1391,346 +1392,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2429,7 +2434,7 @@ msgid "Music volume"
msgstr "Hudobný zvuk"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2706,31 +2711,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3923,39 +3932,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4437,7 +4446,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5892,54 +5901,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 80d40f486..9a9254dc3 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -468,8 +468,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -478,21 +478,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -767,7 +768,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 51aa83404..dbd8f25ab 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Ignorerar handelserbjudanden"
msgid "Accepting incoming trade requests"
msgstr "Accepterar handelserbjudanden"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Inställningar"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Stäng"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "Fel"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Kunde inte skapa katalog för uppdateringar!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr "Återställ"
msgid "Name"
msgstr "Namn"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Attackera"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "Prata"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Köp"
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "Avsluta"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "Max"
@@ -468,8 +468,8 @@ msgstr "Max"
msgid "Shop"
msgstr "Affär"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Sälj"
@@ -478,21 +478,22 @@ msgstr "Sälj"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Avbryt"
@@ -767,7 +768,7 @@ msgstr "Chatt"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
@@ -780,9 +781,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr "Utrustning"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Avrusta"
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr "Inventarium"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Utrusta"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Använd"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Dela"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Lagra"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Hämta"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Släpp"
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Nivå: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr "Vidare"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Byteshandla"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Spelare"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr "Musikvolym"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Klicka på knappen för att starta kalibreringen"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibrera"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Aktivera joystick"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Stopp"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "Pengar: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "EP:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "Jobb: %d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Jobb:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr "Hälsa"
msgid "Intelligence"
msgstr "Intelligens"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Skicklighet"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Tur"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 996c93207..c1d9d7f1b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -51,54 +51,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -107,50 +107,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -393,22 +393,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -417,8 +417,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -436,7 +436,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -444,7 +444,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -456,8 +456,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -467,8 +467,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -477,21 +477,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -766,7 +767,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -779,9 +780,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1005,8 +1006,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1040,47 +1041,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1316,18 +1317,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1348,7 +1349,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1383,346 +1384,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2421,7 +2426,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2698,31 +2703,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3915,39 +3924,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4429,7 +4438,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5883,54 +5892,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/te.po b/po/te.po
index b0eb2c4dd..bafefade6 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "పొరపాటà±"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -394,22 +394,22 @@ msgstr ""
msgid "Name"
msgstr "పేరà±"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -418,8 +418,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "à°—à°°à°¿à°·à±à° "
@@ -468,8 +468,8 @@ msgstr "à°—à°°à°¿à°·à±à° "
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -478,21 +478,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
@@ -767,7 +768,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -780,9 +781,9 @@ msgstr "à°…à°µà±à°¨à±"
msgid "No"
msgstr "కాదà±"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1006,8 +1007,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1041,47 +1042,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1317,18 +1318,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "à°¸à±à°¥à°¾à°¯à°¿: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1384,346 +1385,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "ఆటగాళà±à°³à±"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2422,7 +2427,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2699,31 +2704,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3916,39 +3925,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4430,7 +4439,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5884,54 +5893,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/th.po b/po/th.po
index b9340be73..de6907ffe 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "ตั้งค่า"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "ผิดพลาด"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -389,22 +389,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -413,8 +413,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "ซื้อ"
@@ -432,7 +432,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -440,7 +440,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -452,8 +452,8 @@ msgid "Quit"
msgstr "ออà¸"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -463,8 +463,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -473,21 +473,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "ยà¸à¹€à¸¥à¸´à¸"
@@ -762,7 +763,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -775,9 +776,9 @@ msgstr "ใช่"
msgid "No"
msgstr "ไม่"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1001,8 +1002,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1036,47 +1037,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "ใช้"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "ทิ้ง"
@@ -1310,18 +1311,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "เลเวล: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1342,7 +1343,7 @@ msgstr ""
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1377,346 +1378,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2415,7 +2420,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2692,31 +2697,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3909,39 +3918,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4423,7 +4432,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5876,54 +5885,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 4158e2918..9bbe9af86 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Gelen takas istekleri görmezden geliniyor."
msgid "Accepting incoming trade requests"
msgstr "Gelen takas istekleri kabul ediliyor"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -53,54 +53,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "Kur"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "Video"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "Kapat"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "Sunucuya bağlanılıyor"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "Hesaba bağlanılıyor"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "Oyuna giriş yapılıyor"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "Karakterler alınıyor"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "Oyun sunucusuna bağlanılıyor"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "Oyun sunucusu deÄŸiÅŸtiriliyor"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -109,50 +109,50 @@ msgstr "Oyun sunucusu deÄŸiÅŸtiriliyor"
msgid "Error"
msgstr "Hata"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "İstenen kayıt detayları"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "Åžifre deÄŸiÅŸtirme"
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "Şifreniz başarı ile değiştirildi!"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "E-posta adresi deÄŸiÅŸtirme"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "E-posta adresi başarı ile değiştirildi!"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "Hesap kapatma başarılı"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "Hoşçakal, tekrar bekleriz..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "Sunucu güncellenemedi: %s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "Hata! Güncelleme klasörü oluşturulamadı!"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
@@ -390,22 +390,22 @@ msgstr "Sıfırla"
msgid "Name"
msgstr "Ä°sim"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "Saldırı"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "KonuÅŸ"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "Taşı"
@@ -414,8 +414,8 @@ msgid "Result"
msgstr "Sonuç"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "Satın al"
@@ -433,7 +433,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -441,7 +441,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -453,8 +453,8 @@ msgid "Quit"
msgstr "Çıkış"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "En Fazla"
@@ -464,8 +464,8 @@ msgstr "En Fazla"
msgid "Shop"
msgstr "MaÄŸaza"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "Satış"
@@ -474,21 +474,22 @@ msgstr "Satış"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "Ä°ptal"
@@ -763,7 +764,7 @@ msgstr "Sohbet"
msgid "Present: %s; %d players are present."
msgstr "Mevcut: %s; %d oyuncu mevcut."
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "%s 'e fısıldanıyor: %s"
@@ -776,9 +777,9 @@ msgstr "Evet"
msgid "No"
msgstr "Hayır"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "Görmezden gel"
@@ -1002,8 +1003,8 @@ msgid "Equipment"
msgstr "Ekipman"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "Çıkar"
@@ -1037,47 +1038,47 @@ msgid "Inventory"
msgstr "Envanter"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "Donatmak"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "Kullan"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "Bırak..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "Bölme"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "Kıyafetler"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "Depo"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "Almak"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "Bırak"
@@ -1311,18 +1312,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "Seviye: %d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "Gereklilik"
@@ -1343,7 +1344,7 @@ msgstr "Onayla"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "Temizle"
@@ -1378,346 +1379,350 @@ msgstr "Uzak elbisesi"
msgid "Key: %s"
msgstr "TuÅŸ: %s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "Takas"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "Oyuncular"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "Gruptan at"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "Sohbete ekle"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "Harita nesnesi"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "Büyüler"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "Vurgulamayı kapat"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "Vurgulamayı aç"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr "Gruba davet et"
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "Lonca pozisyonunu deÄŸiÅŸtir"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "Harita işaretini tekrar adlandır"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "Ä°sim:"
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr "Takasa ekle"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr "10 tanesini takasa ekle"
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr "Yarısını takasa ekle"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr "Tamamını takasa ekle-1"
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr "Tamamını takasa ekle"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "Depola 10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "Yarısını depola"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr "Tamamını depola-1"
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "Tamamını depola"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "Geri al 10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "Yarısını geri al"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "Tamamını geri al"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2416,7 +2421,7 @@ msgid "Music volume"
msgstr "Müzik ses seviyesi"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2693,31 +2698,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "Kalibrasyona başlamak için butona tıkla"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "Kalibre et"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "Oyun çubuğunu etkinleştir"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "Oyun çubuğu"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "Dur"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3910,39 +3919,39 @@ msgstr "Grubunun adını seç."
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "Ä°ÅŸ:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4424,7 +4433,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5877,54 +5886,54 @@ msgstr "Sağlık"
msgid "Intelligence"
msgstr "Zeka"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "Kabiliyet"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "Åžans"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/vls.po b/po/vls.po
index a24a2cff7..5c92fdeef 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -51,54 +51,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr ""
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr ""
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr ""
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -107,50 +107,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -393,22 +393,22 @@ msgstr ""
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -417,8 +417,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr ""
@@ -436,7 +436,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -444,7 +444,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -456,8 +456,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -467,8 +467,8 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr ""
@@ -477,21 +477,22 @@ msgstr ""
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr ""
@@ -766,7 +767,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -779,9 +780,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1005,8 +1006,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr ""
@@ -1040,47 +1041,47 @@ msgid "Inventory"
msgstr ""
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr ""
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr ""
@@ -1316,18 +1317,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1348,7 +1349,7 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1383,346 +1384,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr ""
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2421,7 +2426,7 @@ msgid "Music volume"
msgstr ""
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2698,31 +2703,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr ""
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr ""
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr ""
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr ""
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3915,39 +3924,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4429,7 +4438,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5883,54 +5892,54 @@ msgstr ""
msgid "Intelligence"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8c61a1026..b401b9ae9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
"language/zh_CN/)\n"
@@ -30,7 +30,7 @@ msgstr "忽略新进的交易请求"
msgid "Accepting incoming trade requests"
msgstr "接å—传入的交易请求"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr "在地图上å¯è§"
@@ -56,54 +56,54 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "设置"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "性能"
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "视频"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr "主题"
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "关闭"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr "正在连接æœåŠ¡å™¨"
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr "登录中"
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr "进入游æˆä¸–ç•Œ"
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr "请求角色"
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr "正在连接游æˆæœåŠ¡å™¨"
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr "正在更改游æˆæœåŠ¡å™¨"
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -112,50 +112,50 @@ msgstr "正在更改游æˆæœåŠ¡å™¨"
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr "正在请求详细注册信æ¯"
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr "更改密ç "
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr "密ç æ›´æ”¹æˆåŠŸï¼"
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr "更改电å­é‚®ç®±åœ°å€"
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr "电å­é‚®ç®±åœ°å€æ›´æ”¹æˆåŠŸï¼"
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr "å–消注册æˆåŠŸ"
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr "å†è§ï¼Œæ¬¢è¿Žéšæ—¶å›žæ¥... ..."
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ä¸å­˜åœ¨ï¼Œä¸”无法创建ï¼æ­£åœ¨é€€å‡ºã€‚"
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr "主机更新无效:%s"
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "创建更新目录错误ï¼"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s ä¸å­˜åœ¨ä¸”无法创建ï¼æ­£åœ¨é€€å‡ºã€‚"
@@ -393,22 +393,22 @@ msgstr "é‡ç½®"
msgid "Name"
msgstr "姓å"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "攻击"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "说è¯"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr "移动"
@@ -417,8 +417,8 @@ msgid "Result"
msgstr "结果"
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "è´­ä¹°"
@@ -436,7 +436,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "+"
@@ -444,7 +444,7 @@ msgstr "+"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "-"
@@ -456,8 +456,8 @@ msgid "Quit"
msgstr "退出"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "最大"
@@ -467,8 +467,8 @@ msgstr "最大"
msgid "Shop"
msgstr "商店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "出售"
@@ -477,21 +477,22 @@ msgstr "出售"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "å–消"
@@ -766,7 +767,7 @@ msgstr "èŠå¤©"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
@@ -779,9 +780,9 @@ msgstr "是"
msgid "No"
msgstr "å¦"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr "忽略"
@@ -1005,8 +1006,8 @@ msgid "Equipment"
msgstr "装备"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "å¸ä¸‹è£…备"
@@ -1040,47 +1041,47 @@ msgid "Inventory"
msgstr "物å“æ "
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "装备"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr "掉è½... ..."
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "分离"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr "套装"
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "å–回"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "丢弃"
@@ -1314,18 +1315,18 @@ msgstr "状æ€æ "
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr "级别:%d (GM %d)"
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "等级:%d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr "需è¦"
@@ -1346,7 +1347,7 @@ msgstr "æ交"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr "清除"
@@ -1381,346 +1382,350 @@ msgstr ""
msgid "Key: %s"
msgstr "按键:%s"
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "交易"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr "密语"
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr "愈åˆ"
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr "踢从公会"
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr "踢çƒå‘˜"
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr "å‘表评论"
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr "优先攻击列表"
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr "加入攻击清å•"
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "玩家"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr "踢从党"
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr "拾å–"
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr "加入èŠå¤©"
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr "地图项"
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr "é‡å‘½å"
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr "法术"
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr "ç¦ç”¨"
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr "å¯ç”¨çªå‡º"
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr "移除姓å"
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr "å¯ç”¨è¿œ"
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr "留下"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr "é‡å‘½å的地图标志"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr "å称:"
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr "商店的一åŠ"
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr "拿出一åŠ"
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr "éšè—"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr "是朋å‹"
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr "完全忽略"
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr "按照"
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr "è´­ä¹°(?)"
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr "出售(?)"
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr "显示项目"
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2419,7 +2424,7 @@ msgid "Music volume"
msgstr "音ä¹å£°é‡"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2696,31 +2701,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "按下开始校准按钮"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "校准"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "å¯ç”¨æ¸¸æˆæ†"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "游æˆæ†"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "åœæ­¢"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3913,39 +3922,39 @@ msgstr "选择nçš„å称。"
msgid "Specials"
msgstr "特价商å“"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "金å¸: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "ç»éªŒï¼š"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "èŒä¸šï¼š%d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "èŒä¸šï¼š"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr "角色å¯ç”¨ç‚¹: %d"
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4426,7 +4435,7 @@ msgstr "/kick >"
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5885,54 +5894,54 @@ msgstr "生命"
msgid "Intelligence"
msgstr "智慧"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "æ•æ·"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "幸è¿"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr "防御"
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr "%精度"
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr "ï¼…é—ªé¿"
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr "ï¼…"
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr "攻击延迟"
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr "步行延迟"
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr "攻击范围"
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr "æ¯ç§’伤害"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3d5e0e86e..6b2f2737c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "顯示"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "關閉"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "錯誤"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -389,22 +389,22 @@ msgstr ""
msgid "Name"
msgstr "åå­—"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -413,8 +413,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "購買"
@@ -432,7 +432,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr ""
@@ -440,7 +440,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr ""
@@ -452,8 +452,8 @@ msgid "Quit"
msgstr "離開"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr ""
@@ -463,8 +463,8 @@ msgstr ""
msgid "Shop"
msgstr "商店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "出售"
@@ -473,21 +473,22 @@ msgstr "出售"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "å–消"
@@ -762,7 +763,7 @@ msgstr ""
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "å°%sç«Šç«Šç§èªžï¼š%s"
@@ -775,9 +776,9 @@ msgstr "是"
msgid "No"
msgstr "å¦"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1001,8 +1002,8 @@ msgid "Equipment"
msgstr "è£å‚™"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "å¸ä¸‹è£å‚™"
@@ -1036,47 +1037,47 @@ msgid "Inventory"
msgstr "物å“æ””"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "è£å‚™"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "分開"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "丟棄"
@@ -1310,18 +1311,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "等級:%d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1342,7 +1343,7 @@ msgstr ""
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1377,346 +1378,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "交易"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "玩家"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2415,7 +2420,7 @@ msgid "Music volume"
msgstr "音樂音é‡"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2692,31 +2697,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "按下按鈕開始矯正"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "矯正"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "啟用æ–æ¡¿"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "æ–æ¡¿"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "åœæ­¢"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3909,39 +3918,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "è·æ¥­ï¼š%d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4423,7 +4432,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5876,54 +5885,54 @@ msgstr "體力"
msgid "Intelligence"
msgstr "智力"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "閃躲"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "幸é‹"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b139a23fe..1a9ed82b1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-01-03 22:14+0300\n"
-"PO-Revision-Date: 2013-01-03 20:35+0000\n"
+"POT-Creation-Date: 2013-01-18 14:19+0300\n"
+"PO-Revision-Date: 2013-01-18 11:25+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "忽略收到的交易è¦æ±‚"
msgid "Accepting incoming trade requests"
msgstr "接å—收到的交易è¦æ±‚"
-#: src/actorspritemanager.cpp:1286
+#: src/actorspritemanager.cpp:1275
msgid "Visible on map"
msgstr ""
@@ -52,54 +52,54 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:1104 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
+#: src/client.cpp:1115 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:173
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:1107 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1118 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:1109 src/gui/setup_video.cpp:243
+#: src/client.cpp:1120 src/gui/setup_video.cpp:243
msgid "Video"
msgstr "顯示"
-#: src/client.cpp:1111
+#: src/client.cpp:1122
msgid "Themes"
msgstr ""
-#: src/client.cpp:1114 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1125 src/gui/didyouknowwindow.cpp:71
#: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:504
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:506
#: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
msgid "Close"
msgstr "關閉"
-#: src/client.cpp:1204
+#: src/client.cpp:1215
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1246
+#: src/client.cpp:1257
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1284
+#: src/client.cpp:1295
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1397
+#: src/client.cpp:1408
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1435
+#: src/client.cpp:1446
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1447
+#: src/client.cpp:1458
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1503 src/client.cpp:1513 src/client.cpp:1672
+#: src/client.cpp:1514 src/client.cpp:1524 src/client.cpp:1683
#: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
#: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -108,50 +108,50 @@ msgstr ""
msgid "Error"
msgstr "錯誤"
-#: src/client.cpp:1525
+#: src/client.cpp:1536
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1561
+#: src/client.cpp:1572
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1562
+#: src/client.cpp:1573
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1582
+#: src/client.cpp:1593
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1583
+#: src/client.cpp:1594
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1603
+#: src/client.cpp:1614
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1604
+#: src/client.cpp:1615
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1851 src/client.cpp:1865 src/client.cpp:1901
-#: src/client.cpp:1916 src/client.cpp:2376 src/client.cpp:2383
+#: src/client.cpp:1862 src/client.cpp:1876 src/client.cpp:1912
+#: src/client.cpp:1927 src/client.cpp:2387 src/client.cpp:2394
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:2065
+#: src/client.cpp:2076
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:2104 src/client.cpp:2110
+#: src/client.cpp:2115 src/client.cpp:2121
msgid "Error creating updates directory!"
msgstr "建立更新目錄失敗ï¼"
-#: src/client.cpp:2131 src/client.cpp:2143
+#: src/client.cpp:2142 src/client.cpp:2154
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -389,22 +389,22 @@ msgstr "é‡è¨­"
msgid "Name"
msgstr "åå­—"
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:135
-#: src/gui/popupmenu.cpp:215 src/gui/popupmenu.cpp:546
-#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:265
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:548
+#: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack"
msgstr "攻擊"
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:204
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:206
#: src/gui/setupactiondata.h:86
msgid "Talk"
msgstr "說話"
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:195
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:557
-#: src/gui/popupmenu.cpp:624 src/gui/setupactiondata.h:1560
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:197
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:626 src/gui/setupactiondata.h:1560
msgid "Move"
msgstr ""
@@ -413,8 +413,8 @@ msgid "Result"
msgstr ""
#: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
-#: src/gui/popupmenu.cpp:2174
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:207
+#: src/gui/popupmenu.cpp:2201
msgid "Buy"
msgstr "購買"
@@ -432,7 +432,7 @@ msgstr ""
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:105 src/gui/itemamountwindow.cpp:209
#: src/gui/itemamountwindow.cpp:239 src/gui/npcdialog.cpp:78
-#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:806
+#: src/gui/selldialog.cpp:95 src/gui/statuswindow.cpp:821
msgid "+"
msgstr "增加"
@@ -440,7 +440,7 @@ msgstr "增加"
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:208
#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:79
-#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:818
+#: src/gui/selldialog.cpp:96 src/gui/statuswindow.cpp:833
msgid "-"
msgstr "減少"
@@ -452,8 +452,8 @@ msgid "Quit"
msgstr "離開"
#: src/gui/buydialog.cpp:111 src/gui/selldialog.cpp:99
-#: src/gui/statuswindow.cpp:542 src/gui/statuswindow.cpp:599
-#: src/gui/statuswindow.cpp:804 src/gui/statuswindow.cpp:832
+#: src/gui/statuswindow.cpp:550 src/gui/statuswindow.cpp:607
+#: src/gui/statuswindow.cpp:819 src/gui/statuswindow.cpp:847
msgid "Max"
msgstr "最大"
@@ -463,8 +463,8 @@ msgstr "最大"
msgid "Shop"
msgstr "商店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:206
-#: src/gui/popupmenu.cpp:2175 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:208
+#: src/gui/popupmenu.cpp:2202 src/gui/selldialog.cpp:51
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
msgid "Sell"
msgstr "出售"
@@ -473,21 +473,22 @@ msgstr "出售"
#: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
#: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:289
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:404
-#: src/gui/popupmenu.cpp:430 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:466 src/gui/popupmenu.cpp:487
-#: src/gui/popupmenu.cpp:632 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1763
-#: src/gui/popupmenu.cpp:1827 src/gui/popupmenu.cpp:1883
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1961
-#: src/gui/popupmenu.cpp:2014 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2077
-#: src/gui/popupmenu.cpp:2245 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1508
-#: src/gui/setup.cpp:76 src/gui/socialwindow.cpp:1191
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:291
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:634 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1930 src/gui/popupmenu.cpp:1971
+#: src/gui/popupmenu.cpp:2024 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2087
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2272
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1508 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1191 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
msgid "Cancel"
msgstr "å–消"
@@ -762,7 +763,7 @@ msgstr "èŠå¤©"
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1118
+#: src/gui/chatwindow.cpp:1121
#, c-format
msgid "Whispering to %s: %s"
msgstr "å°%sç«Šç«Šç§èªžï¼š%s"
@@ -775,9 +776,9 @@ msgstr "是"
msgid "No"
msgstr "å¦"
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2107
-#: src/gui/popupmenu.cpp:2115 src/gui/popupmenu.cpp:2124
-#: src/gui/popupmenu.cpp:2143
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2134
+#: src/gui/popupmenu.cpp:2142 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2170
msgid "Ignore"
msgstr ""
@@ -1001,8 +1002,8 @@ msgid "Equipment"
msgstr "è£å‚™"
#: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1690
-#: src/gui/popupmenu.cpp:1792 src/gui/popupmenu.cpp:1848
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1858
msgid "Unequip"
msgstr "å¸ä¸‹è£å‚™"
@@ -1036,47 +1037,47 @@ msgid "Inventory"
msgstr "物å“æ””"
#: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1692
-#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1702
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
msgid "Equip"
msgstr "è£å‚™"
#: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1854
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
#: src/gui/skilldialog.cpp:267
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1701 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1711 src/gui/popupmenu.cpp:1813
+#: src/gui/popupmenu.cpp:1869
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1868
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1720
+#: src/gui/popupmenu.cpp:1822 src/gui/popupmenu.cpp:1878
msgid "Split"
msgstr "分開"
#: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:462 src/gui/setupactiondata.h:1564
+#: src/gui/popupmenu.cpp:464 src/gui/setupactiondata.h:1564
#: src/gui/windowmenu.cpp:162
msgid "Outfits"
msgstr ""
#: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1815
-#: src/gui/popupmenu.cpp:1871 src/gui/setup.cpp:77
+#: src/gui/popupmenu.cpp:1685 src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1881 src/gui/setup.cpp:77
msgid "Store"
msgstr "寄放"
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1717
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1727
msgid "Retrieve"
msgstr "å–回"
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1706
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1864
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1874
#: src/gui/windowmenu.cpp:152
msgid "Drop"
msgstr "丟棄"
@@ -1310,18 +1311,18 @@ msgstr ""
msgid "job bar"
msgstr ""
-#: src/gui/ministatuswindow.cpp:297 src/gui/statuswindow.cpp:281
+#: src/gui/ministatuswindow.cpp:296 src/gui/statuswindow.cpp:288
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/ministatuswindow.cpp:303 src/gui/statuswindow.cpp:133
-#: src/gui/statuswindow.cpp:287 src/gui/statuswindow.cpp:353
+#: src/gui/ministatuswindow.cpp:302 src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:294 src/gui/statuswindow.cpp:360
#, c-format
msgid "Level: %d"
msgstr "等級:%d"
-#: src/gui/ministatuswindow.cpp:319 src/gui/ministatuswindow.cpp:355
+#: src/gui/ministatuswindow.cpp:318 src/gui/ministatuswindow.cpp:354
msgid "Need"
msgstr ""
@@ -1342,7 +1343,7 @@ msgstr "確èª"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:506
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:508
msgid "Clear"
msgstr ""
@@ -1377,346 +1378,350 @@ msgstr ""
msgid "Key: %s"
msgstr ""
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:547
#: src/gui/widgets/tradetab.cpp:39
msgid "Trade"
msgstr "交易"
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:311
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:552
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:597
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:606
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:192
+#: src/gui/popupmenu.cpp:194
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:196
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:209 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:2215
+#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:318
+#: src/gui/popupmenu.cpp:2242
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:222
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:233
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:240 src/gui/popupmenu.cpp:2230
+#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:2257
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:363
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:365
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:267 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:269 src/gui/setup_players.cpp:47
msgid "Players"
msgstr "玩家"
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:2205
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:2232
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:392 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:401
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:1733
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1872
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1826 src/gui/popupmenu.cpp:1882
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:445
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:423
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:2012
-#: src/gui/popupmenu.cpp:2036
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:2022
+#: src/gui/popupmenu.cpp:2046
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:450
msgid "Move camera"
msgstr ""
-#: src/gui/popupmenu.cpp:463
+#: src/gui/popupmenu.cpp:465
msgid "Clear outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:483 src/gui/windowmenu.cpp:149
+#: src/gui/popupmenu.cpp:485 src/gui/windowmenu.cpp:149
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:486
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:512
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:514
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:516
msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:518
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:520
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:520
+#: src/gui/popupmenu.cpp:522
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:525 src/gui/socialwindow.cpp:1253
+#: src/gui/popupmenu.cpp:527 src/gui/socialwindow.cpp:1253
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:530 src/gui/popupmenu.cpp:2102
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2203
+#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2230
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:642
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1160
+#: src/gui/popupmenu.cpp:1162
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1162
+#: src/gui/popupmenu.cpp:1164
msgid "Name: "
msgstr ""
-#: src/gui/popupmenu.cpp:1185
+#: src/gui/popupmenu.cpp:1187
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1187
+#: src/gui/popupmenu.cpp:1189
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1672
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1676
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1667
+#: src/gui/popupmenu.cpp:1677
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1678
msgid "Add to trade all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1679
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1689
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1690
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1681
+#: src/gui/popupmenu.cpp:1691
msgid "Store all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1682
+#: src/gui/popupmenu.cpp:1692
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1860
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1870
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1721
+#: src/gui/popupmenu.cpp:1731
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1723
+#: src/gui/popupmenu.cpp:1733
msgid "Retrieve all-1"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1734
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1881
+#: src/gui/popupmenu.cpp:1891
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1909 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:1919 src/gui/popupmenu.cpp:1956
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1952
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1962
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1958
+#: src/gui/popupmenu.cpp:1968
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1960 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1970 src/gui/statuswindow.cpp:157
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2032
+#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2042
#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:127
#: src/gui/socialwindow.cpp:925
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1990 src/gui/popupmenu.cpp:2001
+#: src/gui/popupmenu.cpp:2000 src/gui/popupmenu.cpp:2011
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1992 src/gui/popupmenu.cpp:2003
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2013
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2058 src/gui/popupmenu.cpp:2214
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2241
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2084
msgid "Copy"
msgstr ""
-#: src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2085
msgid "Paste"
msgstr ""
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2101
+msgid "Open link"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2132
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2114
-#: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2142
-#: src/gui/popupmenu.cpp:2150
+#: src/gui/popupmenu.cpp:2133 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:2150 src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2177
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2108 src/gui/popupmenu.cpp:2116
-#: src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2135 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:2171
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2109 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2125
+#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2144
+#: src/gui/popupmenu.cpp:2152
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2110 src/gui/popupmenu.cpp:2118
-#: src/gui/popupmenu.cpp:2126 src/gui/popupmenu.cpp:2132
#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2145
+#: src/gui/popupmenu.cpp:2153 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:2164 src/gui/popupmenu.cpp:2172
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2122 src/gui/popupmenu.cpp:2130
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2141
-#: src/gui/popupmenu.cpp:2149
+#: src/gui/popupmenu.cpp:2149 src/gui/popupmenu.cpp:2157
+#: src/gui/popupmenu.cpp:2163 src/gui/popupmenu.cpp:2168
+#: src/gui/popupmenu.cpp:2176
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2131 src/gui/popupmenu.cpp:2151
+#: src/gui/popupmenu.cpp:2158 src/gui/popupmenu.cpp:2178
#: src/playerrelations.cpp:473
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:2188
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2162
+#: src/gui/popupmenu.cpp:2189
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2180 src/gui/popupmenu.cpp:2191
+#: src/gui/popupmenu.cpp:2207 src/gui/popupmenu.cpp:2218
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2181 src/gui/popupmenu.cpp:2192
+#: src/gui/popupmenu.cpp:2208 src/gui/popupmenu.cpp:2219
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2213
+#: src/gui/popupmenu.cpp:2240
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2224
+#: src/gui/popupmenu.cpp:2251
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2228
+#: src/gui/popupmenu.cpp:2255
msgid "Add to pickup list"
msgstr ""
@@ -2415,7 +2420,7 @@ msgid "Music volume"
msgstr "音樂音é‡"
#: src/gui/setup_audio.cpp:85
-msgid "Enable music fade out (can be very slow)"
+msgid "Enable music fade out"
msgstr ""
#: src/gui/setup_audio.cpp:89
@@ -2692,31 +2697,35 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:118
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:130
msgid "Press the button to start calibration"
msgstr "按下按鈕開始矯正"
-#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:116
+#: src/gui/setup_joystick.cpp:47 src/gui/setup_joystick.cpp:128
msgid "Calibrate"
msgstr "矯正"
#: src/gui/setup_joystick.cpp:48
+msgid "Detect joysticks"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:49
msgid "Enable joystick"
msgstr "啟用æ–æ¡¿"
-#: src/gui/setup_joystick.cpp:51
+#: src/gui/setup_joystick.cpp:52
msgid "Use joystick if client window inactive"
msgstr ""
-#: src/gui/setup_joystick.cpp:54
+#: src/gui/setup_joystick.cpp:55
msgid "Joystick"
msgstr "æ–æ¡¿"
-#: src/gui/setup_joystick.cpp:123
+#: src/gui/setup_joystick.cpp:135
msgid "Stop"
msgstr "åœæ­¢"
-#: src/gui/setup_joystick.cpp:125
+#: src/gui/setup_joystick.cpp:137
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -3909,39 +3918,39 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:320
+#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:279
+#: src/gui/statuswindow.cpp:327
#, c-format
msgid "Money: %s"
msgstr "金錢: %s"
-#: src/gui/statuswindow.cpp:135
+#: src/gui/statuswindow.cpp:142
msgid "HP:"
msgstr "體力 :"
-#: src/gui/statuswindow.cpp:137
+#: src/gui/statuswindow.cpp:144
msgid "Exp:"
msgstr "經驗值:"
-#: src/gui/statuswindow.cpp:191
+#: src/gui/statuswindow.cpp:198
msgid "MP:"
msgstr "魔力:"
-#: src/gui/statuswindow.cpp:223 src/gui/statuswindow.cpp:407
+#: src/gui/statuswindow.cpp:230 src/gui/statuswindow.cpp:414
#, c-format
msgid "Job: %d"
msgstr "è·æ¥­ï¼š%d"
-#: src/gui/statuswindow.cpp:224
+#: src/gui/statuswindow.cpp:231
msgid "Job:"
msgstr "è·æ¥­:"
-#: src/gui/statuswindow.cpp:275 src/gui/statuswindow.cpp:327
+#: src/gui/statuswindow.cpp:282 src/gui/statuswindow.cpp:334
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:341
+#: src/gui/statuswindow.cpp:348
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -4423,7 +4432,7 @@ msgstr ""
msgid "Eq."
msgstr ""
-#: src/gui/widgets/itemlinkhandler.cpp:99
+#: src/gui/widgets/itemlinkhandler.cpp:105
msgid "Open url"
msgstr ""
@@ -5876,54 +5885,54 @@ msgstr "體力"
msgid "Intelligence"
msgstr "智力"
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:271
+#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
msgid "Dexterity"
msgstr "閃躲"
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:273
msgid "Luck"
msgstr "幸é‹"
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:275
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
msgid "Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
msgid "M.Attack"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:277
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:278
msgid "M.Defense"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:279
+#: src/net/eathena/generalhandler.cpp:271 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:282
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:284
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:286
msgid "Attack Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:288
msgid "Walk Delay"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:290
msgid "Attack Range"
msgstr ""
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:292
msgid "Damage per sec."
msgstr ""
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 337fc4102..d7e0f361c 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -937,7 +937,21 @@ impHandler0(talk)
{
if (player_node)
{
- Being *const target = player_node->getTarget();
+ Being *target = player_node->getTarget();
+ if (!target)
+ {
+ target = actorSpriteManager->findNearestLivingBeing(
+ player_node, 1, ActorSprite::NPC);
+ // ignore closest target if distance in each direction more than 1
+ if (target)
+ {
+ if (abs(target->getTileX() - player_node->getTileX()) > 1
+ || abs(target->getTileY() - player_node->getTileY()) > 1)
+ {
+ return true;
+ }
+ }
+ }
if (target)
{
if (target->canTalk())
diff --git a/src/actionmanager.h b/src/actionmanager.h
index 3db7e4a99..a00c78b43 100644
--- a/src/actionmanager.h
+++ b/src/actionmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/actor.cpp b/src/actor.cpp
index 2e14a68b1..2ff31dd92 100644
--- a/src/actor.cpp
+++ b/src/actor.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/actor.h b/src/actor.h
index 21363b513..392a59dc5 100644
--- a/src/actor.h
+++ b/src/actor.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index f436047e5..e266180ed 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/actorsprite.h b/src/actorsprite.h
index 8521a9c92..b01e2d1a3 100644
--- a/src/actorsprite.h
+++ b/src/actorsprite.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/actorspritelistener.h b/src/actorspritelistener.h
index 7fdb99dc4..535b4254d 100644
--- a/src/actorspritelistener.h
+++ b/src/actorspritelistener.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 4ccb2e347..94ec49f8e 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -273,10 +273,7 @@ void ActorSpriteManager::undelete(const ActorSprite *const actor)
if (!actor || actor == player_node)
return;
- ActorSpritesConstIterator it, it_end;
-
- for (it = mDeleteActors.begin(), it_end = mDeleteActors.end();
- it != it_end; ++it)
+ FOR_EACH (ActorSpritesConstIterator, it, mDeleteActors)
{
if (*it == actor)
{
@@ -760,9 +757,7 @@ void ActorSpriteManager::logic()
}
BLOCK_START("ActorSpriteManager::logic 1")
- for (ActorSpritesConstIterator it = mDeleteActors.begin(),
- it_end = mDeleteActors.end();
- it != it_end; ++it)
+ FOR_EACH (ActorSpritesConstIterator, it, mDeleteActors)
{
if (!*it)
continue;
@@ -785,9 +780,7 @@ void ActorSpriteManager::logic()
viewport->clearHover(*it);
}
- for (ActorSpritesConstIterator it = mDeleteActors.begin(),
- it_end = mDeleteActors.end();
- it != it_end; ++it)
+ FOR_EACH (ActorSpritesConstIterator, it, mDeleteActors)
{
mActors.erase(*it);
delete *it;
@@ -906,9 +899,7 @@ Being *ActorSpriteManager::findNearestLivingBeing(const Being *const
{
std::vector<Being*> sortedBeings;
- for (ActorSprites::const_iterator i = mActors.begin(),
- i_end = mActors.end();
- i != i_end; ++i)
+ FOR_EACH (ActorSprites::const_iterator, i, mActors)
{
if (!*i)
continue;
@@ -1003,9 +994,7 @@ Being *ActorSpriteManager::findNearestLivingBeing(const Being *const
int index = defaultPriorityIndex;
Being *closestBeing = nullptr;
- for (ActorSprites::const_iterator i = mActors.begin(),
- i_end = mActors.end();
- i != i_end; ++i)
+ FOR_EACH (ActorSprites::const_iterator, i, mActors)
{
if (!*i)
continue;
@@ -1294,9 +1283,7 @@ void ActorSpriteManager::printBeingsToChat(ActorSprites beings,
debugChatTab->chatLog("---------------------------------------");
debugChatTab->chatLog(header);
- std::set<ActorSprite*>::const_iterator it;
- const std::set<ActorSprite*>::const_iterator it_end = beings.end();
- for (it = beings.begin(); it != it_end; ++it)
+ FOR_EACH (std::set<ActorSprite*>::const_iterator, it, beings)
{
if (!*it)
continue;
@@ -1323,9 +1310,7 @@ void ActorSpriteManager::printBeingsToChat(std::vector<Being*> beings,
debugChatTab->chatLog("---------------------------------------");
debugChatTab->chatLog(header);
- std::vector<Being*>::const_iterator i;
- const std::vector<Being*>::const_iterator i_end = beings.end();
- for (i = beings.begin(); i != i_end; ++i)
+ FOR_EACH (std::vector<Being*>::const_iterator, i, beings)
{
if (!*i)
continue;
diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h
index 4153b2714..506bda97d 100644
--- a/src/actorspritemanager.h
+++ b/src/actorspritemanager.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 7fc8b2782..35b0a265c 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index d96555ff4..c10e655d1 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/animationdelayload.cpp b/src/animationdelayload.cpp
index 79334d69b..01663cbc6 100644
--- a/src/animationdelayload.cpp
+++ b/src/animationdelayload.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/animationdelayload.h b/src/animationdelayload.h
index 0eea88a6f..0708c1f1b 100644
--- a/src/animationdelayload.h
+++ b/src/animationdelayload.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index 6943cab57..7172f4864 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/animationparticle.h b/src/animationparticle.h
index b1dae7fcb..feb1db3de 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/auctionmanager.cpp b/src/auctionmanager.cpp
index 9b35ff877..348866e19 100644
--- a/src/auctionmanager.cpp
+++ b/src/auctionmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/auctionmanager.h b/src/auctionmanager.h
index 1d716f9c4..d82f1beb0 100644
--- a/src/auctionmanager.h
+++ b/src/auctionmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/avatar.cpp b/src/avatar.cpp
index 32fe5e2a3..4fffcc9fa 100644
--- a/src/avatar.cpp
+++ b/src/avatar.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/avatar.h b/src/avatar.h
index e28a901fb..be72ebb10 100644
--- a/src/avatar.h
+++ b/src/avatar.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/being.cpp b/src/being.cpp
index 5de2d0bab..910feb936 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/being.h b/src/being.h
index 1f2d88412..2441d1418 100644
--- a/src/being.h
+++ b/src/being.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/channel.cpp b/src/channel.cpp
index 4b980ca17..76a0408ec 100644
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/channel.h b/src/channel.h
index 97011f154..1a1a33579 100644
--- a/src/channel.h
+++ b/src/channel.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp
index 4e95e6e3a..31f87010e 100644
--- a/src/channelmanager.cpp
+++ b/src/channelmanager.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/channelmanager.h b/src/channelmanager.h
index 1666834fd..edd4bf07e 100644
--- a/src/channelmanager.h
+++ b/src/channelmanager.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index 61e44a5bb..5c0f83cb2 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/chatlogger.h b/src/chatlogger.h
index 15db2a87f..a502d7ad1 100644
--- a/src/chatlogger.h
+++ b/src/chatlogger.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
* Copyright (C) 2009-2010 Andrei Karas
*
* This file is part of The ManaPlus Client.
diff --git a/src/client.cpp b/src/client.cpp
index a96f50395..e281ddced 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -279,7 +279,10 @@ Client::Client(const Options &options) :
mInputFocused(true),
mMouseFocused(true),
mGuiAlpha(1.0f),
- mNewMessageFlag(false)
+ mNewMessageFlag(false),
+ mSkin(nullptr),
+ mButtonPadding(1),
+ mButtonSpacing(3)
{
mInstance = this;
}
@@ -884,8 +887,8 @@ int Client::testsExec() const
}
#define ADDBUTTON(var, object) var = object; \
- x -= var->getWidth() + 6; \
- var->setPosition(x, 0); \
+ x -= var->getWidth() + mButtonSpacing; \
+ var->setPosition(x, mButtonPadding); \
top->add(var);
@@ -900,6 +903,14 @@ int Client::gameExec()
SDL_Event event;
+ if (Theme::instance())
+ mSkin = Theme::instance()->load("windowmenu.xml", "");
+ if (mSkin)
+ {
+ mButtonPadding = mSkin->getPadding();
+ mButtonSpacing = mSkin->getOption("spacing", 3);
+ }
+
while (mState != STATE_EXIT)
{
PROFILER_START();
@@ -1099,7 +1110,7 @@ int Client::gameExec()
mDesktop = new Desktop(nullptr);
top->add(mDesktop);
- int x = top->getWidth();
+ int x = top->getWidth() - mButtonPadding;
ADDBUTTON(mSetupButton, new Button(mDesktop,
_("Setup"), "Setup", this))
#ifndef WIN32
@@ -2697,20 +2708,20 @@ void Client::resizeVideo(int width, int height, const bool always)
if (mSetupButton)
{
- int x = width - mSetupButton->getWidth() - 3;
- mSetupButton->setPosition(x, 3);
+ int x = width - mSetupButton->getWidth() - mButtonPadding;
+ mSetupButton->setPosition(x, mButtonPadding);
#ifndef WIN32
- x -= mPerfomanceButton->getWidth() + 6;
- mPerfomanceButton->setPosition(x, 3);
+ x -= mPerfomanceButton->getWidth() + mButtonSpacing;
+ mPerfomanceButton->setPosition(x, mButtonPadding);
- x -= mVideoButton->getWidth() + 6;
- mVideoButton->setPosition(x, 3);
+ x -= mVideoButton->getWidth() + mButtonSpacing;
+ mVideoButton->setPosition(x, mButtonPadding);
- x -= mThemesButton->getWidth() + 6;
- mThemesButton->setPosition(x, 3);
+ x -= mThemesButton->getWidth() + mButtonSpacing;
+ mThemesButton->setPosition(x, mButtonPadding);
#ifdef ANDROID
- x -= mCloseButton->getWidth() + 6;
- mCloseButton->setPosition(x, 3);
+ x -= mCloseButton->getWidth() + mButtonSpacing;
+ mCloseButton->setPosition(x, mButtonPadding);
#endif
#endif
}
diff --git a/src/client.h b/src/client.h
index fb33b4d4c..bdf62ae0b 100644
--- a/src/client.h
+++ b/src/client.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -42,6 +42,7 @@ class Button;
class Desktop;
class Game;
class LoginData;
+class Skin;
class Window;
class QuitDialog;
@@ -400,6 +401,9 @@ private:
std::string mCaption;
bool mNewMessageFlag;
FPSmanager mFpsManager;
+ Skin *mSkin;
+ int mButtonPadding;
+ int mButtonSpacing;
};
#endif // CLIENT_H
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 5cf6827ce..3ac01cb5a 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/commandhandler.h b/src/commandhandler.h
index 076c35711..08174ddc6 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/commands.cpp b/src/commands.cpp
index ddc07ad90..46a1e14f4 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -1012,7 +1012,7 @@ impHandler0(dumpEnvironment)
{
logger->log("Start environment variables");
for (char **env = environ; *env; ++ env)
- logger->log(*env);
+ logger->log1(*env);
logger->log("End environment variables");
if (debugChatTab)
debugChatTab->chatLog(_("Environment variables dumped"));
diff --git a/src/commands.h b/src/commands.h
index ce357feed..a83dc0577 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index ab97f9821..837d3830c 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/compoundsprite.h b/src/compoundsprite.h
index 0676ad479..2e3204d18 100644
--- a/src/compoundsprite.h
+++ b/src/compoundsprite.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/configlistener.h b/src/configlistener.h
index 28540c564..ee41fb381 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 07a097de2..cb9235c3f 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/configuration.h b/src/configuration.h
index 8f16c23c0..a24a36d0d 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/debug.h b/src/debug.h
index 64a83e51c..39e5c4434 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 6b10c4f26..fd895fbf7 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -262,7 +262,7 @@ DefaultsData* getConfigDefaults()
AddDEF("autohideChat", false);
AddDEF("downloadProxy", "");
AddDEF("downloadProxyType", 0);
- AddDEF("blur", true);
+ AddDEF("blur", false);
#if defined(WIN32) || defined(__APPLE__)
AddDEF("centerwindow", true);
#endif
@@ -296,7 +296,7 @@ DefaultsData* getConfigDefaults()
AddDEF("highlightWords", "");
AddDEF("selfMouseHeal", true);
AddDEF("serverslistupdate", "");
- AddDEF("fadeoutmusic", false);
+ AddDEF("fadeoutmusic", true);
AddDEF("screenActionKeyboard", Input::KEY_SHOW_KEYBOARD);
AddDEF("screenActionButton0", Input::KEY_STOP_SIT);
AddDEF("screenActionButton1", Input::KEY_TARGET_ATTACK);
diff --git a/src/defaults.h b/src/defaults.h
index 6edf3a404..0851dc6a6 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/depricatedevent.cpp b/src/depricatedevent.cpp
index 81c1e1c14..ad744839c 100644
--- a/src/depricatedevent.cpp
+++ b/src/depricatedevent.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/depricatedevent.h b/src/depricatedevent.h
index baaecc70b..285d9f240 100644
--- a/src/depricatedevent.h
+++ b/src/depricatedevent.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp
index 365fd4747..73d0651e8 100644
--- a/src/emoteshortcut.cpp
+++ b/src/emoteshortcut.cpp
@@ -1,7 +1,7 @@
/*
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
index fe3d77e12..945976077 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -1,7 +1,7 @@
/*
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/equipment.h b/src/equipment.h
index c814e802f..2666f45ab 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index cb9f2829f..6e7749c07 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/flooritem.h b/src/flooritem.h
index f4b843a8c..4e1b78d87 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/game.cpp b/src/game.cpp
index ae7ba3b4f..fe279868e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/game.h b/src/game.h
index 27e3c72b3..a78c740a4 100644
--- a/src/game.h
+++ b/src/game.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 279ee3497..e4864677a 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/graphics.h b/src/graphics.h
index 333d8fa26..b9d4cc53b 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 527fe9159..b6cb51455 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index 68e032425..ad208dcb3 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/graphicsvertexes.cpp b/src/graphicsvertexes.cpp
index 2f4a42bee..ff5445956 100644
--- a/src/graphicsvertexes.cpp
+++ b/src/graphicsvertexes.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index b5bb19749..c9084173a 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index 2f4450bac..7cd797cb2 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h
index 5c0e908a9..b18abe4e2 100644
--- a/src/gui/beingpopup.h
+++ b/src/gui/beingpopup.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index e6894bb65..24ac63a00 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index 3b1b05d4d..66aa70c78 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp
index 121f3d3c8..c1d1207df 100644
--- a/src/gui/buyselldialog.cpp
+++ b/src/gui/buyselldialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h
index c0aa1f643..d6cef9192 100644
--- a/src/gui/buyselldialog.h
+++ b/src/gui/buyselldialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index df1c0051a..4d0cd6d25 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index 69b7c0e8d..36c06fcbc 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 768c48966..8b75140eb 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index d8a125849..6eb6bd48b 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 6494d91a6..1a4a65339 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index d15812484..8f51850e9 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index d822e005c..82daaeced 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index 6e819da47..87716f78e 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index c9c061be2..4a80a5df0 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -718,6 +718,9 @@ void ChatWindow::scroll(const int amount) const
void ChatWindow::mousePressed(gcn::MouseEvent &event)
{
+ if (event.isConsumed())
+ return;
+
if (event.getButton() == gcn::MouseEvent::RIGHT)
{
if (viewport)
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 6ffd039ab..1e9274466 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp
index 0ec54c5d9..838b1eaf6 100644
--- a/src/gui/confirmdialog.cpp
+++ b/src/gui/confirmdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h
index 64d2cd156..392cd9e24 100644
--- a/src/gui/confirmdialog.h
+++ b/src/gui/confirmdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp
index c92f5f53e..94a055de5 100644
--- a/src/gui/connectiondialog.cpp
+++ b/src/gui/connectiondialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h
index 77c97c92d..391824101 100644
--- a/src/gui/connectiondialog.h
+++ b/src/gui/connectiondialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 04889d725..39ee07767 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 62d7aa34f..e0842f7ce 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index 485cf1be7..ab8f5366f 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h
index a0c0105c6..71fd4d604 100644
--- a/src/gui/didyouknowwindow.h
+++ b/src/gui/didyouknowwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/editserverdialog.cpp b/src/gui/editserverdialog.cpp
index 601c9fc76..bdfbdd1d5 100644
--- a/src/gui/editserverdialog.cpp
+++ b/src/gui/editserverdialog.cpp
@@ -1,7 +1,7 @@
/*
* The Mana Client
* Copyright (C) 2011-2012 The Mana Developers
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -74,7 +74,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
mOkButton(new Button(this, _("OK"), "addServer", this)),
mCancelButton(new Button(this, _("Cancel"), "cancel", this)),
mTypeListModel(new TypeListModel),
- mTypeField(new DropDown(this, mTypeListModel)),
+ mTypeField(new DropDown(this, mTypeListModel, false, true)),
mServerDialog(parent),
mServer(server),
mIndex(index)
diff --git a/src/gui/editserverdialog.h b/src/gui/editserverdialog.h
index a5a998ab8..7f611136b 100644
--- a/src/gui/editserverdialog.h
+++ b/src/gui/editserverdialog.h
@@ -1,7 +1,7 @@
/*
* The Mana Client
* Copyright (C) 2011-2012 The Mana Developers
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The Mana Client.
*
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index cb0577783..f2fe34a31 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 0d4935256..51f6f151b 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index 80bc0a04f..efe0217d0 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 12a639c0e..5cba9d08f 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0c703d5ef..3a459b55f 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 0efa25c1d..983b34dc0 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index 9555871bb..a9aead461 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h
index 11598dd25..998164b62 100644
--- a/src/gui/helpwindow.h
+++ b/src/gui/helpwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 3bf526b40..8d142328c 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -108,7 +108,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
mSlotsBar(new ProgressBar(this, 0.0f, 100, 0, Theme::PROG_INVY_SLOTS)),
mFilter(nullptr),
mSortModel(new SortListModel),
- mSortDropDown(new DropDown(this, mSortModel, false, this, "sort")),
+ mSortDropDown(new DropDown(this, mSortModel, false, false, this, "sort")),
mNameFilter(new TextField(this, "", true, this, "namefilter", true)),
mSortDropDownCell(nullptr),
mNameFilterCell(nullptr),
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 426a4f6ee..ad40bb5df 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index 82f85a2e7..454460984 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h
index ef2613653..f1d9aabce 100644
--- a/src/gui/itemamountwindow.h
+++ b/src/gui/itemamountwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 9d1b3920c..b58b245c8 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 0f210fa0f..4817b8851 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -3,7 +3,7 @@
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 26093634e..6adaaad5d 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -163,7 +163,7 @@ LoginDialog::LoginDialog(LoginData *const data, std::string serverName,
mLoginData->updateHost.c_str()));
mUpdateListModel = new UpdateListModel(mLoginData);
mUpdateHostDropDown = new DropDown(this, mUpdateListModel,
- false, this, "updateselect");
+ false, false, this, "updateselect");
const std::string str = serverConfig.getValue("updateHost2", "");
if (!str.empty())
mUpdateHostDropDown->setSelectedString(str);
diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h
index 2a4dec9fd..cadb6b925 100644
--- a/src/gui/logindialog.h
+++ b/src/gui/logindialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index e86fac09a..995667cd7 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 78ca0b675..2fe1458ab 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 64da94389..b1c6eba24 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -152,7 +152,7 @@ ProgressBar *MiniStatusWindow::createBar(const float progress,
void MiniStatusWindow::updateBars()
{
- int x = mPadding;
+ int x = 0;
const ProgressBar *lastBar = nullptr;
for (std::vector <ProgressBar*>::const_iterator it = mBars.begin(),
it_end = mBars.end(); it != it_end; ++it)
@@ -167,7 +167,7 @@ void MiniStatusWindow::updateBars()
continue;
if (bar->isVisible())
{
- bar->setPosition(x, mPadding);
+ bar->setPosition(x, 0);
add(bar);
x += bar->getWidth() + mSpacing;
lastBar = bar;
@@ -176,9 +176,8 @@ void MiniStatusWindow::updateBars()
if (lastBar)
{
- const int pad2 = 2 * mPadding;
- setContentSize(lastBar->getX() + lastBar->getWidth() + pad2,
- lastBar->getY() + lastBar->getHeight() + pad2);
+ setContentSize(lastBar->getX() + lastBar->getWidth(),
+ lastBar->getY() + lastBar->getHeight());
}
}
@@ -490,6 +489,7 @@ void MiniStatusWindow::updateArrows()
gcn::Rectangle MiniStatusWindow::getChildrenArea()
{
- return gcn::Rectangle(getPadding(), 0, getWidth() - getPadding() * 2,
- getHeight() - getPadding() * 2);
+ return gcn::Rectangle(getPadding(), getPadding(),
+ getWidth() - getPadding() * 2,
+ getHeight() - getPadding() * 2);
}
diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h
index feae1e1df..fcd18b479 100644
--- a/src/gui/ministatuswindow.h
+++ b/src/gui/ministatuswindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 84ca51a18..f2067d847 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 79999aa07..433a4472f 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 09d94881f..b5e85938e 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index 71dffb2f6..6dfd2bd48 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp
index ad379e656..4e52cc8ab 100644
--- a/src/gui/okdialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h
index 7c03b8a93..0d64e7bff 100644
--- a/src/gui/okdialog.h
+++ b/src/gui/okdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 3e29adb5f..8170b6a9f 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index 2893c8495..38751f80d 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index b73732e29..26494fe43 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 1918a27ac..dbb8327c6 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -3,7 +3,7 @@
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 844fc4e3f..09389f3ea 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -69,7 +69,9 @@
#include "resources/iteminfo.h"
+#include "utils/copynpaste.h"
#include "utils/gettext.h"
+#include "utils/process.h"
#include <guichan/listmodel.hpp>
@@ -1549,6 +1551,14 @@ void PopupMenu::handleLink(const std::string &link,
if (mTextField)
mTextField->handlePaste();
}
+ else if (link == "open link" && !mNick.empty())
+ {
+ openBrowser(mNick);
+ }
+ else if (link == "clipboard link" && !mNick.empty())
+ {
+ sendBuffer(mNick);
+ }
else if (!link.compare(0, 10, "guild-pos-"))
{
if (player_node)
@@ -2079,6 +2089,23 @@ void PopupMenu::showTextFieldPopup(int x, int y, TextField *input)
showPopup(x, y);
}
+void PopupMenu::showLinkPopup(const int x, const int y,
+ const std::string &link)
+{
+ mX = x;
+ mY = y;
+ mNick = link;
+
+ mBrowserBox->clearRows();
+
+ mBrowserBox->addRow("open link", _("Open link"));
+ mBrowserBox->addRow("clipboard link", _("Copy to clipboard"));
+ mBrowserBox->addRow("##3---");
+ mBrowserBox->addRow("cancel", _("Cancel"));
+
+ showPopup(x, y);
+}
+
void PopupMenu::showPopup(int x, int y)
{
const int pad2 = 2 * getPadding();
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index e2397d7db..831d39180 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -171,6 +171,8 @@ class PopupMenu final : public Popup, public LinkHandler
void showTextFieldPopup(int x, int y, TextField *input);
+ void showLinkPopup(const int x, const int y, const std::string &link);
+
/**
* Handles link action.
*/
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index 16fe7190b..cb03904a9 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -205,7 +205,7 @@ void QuestsWindow::loadQuest(const int var, const XmlNodePtr node)
quest->group = XML::getProperty(node, "group", "");
std::string incompleteStr = XML::getProperty(node, "incomplete", "");
std::string completeStr = XML::getProperty(node, "complete", "");
- if (incompleteStr.empty() || completeStr.empty())
+ if (incompleteStr.empty() && completeStr.empty())
{
logger->log("complete flags incorrect");
delete quest;
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 4e5cb4a05..fd6724aa3 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index e6dcb20e9..760030e26 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp
index 2c9ed0740..40738abb2 100644
--- a/src/gui/registerdialog.cpp
+++ b/src/gui/registerdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/registerdialog.h b/src/gui/registerdialog.h
index 0c7cf9f77..83d76d772 100644
--- a/src/gui/registerdialog.h
+++ b/src/gui/registerdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index d0520447a..8cf0a4ffe 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
* Copyright (C) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h
index 3086abf0a..22cbb53cb 100644
--- a/src/gui/sdlfont.h
+++ b/src/gui/sdlfont.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
* Copyright (C) 2009 Aethyra Development Team
*
* This file is part of The ManaPlus Client.
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index d6b067cc2..4f5234e73 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -8,7 +8,7 @@
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
* Copyright (C) 2007-2010 The Mana World Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index dc12789b2..58f05424a 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -8,7 +8,7 @@
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
* Copyright (C) 2007-2010 The Mana World Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index 0c38d48cc..50757369d 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index 447665bf7..00f281b2d 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 5e7c80515..1c4ad195b 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index 740c35a95..253bfd365 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index ab7179257..7eef2d856 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 51a4e5c26..69ab79970 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index faea24c1e..ea3a46a86 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -82,7 +82,7 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) :
new SetupItemSlider(_("Music volume"), "", "musicVolume",
this, "musicVolumeEvent", 0, sound.getMaxVolume(), 150, true);
- new SetupItemCheckBox(_("Enable music fade out (can be very slow)"), "",
+ new SetupItemCheckBox(_("Enable music fade out"), "",
"fadeoutmusic", this, "fadeoutmusicEvent");
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index b99377405..93544e52a 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 7b4cdeb2a..c57160d7f 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h
index a628f9c66..6fc6e3896 100644
--- a/src/gui/setup_chat.h
+++ b/src/gui/setup_chat.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index cf6452b5e..c83d5d2a8 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -1,7 +1,7 @@
/*
* Configurable text colors
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index 9e11b5325..380ef54a4 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -1,7 +1,7 @@
/*
* Configurable text colors
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index 7b9c49056..1b6a7e962 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_input.h b/src/gui/setup_input.h
index 157c99cf2..2a7f13dd7 100644
--- a/src/gui/setup_input.h
+++ b/src/gui/setup_input.h
@@ -3,7 +3,7 @@
* Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index f2a0ce144..8956384c1 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -45,6 +45,7 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
mCalibrateLabel(new Label(this,
_("Press the button to start calibration"))),
mCalibrateButton(new Button(this, _("Calibrate"), "calibrate", this)),
+ mDetectButton(new Button(this, _("Detect joysticks"), "detect", this)),
mJoystickEnabled(new CheckBox(this, _("Enable joystick"))),
mNamesModel(new NamesModel),
mNamesDropDown(new DropDown(this, mNamesModel)),
@@ -83,8 +84,9 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
place(0, 0, mJoystickEnabled);
place(0, 1, mNamesDropDown);
place(0, 2, mUseInactiveCheckBox);
- place(0, 3, mCalibrateLabel);
- place(0, 4, mCalibrateButton);
+ place(0, 3, mDetectButton);
+ place(0, 4, mCalibrateLabel);
+ place(0, 5, mCalibrateButton);
setDimension(gcn::Rectangle(0, 0, 365, 75));
}
@@ -97,15 +99,25 @@ Setup_Joystick::~Setup_Joystick()
void Setup_Joystick::action(const gcn::ActionEvent &event)
{
- if (event.getSource() == mJoystickEnabled)
+ const gcn::Widget *const source = event.getSource();
+ if (source == mJoystickEnabled)
{
setTempEnabled(mJoystickEnabled->isSelected());
}
- else if (event.getSource() == mNamesDropDown)
+ else if (source == mNamesDropDown)
{
if (joystick)
joystick->setNumber(mNamesDropDown->getSelected());
}
+ else if (source == mDetectButton)
+ {
+ if (joystick)
+ {
+ joystick->reload();
+ Joystick::getNames(mNamesModel->getNames());
+ mNamesDropDown->setSelected(joystick->getNumber());
+ }
+ }
else
{
if (!joystick)
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 4af6cc8aa..d703c6ae7 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -53,6 +53,7 @@ class Setup_Joystick final : public SetupTab
private:
Label *mCalibrateLabel;
Button *mCalibrateButton;
+ Button *mDetectButton;
bool mOriginalJoystickEnabled;
CheckBox *mJoystickEnabled;
NamesModel *mNamesModel;
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index b59cf8041..ce0464055 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index 29c228823..8b442ce65 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
index c1615a1aa..06838dcb6 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/setup_perfomance.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h
index 3b6799635..ee6f729fc 100644
--- a/src/gui/setup_perfomance.h
+++ b/src/gui/setup_perfomance.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index f1f171957..cf2a33378 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 0e7f313a9..759ec2c7f 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index ffdec3e4b..412f67a4c 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index 13f1a0573..92ebf9ec1 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 2a8836bcb..74cd91854 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -135,7 +135,7 @@ const Language LANG_NAME[langs_count] =
{N_("Italian"), "it_IT", "it.png"},
{N_("Polish"), "pl_PL", "pl.png"},
{N_("Japanese"), "ja_JP", "jp.png"},
- {N_("Dutch (Belgium/Flemish)"), "nl_BE", ""},
+ {N_("Dutch (Belgium/Flemish)"), "nl_BE", "nl_BE.png"},
{N_("Portuguese"), "pt_PT", "pt.png"},
{N_("Portuguese (Brazilian)"), "pt_BR", "pt_BR.png"},
{N_("Russian"), "ru_RU", "ru.png"},
diff --git a/src/gui/setup_touch.cpp b/src/gui/setup_touch.cpp
index 5aea8388d..ad85b8348 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/setup_touch.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_touch.h b/src/gui/setup_touch.h
index 444006f48..f916c9058 100644
--- a/src/gui/setup_touch.h
+++ b/src/gui/setup_touch.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 52e79d69f..db26bd2c8 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 6d6e8cdcb..8ccfa5bb2 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_visual.cpp b/src/gui/setup_visual.cpp
index ca4ec43dd..9cddd5682 100644
--- a/src/gui/setup_visual.cpp
+++ b/src/gui/setup_visual.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h
index f80e219b9..82c1bfe5e 100644
--- a/src/gui/setup_visual.h
+++ b/src/gui/setup_visual.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 Andrei Karas
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index 495879104..03854062e 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -3,7 +3,7 @@
* Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 0d65c1524..548c99628 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index 90fd09b6c..9b7e64572 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 762a00c8f..aa16c0210 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index 428a71507..5242fca2f 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 35e3e7422..2f741d283 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index fe1cbbbde..396718310 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index aa66063b6..9d9b11471 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 20e4861d0..2c959695f 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 7e6477938..ef6e2a428 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index c7f2e8cde..3b19eefa8 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 2bd601110..00746c7fd 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 2edd7819f..ac59156a2 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -3,7 +3,7 @@
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 691333703..188ff5d66 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -77,12 +77,17 @@ class AttrDisplay : public Container
return mValue->getCaption();
}
+ const std::string &getShortName() const
+ { return mShortName; }
+
protected:
AttrDisplay(const Widget2 *const widget,
- const int id, const std::string &name);
+ const int id, const std::string &name,
+ const std::string &shortName);
const int mId;
const std::string mName;
+ const std::string mShortName;
LayoutHelper *mLayout;
Label *mLabel;
@@ -93,7 +98,8 @@ class DerDisplay final : public AttrDisplay
{
public:
DerDisplay(const Widget2 *const widget,
- const int id, const std::string &name);
+ const int id, const std::string &name,
+ const std::string &shortName);
A_DELETE_COPY(DerDisplay)
@@ -105,7 +111,8 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
{
public:
ChangeDisplay(const Widget2 *const widget,
- const int id, const std::string &name);
+ const int id, const std::string &name,
+ const std::string &shortName);
A_DELETE_COPY(ChangeDisplay)
@@ -436,6 +443,7 @@ void StatusWindow::setPointsNeeded(const int id, const int needed)
}
void StatusWindow::addAttribute(const int id, const std::string &name,
+ const std::string &shortName,
const bool modifiable,
const std::string &description A_UNUSED)
{
@@ -443,12 +451,12 @@ void StatusWindow::addAttribute(const int id, const std::string &name,
if (modifiable)
{
- disp = new ChangeDisplay(this, id, name);
+ disp = new ChangeDisplay(this, id, name, shortName);
mAttrCont->add1(disp);
}
else
{
- disp = new DerDisplay(this, id, name);
+ disp = new DerDisplay(this, id, name, shortName);
mDAttrCont->add1(disp);
}
mAttrs[id] = disp;
@@ -743,7 +751,10 @@ void StatusWindow::action(const gcn::ActionEvent &event)
const ChangeDisplay *const attr = dynamic_cast<ChangeDisplay*>(
(*it).second);
if (attr)
- str += attr->getValue() + " ";
+ {
+ str += strprintf("%s:%s ", attr->getShortName().c_str(),
+ attr->getValue().c_str());
+ }
++ it;
}
chatWindow->addInputText(str);
@@ -751,10 +762,12 @@ void StatusWindow::action(const gcn::ActionEvent &event)
}
AttrDisplay::AttrDisplay(const Widget2 *const widget,
- const int id, const std::string &name) :
+ const int id, const std::string &name,
+ const std::string &shortName) :
Container(widget),
mId(id),
mName(name),
+ mShortName(shortName),
mLayout(new LayoutHelper(this)),
mLabel(new Label(this, name)),
mValue(new Label(this, "1 "))
@@ -785,8 +798,9 @@ std::string AttrDisplay::update()
}
DerDisplay::DerDisplay(const Widget2 *const widget,
- const int id, const std::string &name) :
- AttrDisplay(widget, id, name)
+ const int id, const std::string &name,
+ const std::string &shortName) :
+ AttrDisplay(widget, id, name, shortName)
{
ContainerPlacer place = mLayout->getPlacer(0, 0);
@@ -797,8 +811,9 @@ DerDisplay::DerDisplay(const Widget2 *const widget,
}
ChangeDisplay::ChangeDisplay(const Widget2 *const widget,
- const int id, const std::string &name) :
- AttrDisplay(widget, id, name),
+ const int id, const std::string &name,
+ const std::string &shortName) :
+ AttrDisplay(widget, id, name, shortName),
gcn::ActionListener(),
mNeeded(1),
mPoints(new Label(this, _("Max"))),
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 2efc4bfb2..2c9e3d3f7 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -61,8 +61,9 @@ class StatusWindow final : public Window,
void setPointsNeeded(const int id, const int needed);
void addAttribute(const int id, const std::string &name,
- const bool modifiable,
- const std::string &description);
+ const std::string &shortName = "",
+ const bool modifiable = false,
+ const std::string &description = "");
static void updateHPBar(ProgressBar *const bar,
const bool showMax = false);
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index 815ffac4c..d598cb37c 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h
index 07aa22bf6..d91cc2129 100644
--- a/src/gui/textdialog.h
+++ b/src/gui/textdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index 83165c871..ddc2ac009 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h
index 4b0fe2728..e0dfe60ec 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/textpopup.h
@@ -3,7 +3,7 @@
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 91c8ed3a8..f2ce534a7 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -4,7 +4,7 @@
* Copyright (C) 2009 Aethyra Development Team
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 7782bac71..572946e0b 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -4,7 +4,7 @@
* Copyright (C) 2009 Aethyra Development Team
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index 4bbfed638..6beba2357 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h
index 4636a41e9..975446aa4 100644
--- a/src/gui/tradewindow.h
+++ b/src/gui/tradewindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index cec2a8561..86243363f 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index c9caa2cb4..19428b78b 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index e6dbfc05d..7d489c8ec 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h
index 1eb2c38f9..0fd7dc93d 100644
--- a/src/gui/updaterwindow.h
+++ b/src/gui/updaterwindow.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 91530a451..7f2a2ca41 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 43decd601..85d37d5c8 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -3,7 +3,7 @@
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 4b7a86fe6..b0d41edd3 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -821,6 +821,11 @@ void Viewport::showTextFieldPopup(TextField *input)
mPopupMenu->showTextFieldPopup(getMouseX(), getMouseY(), input);
}
+void Viewport::showLinkPopup(const std::string &link)
+{
+ mPopupMenu->showLinkPopup(getMouseX(), getMouseY(), link);
+}
+
void Viewport::closePopupMenu()
{
if (mPopupMenu)
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 6953a3827..c51035c5e 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -185,6 +185,8 @@ class Viewport final : public WindowContainer,
void showTextFieldPopup(TextField *input);
+ void showLinkPopup(const std::string &link);
+
/**
* Closes the popup menu. Needed for when the player dies or switching
* maps.
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index a8052fd8d..c28b13753 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 0600feda2..e48c00bd1 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index 9cfd60d64..b888945a8 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h
index abe0d6e78..7bcb78d28 100644
--- a/src/gui/widgets/battletab.h
+++ b/src/gui/widgets/battletab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 26d446060..e931c7626 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
* Copyright (C) 2009 Aethyra Development Team
*
* This file is part of The ManaPlus Client.
@@ -355,6 +355,7 @@ void BrowserBox::mousePressed(gcn::MouseEvent &event)
if (i != mLinks.end())
mLinkHandler->handleLink(i->link, &event);
+ event.consume();
}
void BrowserBox::mouseMoved(gcn::MouseEvent &event)
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index fad731e5a..0b8c99c8a 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
* Copyright (C) 2009 Aethyra Development Team
*
* This file is part of The ManaPlus Client.
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 265815929..83c5f2c95 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 3e84eeafe..d0431217e 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp
index bcb5b1002..64bc27e09 100644
--- a/src/gui/widgets/channeltab.cpp
+++ b/src/gui/widgets/channeltab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h
index e0dbfb043..bbcdaecaa 100644
--- a/src/gui/widgets/channeltab.h
+++ b/src/gui/widgets/channeltab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 2fc19a473..0742e0ae2 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 5a1dc2e82..ae4ac3f01 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 2d005c8bf..ac0a226ee 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 91c713b9e..626d1ebe3 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp
index 3cd68a6c5..067d54780 100644
--- a/src/gui/widgets/container.cpp
+++ b/src/gui/widgets/container.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 43a267c6b..eb1d9b8e4 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6079d33a8..68a056077 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -1,7 +1,7 @@
/*
* Desktop widget
* Copyright (c) 2009-2010 The Mana World Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 41328b44b..9bafc0552 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -1,7 +1,7 @@
/*
* Desktop widget
* Copyright (c) 2009-2010 The Mana World Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 8a543b310..d4fde01dc 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -60,6 +60,7 @@ static std::string const dropdownFiles[2] =
DropDown::DropDown(const Widget2 *const widget,
gcn::ListModel *const listModel,
bool extended,
+ bool modal,
gcn::ActionListener *const listener,
const std::string &eventId):
gcn::ActionListener(),
@@ -70,7 +71,7 @@ DropDown::DropDown(const Widget2 *const widget,
gcn::SelectionListener(),
Widget2(widget),
mExtended(extended),
- mPopup(new PopupList(this, listModel, extended)),
+ mPopup(new PopupList(this, listModel, extended, modal)),
mShadowColor(getThemeColor(Theme::DROPDOWN_SHADOW)),
mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
mPadding(1),
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 295c8b527..30ce6692b 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -71,6 +71,7 @@ class DropDown final : public gcn::ActionListener,
DropDown(const Widget2 *const widget,
gcn::ListModel *const listModel = nullptr,
bool extended = false,
+ bool modal = false,
gcn::ActionListener *const listener = nullptr,
const std::string &eventId = "");
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index cb872ac5c..d5b853552 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -1,7 +1,7 @@
/*
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index db4bcd138..58b2d4d59 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -1,7 +1,7 @@
/*
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 8c850775a..34f4f1a45 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -42,13 +42,14 @@ ExtendedListBox::ExtendedListBox(const Widget2 *const widget,
ListBox(widget, listModel),
mRowHeight(rowHeight),
mImagePadding(mSkin ? mSkin->getOption("imagePadding") : 0),
- mSpacing(mSkin ? mSkin->getOption("spacing") : 0)
+ mSpacing(mSkin ? mSkin->getOption("spacing") : 0),
+ mItemPadding(mSkin ? mSkin->getOption("itemPadding") : 1)
{
if (!mRowHeight)
{
const gcn::Font *font = getFont();
if (font)
- mRowHeight = font->getHeight() + 2 * mPadding;
+ mRowHeight = font->getHeight() + 2 * mItemPadding;
else
mRowHeight = 13;
}
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index 79ae868cf..9da77abe7 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -52,6 +52,7 @@ class ExtendedListBox final : public ListBox
unsigned int mRowHeight;
int mImagePadding;
int mSpacing;
+ int mItemPadding;
};
#endif
diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/widgets/extendedlistmodel.h
index 536323b36..c24382c5b 100644
--- a/src/gui/widgets/extendedlistmodel.h
+++ b/src/gui/widgets/extendedlistmodel.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/widgets/extendednamesmodel.cpp
index 60a814de7..015d4d685 100644
--- a/src/gui/widgets/extendednamesmodel.cpp
+++ b/src/gui/widgets/extendednamesmodel.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h
index 64941d089..0978f7302 100644
--- a/src/gui/widgets/extendednamesmodel.h
+++ b/src/gui/widgets/extendednamesmodel.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index 9c5716506..dda201904 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 0dc39dde2..45f493d9b 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index 2b88b4590..79907b4c3 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h
index f376eddf8..91baf6973 100644
--- a/src/gui/widgets/guildchattab.h
+++ b/src/gui/widgets/guildchattab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 935fa833d..8b6722a59 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 899379840..9657de9f8 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
index ead98f729..9ce676cd5 100644
--- a/src/gui/widgets/horizontcontainer.cpp
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 2abe8a056..486ba53db 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index 7b4f4857e..8937e202a 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 90ab1a3bb..4350c7b34 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index e1b8df730..236fdaf43 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index ee031687e..415c2806e 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 30cd9d063..42c9bafcf 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index a8dbf3215..4dd1640a0 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 293eb5237..d9c7ca838 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -35,6 +35,7 @@
#include <string>
#include <guichan/actionlistener.hpp>
+#include <guichan/mouseinput.hpp>
#include "debug.h"
@@ -61,7 +62,7 @@ ItemLinkHandler::~ItemLinkHandler()
}
void ItemLinkHandler::handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED)
+ gcn::MouseEvent *event)
{
if (!strStartWith(link, "http://"))
{
@@ -92,11 +93,22 @@ void ItemLinkHandler::handleLink(const std::string &link,
}
else
{
+ if (!event)
+ return;
std::string url = link;
replaceAll(url, " ", "");
listener.url = url;
- ConfirmDialog *const confirmDlg = new ConfirmDialog(
- _("Open url"), url, false, true);
- confirmDlg->addActionListener(&listener);
+ const int button = event->getButton();
+ if (button == gcn::MouseInput::LEFT)
+ {
+ ConfirmDialog *const confirmDlg = new ConfirmDialog(
+ _("Open url"), url, false, true);
+ confirmDlg->addActionListener(&listener);
+ }
+ else if (button == gcn::MouseInput::RIGHT)
+ {
+ if (viewport)
+ viewport->showLinkPopup(url);
+ }
}
}
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index dede39db1..6d389b4b7 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 5308588d8..12bc52f74 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 001ddf05e..47a520601 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 2be9a476b..13eff1e7d 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (c) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 084fe2f40..6c7df3f89 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (c) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index b0b194bde..932f8dfe5 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index b1788343c..cb0000073 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index 4f082f4b2..b95c6f93f 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index c1ede2611..57448ec01 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index 703f593f2..7411facc3 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index c7d59f124..9eb5f23a2 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 36f48e7b7..21f6b00b0 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h
index 9ef9f8658..0d1a10096 100644
--- a/src/gui/widgets/mouseevent.h
+++ b/src/gui/widgets/mouseevent.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/widgets/namesmodel.cpp
index 186976d13..05c12599c 100644
--- a/src/gui/widgets/namesmodel.cpp
+++ b/src/gui/widgets/namesmodel.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
index eab9983f3..4a1754ef0 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/widgets/namesmodel.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp
index 42bd8d0d0..13e5e5773 100644
--- a/src/gui/widgets/passwordfield.cpp
+++ b/src/gui/widgets/passwordfield.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index 87b248221..46ed865f2 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index f378373b2..1718ef513 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 0833b63c3..b35b8175c 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index ee00a07d2..20b4c3ca1 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
* Copyright (C) 2009 Aethyra Development Team
*
* This file is part of The ManaPlus Client.
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index e4ff5ed4b..23bce3d5f 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
* Copyright (C) 2009 Aethyra Development Team
*
* This file is part of The ManaPlus Client.
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index 80fd12e85..ca9ef2c7d 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -32,14 +32,15 @@
PopupList::PopupList(DropDown *const widget,
gcn::ListModel *const listModel,
- bool extended):
+ bool extended, bool modal):
Popup("PopupList", "popuplist.xml"),
gcn::FocusListener(),
mListModel(listModel),
mListBox(extended ? new ExtendedListBox(widget, listModel, 0) :
new ListBox(widget, listModel)),
mScrollArea(new ScrollArea(mListBox, false)),
- mDropDown(widget)
+ mDropDown(widget),
+ mModal(modal)
{
setFocusable(true);
@@ -79,6 +80,8 @@ void PopupList::show(int x, int y)
setPosition(x, y);
setVisible(true);
requestMoveToTop();
+ if (mModal)
+ requestModalFocus();
}
void PopupList::widgetResized(const gcn::Event &event)
@@ -124,6 +127,8 @@ void PopupList::mousePressed(gcn::MouseEvent& mouseEvent A_UNUSED)
if (mDropDown)
mDropDown->updateSelection();
setVisible(false);
+ if (mModal)
+ releaseModalFocus();
}
void PopupList::focusGained(const gcn::Event& event A_UNUSED)
@@ -138,6 +143,8 @@ void PopupList::focusGained(const gcn::Event& event A_UNUSED)
if (mDropDown)
mDropDown->updateSelection();
setVisible(false);
+ if (mModal)
+ releaseModalFocus();
}
void PopupList::focusLost(const gcn::Event& event A_UNUSED)
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index 3ba3773fe..3e3c44449 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -39,7 +39,8 @@ class PopupList final : public Popup,
{
public:
PopupList(DropDown *const widget,
- gcn::ListModel *const listModel, bool extended);
+ gcn::ListModel *const listModel, bool extended,
+ bool modal = false);
~PopupList();
@@ -71,6 +72,7 @@ class PopupList final : public Popup,
ListBox *mListBox;
ScrollArea *mScrollArea;
DropDown *mDropDown;
+ bool mModal;
};
#endif
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 0bed7d5d6..7b7e088b6 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index f541ea3df..c5486f294 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index 10b2bba88..401b45754 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 56f2daff5..1fc1dcd37 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index c5d14a261..1a6b9df70 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 8607c891b..860ede73e 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/radiogroup.cpp b/src/gui/widgets/radiogroup.cpp
index f0009a202..c1a202681 100644
--- a/src/gui/widgets/radiogroup.cpp
+++ b/src/gui/widgets/radiogroup.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index 86f01fc79..bd17fb2b9 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 24a49a129..d7b588749 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index e86442fba..efc119190 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index dd2d16caf..efa96136f 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 34879c23c..f660500a8 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp
index 7b45329e6..690b09f49 100644
--- a/src/gui/widgets/setuptab.cpp
+++ b/src/gui/widgets/setuptab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h
index 66922120e..8ffab10d1 100644
--- a/src/gui/widgets/setuptab.h
+++ b/src/gui/widgets/setuptab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index d786399ce..aac5cf0e8 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index a0c37c9a8..70ac756cb 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index 8fea0478e..7cb84ae81 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index 36770ae63..72c0cba0c 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp
index 7aa8f40b4..f97767064 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/widgets/shopitems.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index 56c686242..954f2830a 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index bd7c7ad11..4c0738374 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 9e9b6884b..16f54e78a 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index eae6e3ff7..cd9bcd7c0 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 999da22d5..5872f765d 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 1f6a68be9..2ab5bae99 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 018269ea4..a6c608214 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 019755576..55cda4d26 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 42e6cb575..b07ca5598 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index b5e301b24..35a9a17b4 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 1e30fdeb2..c1a9d37f2 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index ded2986d3..e930ab60d 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 9c66acbfe..7c90f19ea 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp
index 59cd58ba7..294759a77 100644
--- a/src/gui/widgets/tablemodel.cpp
+++ b/src/gui/widgets/tablemodel.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 3f6c465a4..da200c52a 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp
index 5e8baf3f5..2ecbb5eed 100644
--- a/src/gui/widgets/tabstrip.cpp
+++ b/src/gui/widgets/tabstrip.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index a3d81bf97..fe38ee911 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index cba575605..69c93c025 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 8b4ec9f7f..497d47b7c 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 950bba025..6997b6d5d 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 6ac24066f..14b8f57b5 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 00ce7f42a..8f0fa6104 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 2d8dc6c74..e3712a934 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp
index 47d47c304..96a45e339 100644
--- a/src/gui/widgets/tradetab.cpp
+++ b/src/gui/widgets/tradetab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h
index 0283db9a4..19d85a645 100644
--- a/src/gui/widgets/tradetab.h
+++ b/src/gui/widgets/tradetab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index 7eeb98675..0bda6c869 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index d01562280..4399504f2 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 439f1c2ca..58219f019 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 185865058..7cf5ece0d 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index a02194e4c..29ab2c11f 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/widgetgroup.cpp b/src/gui/widgets/widgetgroup.cpp
index 85d28dc1b..263be4a6f 100644
--- a/src/gui/widgets/widgetgroup.cpp
+++ b/src/gui/widgets/widgetgroup.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 69a6b1874..7161658e7 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 85545b183..af753be2d 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 95f686729..02f58d2a8 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index 8c985737c..1c4b926f5 100644
--- a/src/gui/widgets/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index fd25a1162..cee1178e8 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index dcf5f18bc..2d8ec7f7a 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -69,7 +69,7 @@ WindowMenu::WindowMenu(const Widget2 *const widget) :
gcn::SelectionListener(),
gcn::MouseListener(),
mSkin(Theme::instance() ? Theme::instance()->load("windowmenu.xml", "")
- : nullptr),
+ : nullptr),
mPadding(mSkin ? mSkin->getPadding() : 1),
mSpacing(mSkin ? mSkin->getOption("spacing", 3) : 3),
mTextPopup(new TextPopup),
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 10fec6fb4..6f0cfbdff 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 3623fb3cc..619457b70 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h
index 33e588311..6bae954f8 100644
--- a/src/gui/worldselectdialog.h
+++ b/src/gui/worldselectdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/guichan/actionevent.cpp b/src/guichan/actionevent.cpp
index a2e22abee..deda65d36 100644
--- a/src/guichan/actionevent.cpp
+++ b/src/guichan/actionevent.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/basiccontainer.cpp b/src/guichan/basiccontainer.cpp
index fb69bb53a..a89e55ea4 100644
--- a/src/guichan/basiccontainer.cpp
+++ b/src/guichan/basiccontainer.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/cliprectangle.cpp b/src/guichan/cliprectangle.cpp
index 6e25b668b..5bff1ab81 100644
--- a/src/guichan/cliprectangle.cpp
+++ b/src/guichan/cliprectangle.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp
index 87d110b63..29b4f2bdc 100644
--- a/src/guichan/color.cpp
+++ b/src/guichan/color.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/event.cpp b/src/guichan/event.cpp
index 24c913880..f37bf2846 100644
--- a/src/guichan/event.cpp
+++ b/src/guichan/event.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/exception.cpp b/src/guichan/exception.cpp
index 75eaac2e9..0117aa2a6 100644
--- a/src/guichan/exception.cpp
+++ b/src/guichan/exception.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp
index 71f1831ed..71e2d25ed 100644
--- a/src/guichan/focushandler.cpp
+++ b/src/guichan/focushandler.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/font.cpp b/src/guichan/font.cpp
index 57d51bfff..fb8d2ae41 100644
--- a/src/guichan/font.cpp
+++ b/src/guichan/font.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/graphics.cpp b/src/guichan/graphics.cpp
index 94c08a77a..a17884e6f 100644
--- a/src/guichan/graphics.cpp
+++ b/src/guichan/graphics.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp
index e19eb09e6..fa54d9008 100644
--- a/src/guichan/gui.cpp
+++ b/src/guichan/gui.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/image.cpp b/src/guichan/image.cpp
index 09129e61f..5e3af0716 100644
--- a/src/guichan/image.cpp
+++ b/src/guichan/image.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/guichan/include/guichan/actionevent.hpp
index 0d70c54ce..12baa3419 100644
--- a/src/guichan/include/guichan/actionevent.hpp
+++ b/src/guichan/include/guichan/actionevent.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/actionlistener.hpp b/src/guichan/include/guichan/actionlistener.hpp
index 5991486a7..50e3349fd 100644
--- a/src/guichan/include/guichan/actionlistener.hpp
+++ b/src/guichan/include/guichan/actionlistener.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp
index fb6e1a54e..dc307fb27 100644
--- a/src/guichan/include/guichan/basiccontainer.hpp
+++ b/src/guichan/include/guichan/basiccontainer.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/cliprectangle.hpp b/src/guichan/include/guichan/cliprectangle.hpp
index 7e59d0d0f..5b7397639 100644
--- a/src/guichan/include/guichan/cliprectangle.hpp
+++ b/src/guichan/include/guichan/cliprectangle.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/color.hpp b/src/guichan/include/guichan/color.hpp
index 0fcd6ba6f..0d7ccce5e 100644
--- a/src/guichan/include/guichan/color.hpp
+++ b/src/guichan/include/guichan/color.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/guichan/include/guichan/deathlistener.hpp
index b2061e036..c419edd35 100644
--- a/src/guichan/include/guichan/deathlistener.hpp
+++ b/src/guichan/include/guichan/deathlistener.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/event.hpp b/src/guichan/include/guichan/event.hpp
index 5657b473a..5e85a3ca8 100644
--- a/src/guichan/include/guichan/event.hpp
+++ b/src/guichan/include/guichan/event.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/exception.hpp b/src/guichan/include/guichan/exception.hpp
index cf0051846..2e7b250b3 100644
--- a/src/guichan/include/guichan/exception.hpp
+++ b/src/guichan/include/guichan/exception.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp
index 6cf971522..27b6bc91f 100644
--- a/src/guichan/include/guichan/focushandler.hpp
+++ b/src/guichan/include/guichan/focushandler.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp
index 39d82c9cb..59e8cbe12 100644
--- a/src/guichan/include/guichan/focuslistener.hpp
+++ b/src/guichan/include/guichan/focuslistener.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/font.hpp b/src/guichan/include/guichan/font.hpp
index e780b3808..b5430574e 100644
--- a/src/guichan/include/guichan/font.hpp
+++ b/src/guichan/include/guichan/font.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp
index be01edb4c..aadb81371 100644
--- a/src/guichan/include/guichan/graphics.hpp
+++ b/src/guichan/include/guichan/graphics.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp
index a8bdfa6d5..543681598 100644
--- a/src/guichan/include/guichan/gui.hpp
+++ b/src/guichan/include/guichan/gui.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/image.hpp b/src/guichan/include/guichan/image.hpp
index 1933df293..0feb74e78 100644
--- a/src/guichan/include/guichan/image.hpp
+++ b/src/guichan/include/guichan/image.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/input.hpp b/src/guichan/include/guichan/input.hpp
index e5f45c20a..829ab18fb 100644
--- a/src/guichan/include/guichan/input.hpp
+++ b/src/guichan/include/guichan/input.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/inputevent.hpp b/src/guichan/include/guichan/inputevent.hpp
index 46b2581c4..4b323f6d5 100644
--- a/src/guichan/include/guichan/inputevent.hpp
+++ b/src/guichan/include/guichan/inputevent.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/key.hpp b/src/guichan/include/guichan/key.hpp
index 96785a816..6acce412c 100644
--- a/src/guichan/include/guichan/key.hpp
+++ b/src/guichan/include/guichan/key.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/keyevent.hpp b/src/guichan/include/guichan/keyevent.hpp
index 968c4f2df..99b632af1 100644
--- a/src/guichan/include/guichan/keyevent.hpp
+++ b/src/guichan/include/guichan/keyevent.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/keyinput.hpp b/src/guichan/include/guichan/keyinput.hpp
index 0694883a3..c19fbea22 100644
--- a/src/guichan/include/guichan/keyinput.hpp
+++ b/src/guichan/include/guichan/keyinput.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp
index 8a0b137e5..7336f8623 100644
--- a/src/guichan/include/guichan/keylistener.hpp
+++ b/src/guichan/include/guichan/keylistener.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/listmodel.hpp b/src/guichan/include/guichan/listmodel.hpp
index 682338f5b..681a9e0c8 100644
--- a/src/guichan/include/guichan/listmodel.hpp
+++ b/src/guichan/include/guichan/listmodel.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/mouseevent.hpp b/src/guichan/include/guichan/mouseevent.hpp
index 86d224845..876eaa9ef 100644
--- a/src/guichan/include/guichan/mouseevent.hpp
+++ b/src/guichan/include/guichan/mouseevent.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/mouseinput.hpp b/src/guichan/include/guichan/mouseinput.hpp
index a2911f1d4..435774573 100644
--- a/src/guichan/include/guichan/mouseinput.hpp
+++ b/src/guichan/include/guichan/mouseinput.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp
index 1d876b233..6258a64fb 100644
--- a/src/guichan/include/guichan/mouselistener.hpp
+++ b/src/guichan/include/guichan/mouselistener.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/platform.hpp b/src/guichan/include/guichan/platform.hpp
index 0371f499d..c2ede557c 100644
--- a/src/guichan/include/guichan/platform.hpp
+++ b/src/guichan/include/guichan/platform.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/rectangle.hpp b/src/guichan/include/guichan/rectangle.hpp
index 0d4d64004..7580fea8c 100644
--- a/src/guichan/include/guichan/rectangle.hpp
+++ b/src/guichan/include/guichan/rectangle.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/sdl/sdlgraphics.hpp b/src/guichan/include/guichan/sdl/sdlgraphics.hpp
index 092d58de3..8b565c400 100644
--- a/src/guichan/include/guichan/sdl/sdlgraphics.hpp
+++ b/src/guichan/include/guichan/sdl/sdlgraphics.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp
index 0aaa3c5fb..daf11acc5 100644
--- a/src/guichan/include/guichan/sdl/sdlpixel.hpp
+++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/selectionevent.hpp b/src/guichan/include/guichan/selectionevent.hpp
index fc6c2050b..0d002a524 100644
--- a/src/guichan/include/guichan/selectionevent.hpp
+++ b/src/guichan/include/guichan/selectionevent.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/guichan/include/guichan/selectionlistener.hpp
index 837f35fcf..09039e5e0 100644
--- a/src/guichan/include/guichan/selectionlistener.hpp
+++ b/src/guichan/include/guichan/selectionlistener.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
index 85c3f0d87..d4e1158b3 100644
--- a/src/guichan/include/guichan/widget.hpp
+++ b/src/guichan/include/guichan/widget.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp
index ae148e62c..71ea4d4e9 100644
--- a/src/guichan/include/guichan/widgetlistener.hpp
+++ b/src/guichan/include/guichan/widgetlistener.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp
index 90877cb17..052250e42 100644
--- a/src/guichan/include/guichan/widgets/button.hpp
+++ b/src/guichan/include/guichan/widgets/button.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp
index d59eb44a2..481f28dba 100644
--- a/src/guichan/include/guichan/widgets/checkbox.hpp
+++ b/src/guichan/include/guichan/widgets/checkbox.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/container.hpp b/src/guichan/include/guichan/widgets/container.hpp
index f69d3db45..393a9a960 100644
--- a/src/guichan/include/guichan/widgets/container.hpp
+++ b/src/guichan/include/guichan/widgets/container.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/guichan/include/guichan/widgets/label.hpp
index 473f6e530..a6000b47c 100644
--- a/src/guichan/include/guichan/widgets/label.hpp
+++ b/src/guichan/include/guichan/widgets/label.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp
index b007c3b88..8438bd5ed 100644
--- a/src/guichan/include/guichan/widgets/listbox.hpp
+++ b/src/guichan/include/guichan/widgets/listbox.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp
index c9acfa4f4..0de04e078 100644
--- a/src/guichan/include/guichan/widgets/radiobutton.hpp
+++ b/src/guichan/include/guichan/widgets/radiobutton.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp
index fd7461665..92f68000e 100644
--- a/src/guichan/include/guichan/widgets/scrollarea.hpp
+++ b/src/guichan/include/guichan/widgets/scrollarea.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp
index 44a2ea296..43e301229 100644
--- a/src/guichan/include/guichan/widgets/slider.hpp
+++ b/src/guichan/include/guichan/widgets/slider.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp
index 062ab9c8a..ba26966cc 100644
--- a/src/guichan/include/guichan/widgets/textbox.hpp
+++ b/src/guichan/include/guichan/widgets/textbox.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp
index 9c2fde894..27c4aee26 100644
--- a/src/guichan/include/guichan/widgets/textfield.hpp
+++ b/src/guichan/include/guichan/widgets/textfield.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp
index ddaf9f8ce..442e3da1b 100644
--- a/src/guichan/include/guichan/widgets/window.hpp
+++ b/src/guichan/include/guichan/widgets/window.hpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/inputevent.cpp b/src/guichan/inputevent.cpp
index 4b0bec69d..30c9ada15 100644
--- a/src/guichan/inputevent.cpp
+++ b/src/guichan/inputevent.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/key.cpp b/src/guichan/key.cpp
index 4c6bfde80..ccc3e27aa 100644
--- a/src/guichan/key.cpp
+++ b/src/guichan/key.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/keyevent.cpp b/src/guichan/keyevent.cpp
index 003b288dc..f93dd670d 100644
--- a/src/guichan/keyevent.cpp
+++ b/src/guichan/keyevent.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/keyinput.cpp b/src/guichan/keyinput.cpp
index 35e8b6168..bf12ce418 100644
--- a/src/guichan/keyinput.cpp
+++ b/src/guichan/keyinput.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/mouseevent.cpp b/src/guichan/mouseevent.cpp
index 7f386b0a6..80ff0fcd8 100644
--- a/src/guichan/mouseevent.cpp
+++ b/src/guichan/mouseevent.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/mouseinput.cpp b/src/guichan/mouseinput.cpp
index f3b0fe511..b0b36e410 100644
--- a/src/guichan/mouseinput.cpp
+++ b/src/guichan/mouseinput.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/rectangle.cpp b/src/guichan/rectangle.cpp
index 165f94aab..02e4f31c9 100644
--- a/src/guichan/rectangle.cpp
+++ b/src/guichan/rectangle.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
index 85efd5ef6..a7b6c0e3c 100644
--- a/src/guichan/sdl/sdlgraphics.cpp
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/selectionevent.cpp b/src/guichan/selectionevent.cpp
index 59ba9e641..9d586bd53 100644
--- a/src/guichan/selectionevent.cpp
+++ b/src/guichan/selectionevent.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp
index fbc0cfef9..00e3decf6 100644
--- a/src/guichan/widget.cpp
+++ b/src/guichan/widget.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp
index 08370b07a..8c0cf0f96 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/guichan/widgets/button.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp
index cd135e8c7..420345eda 100644
--- a/src/guichan/widgets/checkbox.cpp
+++ b/src/guichan/widgets/checkbox.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/container.cpp b/src/guichan/widgets/container.cpp
index 64f1ee8cb..e3bbeb995 100644
--- a/src/guichan/widgets/container.cpp
+++ b/src/guichan/widgets/container.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/label.cpp b/src/guichan/widgets/label.cpp
index 669898100..9dce2bff9 100644
--- a/src/guichan/widgets/label.cpp
+++ b/src/guichan/widgets/label.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp
index 2a20a792e..834a4bb82 100644
--- a/src/guichan/widgets/listbox.cpp
+++ b/src/guichan/widgets/listbox.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/radiobutton.cpp b/src/guichan/widgets/radiobutton.cpp
index ac8da2382..75136eb01 100644
--- a/src/guichan/widgets/radiobutton.cpp
+++ b/src/guichan/widgets/radiobutton.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/scrollarea.cpp b/src/guichan/widgets/scrollarea.cpp
index 59e909258..c286d26e6 100644
--- a/src/guichan/widgets/scrollarea.cpp
+++ b/src/guichan/widgets/scrollarea.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index dc522f098..4e94d82ea 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp
index e743ef64f..94edba281 100644
--- a/src/guichan/widgets/textbox.cpp
+++ b/src/guichan/widgets/textbox.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/textfield.cpp b/src/guichan/widgets/textfield.cpp
index 7decc5c6b..1dcf74215 100644
--- a/src/guichan/widgets/textfield.cpp
+++ b/src/guichan/widgets/textfield.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index 89f128bfa..feb337828 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -7,7 +7,7 @@
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
*
* Per Larsson a.k.a finalman
diff --git a/src/guild.cpp b/src/guild.cpp
index 0c9930f85..b0c42921e 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/guild.h b/src/guild.h
index db7d0df1e..9259ae470 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 35ac7f1f0..22e6f5672 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/guildmanager.h b/src/guildmanager.h
index d4dcb0d59..de8af03eb 100644
--- a/src/guildmanager.h
+++ b/src/guildmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index a4ae38a84..c2d253641 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/imageparticle.h b/src/imageparticle.h
index ca5aadd1b..a72063e74 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp
index aef932b20..779bcfed8 100644
--- a/src/imagesprite.cpp
+++ b/src/imagesprite.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/imagesprite.h b/src/imagesprite.h
index 0b6557a7d..b9eb477d1 100644
--- a/src/imagesprite.h
+++ b/src/imagesprite.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/inputevent.cpp b/src/inputevent.cpp
index 3b580dd36..eb047a10b 100644
--- a/src/inputevent.cpp
+++ b/src/inputevent.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/inputevent.h b/src/inputevent.h
index e3dc1382c..cbf271842 100644
--- a/src/inputevent.h
+++ b/src/inputevent.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 0bbbeda10..29b2a87a8 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/inputmanager.h b/src/inputmanager.h
index 7f2e3dd3d..a5325e357 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 3a87ce8ea..c4416a002 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/inventory.h b/src/inventory.h
index db9e94769..aedf18b24 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/item.cpp b/src/item.cpp
index 592d20633..37d353fb4 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/item.h b/src/item.h
index 0fb715547..3f03b7b43 100644
--- a/src/item.h
+++ b/src/item.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 773df7e10..96516eadb 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index bf24fa0d0..605eab205 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/joystick.cpp b/src/joystick.cpp
index d60c7e182..3b88e5668 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -32,25 +32,6 @@
int Joystick::joystickCount = 0;
bool Joystick::mEnabled = false;
-void Joystick::init()
-{
- SDL_InitSubSystem(SDL_INIT_JOYSTICK);
- SDL_JoystickEventState(SDL_ENABLE);
- joystickCount = SDL_NumJoysticks();
- logger->log("%i joysticks/gamepads found", joystickCount);
- for (int i = 0; i < joystickCount; i++)
- logger->log("- %s", SDL_JoystickName(i));
-
- mEnabled = config.getBoolValue("joystickEnabled");
-
- if (Joystick::getNumberOfJoysticks() > 0)
- {
- joystick = new Joystick(config.getIntValue("selectedJoystick"));
- if (mEnabled)
- joystick->open();
- }
-}
-
Joystick::Joystick(const int no):
mDirection(0),
mJoystick(nullptr),
@@ -74,8 +55,34 @@ Joystick::~Joystick()
close();
}
+void Joystick::init()
+{
+ SDL_InitSubSystem(SDL_INIT_JOYSTICK);
+ SDL_JoystickEventState(SDL_ENABLE);
+ joystickCount = SDL_NumJoysticks();
+ logger->log("%i joysticks/gamepads found", joystickCount);
+ for (int i = 0; i < joystickCount; i++)
+ logger->log("- %s", SDL_JoystickName(i));
+
+ mEnabled = config.getBoolValue("joystickEnabled");
+
+ if (joystickCount > 0)
+ {
+ joystick = new Joystick(config.getIntValue("selectedJoystick"));
+ if (mEnabled)
+ joystick->open();
+ }
+}
+
bool Joystick::open()
{
+ if (mNumber >= joystickCount)
+ mNumber = joystickCount - 1;
+ if (mNumber < 0)
+ {
+ logger->log("error: incorrect joystick selection");
+ return false;
+ }
logger->log("open joystick %d", mNumber);
mJoystick = SDL_JoystickOpen(mNumber);
@@ -120,6 +127,12 @@ void Joystick::close()
}
}
+void Joystick::reload()
+{
+ joystickCount = SDL_NumJoysticks();
+ setNumber(mNumber);
+}
+
void Joystick::setNumber(const int n)
{
if (mJoystick)
diff --git a/src/joystick.h b/src/joystick.h
index 75e62fa33..16dc2aa72 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -135,6 +135,8 @@ class Joystick final
void resetRepeat(const int key);
+ void reload();
+
protected:
unsigned char mDirection;
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 1ee73471a..9e7931626 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -2,7 +2,7 @@
* Custom keyboard shortcuts configuration
* Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 69d3b9db5..26b080fc4 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -2,7 +2,7 @@
* Custom keyboard shortcuts configuration
* Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/keyboarddata.h b/src/keyboarddata.h
index 0d40454fb..9bec17f6d 100644
--- a/src/keyboarddata.h
+++ b/src/keyboarddata.h
@@ -2,7 +2,7 @@
* Custom keyboard shortcuts configuration
* Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/keydata.h b/src/keydata.h
index c328178a7..2f88e97f2 100644
--- a/src/keydata.h
+++ b/src/keydata.h
@@ -2,7 +2,7 @@
* Custom keyboard shortcuts configuration
* Copyright (C) 2007 Joshua Langley <joshlangley@optusnet.com.au>
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/keyevent.cpp b/src/keyevent.cpp
index eaac326e4..1cbd32402 100644
--- a/src/keyevent.cpp
+++ b/src/keyevent.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/keyevent.h b/src/keyevent.h
index 01fe39f1e..b04964679 100644
--- a/src/keyevent.h
+++ b/src/keyevent.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/keyinput.cpp b/src/keyinput.cpp
index b2a45df39..3a40eac7e 100644
--- a/src/keyinput.cpp
+++ b/src/keyinput.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/keyinput.h b/src/keyinput.h
index 25d77636d..b4bffb6a5 100644
--- a/src/keyinput.h
+++ b/src/keyinput.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/listener.cpp b/src/listener.cpp
index 0ad7c2603..137ff66ec 100644
--- a/src/listener.cpp
+++ b/src/listener.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/listener.h b/src/listener.h
index d161f6ef5..263e1bf97 100644
--- a/src/listener.h
+++ b/src/listener.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/localconsts.h b/src/localconsts.h
index c73700824..bde91720a 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -56,6 +56,9 @@
#define gnu_printf printf
#endif
+#define FOR_EACH(type, iter, array) for (type iter = array.begin(), \
+ iter##_end = array.end(); iter != iter##_end; ++ iter)
+
//#define DEBUG_CONFIG 1
//#define DEBUG_BIND_TEXTURE 1
//#define DISABLE_RESOURCE_CACHING 1
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index a23811bd3..7fc7d725c 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/localplayer.h b/src/localplayer.h
index b56aefb0a..2d463de4e 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/logger.cpp b/src/logger.cpp
index f3b5d4e04..e9ef6173f 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/logger.h b/src/logger.h
index 1ed7473df..f67ec55d1 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/main.cpp b/src/main.cpp
index 1fe71fcfa..9351536b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/main.h b/src/main.h
index d80f7a409..021090d3c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -45,8 +45,8 @@
* different interfaces, which have different implementations for each server.
*/
-#define SMALL_VERSION "1.2.12.23"
-#define CHECK_VERSION "01.02.12.23"
+#define SMALL_VERSION "1.3.1.20"
+#define CHECK_VERSION "01.03.01.20"
#ifdef HAVE_CONFIG_H
#include "../config.h"
diff --git a/src/map.cpp b/src/map.cpp
index a3e1b1161..899c0acbf 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/map.h b/src/map.h
index a0672242a..5bc1ceb65 100644
--- a/src/map.h
+++ b/src/map.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index 84acb91fd..7f952060d 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/maplayer.h b/src/maplayer.h
index e7f9d866f..2a007a70d 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/mgl.cpp b/src/mgl.cpp
index 56d3b94c2..a3158bb9b 100644
--- a/src/mgl.cpp
+++ b/src/mgl.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/mgl.h b/src/mgl.h
index f1686a2ba..7f30583b4 100644
--- a/src/mgl.h
+++ b/src/mgl.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/mobileopenglgraphics.cpp b/src/mobileopenglgraphics.cpp
index 53b97f1d5..b1eab09cd 100644
--- a/src/mobileopenglgraphics.cpp
+++ b/src/mobileopenglgraphics.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -852,6 +852,14 @@ void MobileOpenGLGraphics::_beginDraw()
glEnable(GL_SCISSOR_TEST);
glDisable(GL_DITHER);
+ glDisable(GL_LIGHTING);
+ glDisable(GL_DEPTH_TEST);
+ glDisable(GL_FOG);
+ glDisable(GL_COLOR_LOGIC_OP);
+ glDisable(GL_COLOR_MATERIAL);
+ glDisable(GL_STENCIL_TEST);
+
+ glShadeModel(GL_FLAT);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
diff --git a/src/mobileopenglgraphics.h b/src/mobileopenglgraphics.h
index 7370691a0..b59b33583 100644
--- a/src/mobileopenglgraphics.h
+++ b/src/mobileopenglgraphics.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/mouseinput.cpp b/src/mouseinput.cpp
index 2f11fcb33..7c7bd297a 100644
--- a/src/mouseinput.cpp
+++ b/src/mouseinput.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/mouseinput.h b/src/mouseinput.h
index d33de8e0e..c1884bfce 100644
--- a/src/mouseinput.h
+++ b/src/mouseinput.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 380101cc9..d28ef733c 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -4,7 +4,7 @@
* All code listed below is in the public domain and can be used, shared or
* modified freely
*
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*/
#ifdef USE_MUMBLE
diff --git a/src/mumblemanager.h b/src/mumblemanager.h
index 03878be80..a89a6f846 100644
--- a/src/mumblemanager.h
+++ b/src/mumblemanager.h
@@ -4,7 +4,7 @@
* All code listed below is in the public domain and can be used, shared or
* modified freely
*
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*/
#ifndef MUMBLEMANAGER_H
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index fd69d8abb..ed8a0bf7e 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index dc41f63dc..e358ad299 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/charhandler.cpp b/src/net/charhandler.cpp
index add4fa459..28a51751c 100644
--- a/src/net/charhandler.cpp
+++ b/src/net/charhandler.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 15f371f26..9b20be57c 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 7859df80e..bd2dc59aa 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 9c9a777fa..7fb799fa0 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/download.h b/src/net/download.h
index fcfe539ac..77f1d1ccc 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 3a7501fb6..542937008 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index b17f1ffa4..45b0af0f1 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 5df1ce823..2dc2c619c 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 1f9d2a042..46e9f2bbb 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 7a66df305..1b24c6b42 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index ce087919f..54fe6ebf7 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index b4708b3f7..e6e7e022e 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 4c150bdca..0b9908fee 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 7cad30837..d133178b3 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index e326f9a8b..ca753169f 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index 62b61a956..014928b66 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index ededed886..3e9e36541 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index caedae064..93773e33d 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index fb6128b2f..ff433f606 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index 293327c4a..020c6d7c9 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 7ea5f815f..73cef8b5f 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index cfd5bd538..129125faf 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 5c9b94529..7c2592617 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index 990eac727..128bf368d 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 193e4a7b6..755c6c027 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 694940a12..9cd484856 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index f216fe01a..3e7cfc747 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 0fa682377..193c3f7c9 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 2109678e2..56538687f 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 89e6e1c47..b4f9d2f5c 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 69c27d792..af2c1837d 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 8148fe63c..83e1abe36 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 155a1f36f..1640d3650 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 053792f6e..ea5bad135 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 0b3576e21..41d0bdf00 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index fdd2fd533..f9dde62b0 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 0beea449f..f46a2241b 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index c090bb126..6df4cc237 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp
index 527437f84..ba805e261 100644
--- a/src/net/ea/specialhandler.cpp
+++ b/src/net/ea/specialhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h
index b951f9aab..3c3317251 100644
--- a/src/net/ea/specialhandler.h
+++ b/src/net/ea/specialhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/token.h b/src/net/ea/token.h
index 86871647f..199bb9f8a 100644
--- a/src/net/ea/token.h
+++ b/src/net/ea/token.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 946019251..cb62ec3bb 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index e669ccf4f..7253f4e0a 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 2f08e9f09..0208b46d5 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index f23e93904..bcd193fb1 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index b8b92ddde..0932d3ad2 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index 2851f66f3..5bdf593ca 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index 3294bc1c8..4214a76f0 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index 736b7119a..c7bc5736c 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index fcec75364..2bb7e8890 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 952fde5f9..4c4d3f511 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 679cdefc2..19e5c2112 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 7e79ee003..022924167 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index 2ea687a88..d98523828 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index c627341a4..d9b9d80f6 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 91f567548..5ac27b5cc 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -255,31 +255,32 @@ void GeneralHandler::processEvent(Channels channel,
// protection against double addition attributes.
statusWindow->clearAttributes();
- statusWindow->addAttribute(STR, _("Strength"), true, "");
- statusWindow->addAttribute(AGI, _("Agility"), true, "");
- statusWindow->addAttribute(VIT, _("Vitality"), true, "");
- statusWindow->addAttribute(INT, _("Intelligence"), true, "");
- statusWindow->addAttribute(DEX, _("Dexterity"), true, "");
- statusWindow->addAttribute(LUK, _("Luck"), true, "");
-
- statusWindow->addAttribute(ATK, _("Attack"), false, "");
- statusWindow->addAttribute(DEF, _("Defense"), false, "");
- statusWindow->addAttribute(MATK, _("M.Attack"), false, "");
- statusWindow->addAttribute(MDEF, _("M.Defense"), false, "");
+ statusWindow->addAttribute(STR, _("Strength"), "str", true, "");
+ statusWindow->addAttribute(AGI, _("Agility"), "agi", true, "");
+ statusWindow->addAttribute(VIT, _("Vitality"), "vit", true, "");
+ statusWindow->addAttribute(INT, _("Intelligence"),
+ "int", true, "");
+ statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true, "");
+ statusWindow->addAttribute(LUK, _("Luck"), "luk", true, "");
+
+ statusWindow->addAttribute(ATK, _("Attack"));
+ statusWindow->addAttribute(DEF, _("Defense"));
+ statusWindow->addAttribute(MATK, _("M.Attack"));
+ statusWindow->addAttribute(MDEF, _("M.Defense"));
// xgettext:no-c-format
- statusWindow->addAttribute(HIT, _("% Accuracy"), false, "");
+ statusWindow->addAttribute(HIT, _("% Accuracy"));
// xgettext:no-c-format
- statusWindow->addAttribute(FLEE, _("% Evade"), false, "");
+ statusWindow->addAttribute(FLEE, _("% Evade"));
// xgettext:no-c-format
- statusWindow->addAttribute(CRIT, _("% Critical"), false, "");
+ statusWindow->addAttribute(CRIT, _("% Critical"));
statusWindow->addAttribute(PlayerInfo::ATTACK_DELAY,
- _("Attack Delay"), false, "");
+ _("Attack Delay"));
statusWindow->addAttribute(PlayerInfo::WALK_SPEED,
- _("Walk Delay"), false, "");
+ _("Walk Delay"));
statusWindow->addAttribute(PlayerInfo::ATTACK_RANGE,
- _("Attack Range"), false, "");
+ _("Attack Range"));
statusWindow->addAttribute(PlayerInfo::ATTACK_SPEED,
- _("Damage per sec."), false, "");
+ _("Damage per sec."));
}
else if (event.getName() == EVENT_GUIWINDOWSUNLOADING)
{
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index 0a02712b7..23b9cf66b 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp
index 049c00186..e3cf1b662 100644
--- a/src/net/eathena/gui/guildtab.cpp
+++ b/src/net/eathena/gui/guildtab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/gui/guildtab.h b/src/net/eathena/gui/guildtab.h
index 946857fff..77fbc3ee7 100644
--- a/src/net/eathena/gui/guildtab.h
+++ b/src/net/eathena/gui/guildtab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp
index e98642963..bf40c3e01 100644
--- a/src/net/eathena/gui/partytab.cpp
+++ b/src/net/eathena/gui/partytab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/gui/partytab.h b/src/net/eathena/gui/partytab.h
index ce9a46564..4569b7f05 100644
--- a/src/net/eathena/gui/partytab.h
+++ b/src/net/eathena/gui/partytab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 000718203..e26a252ab 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index 04861e9b1..1508895fc 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index e655920c1..80b8ed73c 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index 0e0bc965c..77f128838 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp
index 1aad83027..0e2a1e003 100644
--- a/src/net/eathena/itemhandler.cpp
+++ b/src/net/eathena/itemhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/itemhandler.h b/src/net/eathena/itemhandler.h
index cd5a91ed5..bf1d33667 100644
--- a/src/net/eathena/itemhandler.h
+++ b/src/net/eathena/itemhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index a1a80494d..4ad3593f1 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index b6787939c..a1b1095ba 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/messagehandler.cpp b/src/net/eathena/messagehandler.cpp
index 4dd5c1c61..1a031c4b2 100644
--- a/src/net/eathena/messagehandler.cpp
+++ b/src/net/eathena/messagehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h
index 652af466f..3572b2152 100644
--- a/src/net/eathena/messagehandler.h
+++ b/src/net/eathena/messagehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index 137f50711..923be96af 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h
index f052bc79a..47e3b3004 100644
--- a/src/net/eathena/messagein.h
+++ b/src/net/eathena/messagein.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp
index bef5ff817..f25666526 100644
--- a/src/net/eathena/messageout.cpp
+++ b/src/net/eathena/messageout.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h
index 8a4ddb1d1..7f8b6cd45 100644
--- a/src/net/eathena/messageout.h
+++ b/src/net/eathena/messageout.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index ef772248f..8d0613f97 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h
index 745867b48..52ab60a90 100644
--- a/src/net/eathena/network.h
+++ b/src/net/eathena/network.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 4eaa00191..af90c6fd6 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index db03a7eb7..2d5be025d 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/npchandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index c452d2ae0..72b0beaf2 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h
index 2306db7ce..4b18344e8 100644
--- a/src/net/eathena/partyhandler.h
+++ b/src/net/eathena/partyhandler.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index f7a2dccb6..7a7bdff4f 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h
index ca2dc3fc3..bdc77c59b 100644
--- a/src/net/eathena/playerhandler.h
+++ b/src/net/eathena/playerhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index e20ad0dbb..77803de28 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/specialhandler.cpp b/src/net/eathena/specialhandler.cpp
index 668a67519..e30dc6024 100644
--- a/src/net/eathena/specialhandler.cpp
+++ b/src/net/eathena/specialhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/specialhandler.h b/src/net/eathena/specialhandler.h
index 31d704515..8e77a8439 100644
--- a/src/net/eathena/specialhandler.h
+++ b/src/net/eathena/specialhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index cf33aa3cd..9ed75416e 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index b88417a75..395f9337a 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index 512972b23..5a41bec57 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index 57b49b13b..24fbb9639 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 894bc2671..86873b7fb 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 9be6daceb..5cf6bc5db 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/logindata.h b/src/net/logindata.h
index ed29f7736..76d4e3711 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index ed2ecc313..49d9d20b8 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index a487e6ed2..c2f4307b4 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index acce46592..f491e1377 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/messagein.h b/src/net/messagein.h
index d17a49f5d..c6c5ce7eb 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 865b8bc0b..80255297e 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 89cb02c62..4fd647218 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 1f8195f06..af8c9ad1d 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/net.h b/src/net/net.h
index 3cc4154f3..b92d470f0 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 2e32e5986..c0fa49a9a 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/packetcounters.cpp b/src/net/packetcounters.cpp
index d2193895d..5b3faeb06 100644
--- a/src/net/packetcounters.cpp
+++ b/src/net/packetcounters.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h
index f629a8a64..bc3d1de37 100644
--- a/src/net/packetcounters.h
+++ b/src/net/packetcounters.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 46b6f100e..7e4923586 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index ca1ce5ea7..dab32836f 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index ed9e699b0..de82b1ec4 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/specialhandler.h b/src/net/specialhandler.h
index f385f47f9..dea0719e0 100644
--- a/src/net/specialhandler.h
+++ b/src/net/specialhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 26abfc0cd..dcb9d10a1 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 120a1a3fc..8df5cd5ca 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 803ae63a2..13e2c9c21 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 8cf8f577b..9ba801e1e 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index fcc6be2cf..00cb16231 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index a5d51aaa2..0e8b6b470 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 4d0fae108..7f84faaca 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index a907bb33f..b83d7acaf 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 07f95d5f9..9147a448a 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index e3ca9c113..5d250af8e 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index e09bb5436..80dc461f5 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index da5070cbc..b12876dd4 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 39e37f62e..dc1ae6aba 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -264,31 +264,32 @@ void GeneralHandler::processEvent(Channels channel,
// protection against double addition attributes.
statusWindow->clearAttributes();
- statusWindow->addAttribute(STR, _("Strength"), true, "");
- statusWindow->addAttribute(AGI, _("Agility"), true, "");
- statusWindow->addAttribute(VIT, _("Vitality"), true, "");
- statusWindow->addAttribute(INT, _("Intelligence"), true, "");
- statusWindow->addAttribute(DEX, _("Dexterity"), true, "");
- statusWindow->addAttribute(LUK, _("Luck"), true, "");
-
- statusWindow->addAttribute(ATK, _("Attack"), false, "");
- statusWindow->addAttribute(DEF, _("Defense"), false, "");
- statusWindow->addAttribute(MATK, _("M.Attack"), false, "");
- statusWindow->addAttribute(MDEF, _("M.Defense"), false, "");
+ statusWindow->addAttribute(STR, _("Strength"), "str", true, "");
+ statusWindow->addAttribute(AGI, _("Agility"), "agi", true, "");
+ statusWindow->addAttribute(VIT, _("Vitality"), "vit", true, "");
+ statusWindow->addAttribute(INT, _("Intelligence"),
+ "int", true, "");
+ statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true, "");
+ statusWindow->addAttribute(LUK, _("Luck"), "luk", true, "");
+
+ statusWindow->addAttribute(ATK, _("Attack"));
+ statusWindow->addAttribute(DEF, _("Defense"));
+ statusWindow->addAttribute(MATK, _("M.Attack"));
+ statusWindow->addAttribute(MDEF, _("M.Defense"));
// xgettext:no-c-format
- statusWindow->addAttribute(HIT, _("% Accuracy"), false, "");
+ statusWindow->addAttribute(HIT, _("% Accuracy"));
// xgettext:no-c-format
- statusWindow->addAttribute(FLEE, _("% Evade"), false, "");
+ statusWindow->addAttribute(FLEE, _("% Evade"));
// xgettext:no-c-format
- statusWindow->addAttribute(CRIT, _("% Critical"), false, "");
+ statusWindow->addAttribute(CRIT, _("% Critical"));
statusWindow->addAttribute(PlayerInfo::ATTACK_DELAY,
- _("Attack Delay"), false, "");
+ _("Attack Delay"));
statusWindow->addAttribute(PlayerInfo::WALK_SPEED,
- _("Walk Delay"), false, "");
+ _("Walk Delay"));
statusWindow->addAttribute(PlayerInfo::ATTACK_RANGE,
- _("Attack Range"), false, "");
+ _("Attack Range"));
statusWindow->addAttribute(PlayerInfo::ATTACK_SPEED,
- _("Damage per sec."), false, "");
+ _("Damage per sec."));
}
else if (event.getName() == EVENT_GUIWINDOWSUNLOADING)
{
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 3101db558..f404d939e 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index ddf646f84..c7e155341 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/gui/guildtab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h
index 187ddc610..67e2a3ee9 100644
--- a/src/net/tmwa/gui/guildtab.h
+++ b/src/net/tmwa/gui/guildtab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index 09ce35d8a..725cae1d2 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h
index 860a79bbb..6d33c6ce9 100644
--- a/src/net/tmwa/gui/partytab.h
+++ b/src/net/tmwa/gui/partytab.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 5f148ebac..96d1c9a9d 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 4c159d55b..2c2bf4fde 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 562e9c00b..42e6ee9d2 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 572147272..b112776ba 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index d1becafef..bb537a0c7 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index 75c5069e6..155b46c1e 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 6a3c95b96..76b832586 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 004612f21..4ca448108 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/messagehandler.cpp b/src/net/tmwa/messagehandler.cpp
index d4b3c03a4..abe57a396 100644
--- a/src/net/tmwa/messagehandler.cpp
+++ b/src/net/tmwa/messagehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index ce743d55e..79073ffb2 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 0f251ee8c..3b774f158 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index 9b2c6015f..8bd9641ab 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 3c6a180c5..1caa53d0d 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 20526846f..370651659 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index e7e336d2d..e256657e0 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 79b140430..7806147a9 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 732fc7d06..9166c5b84 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 285d775bb..1659cfb5c 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 7ff752252..2b3ac78d6 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 65fbb047a..27f4993a8 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index d5c48e387..ec07a1b51 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 90a25fb79..bc54834f1 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index a5606cea7..b0a967271 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index 228e06ed0..b0910cf7c 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index a514f9cec..17b8bd493 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index 72838e052..51f447282 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h
index 567ddc250..5a72e59b7 100644
--- a/src/net/tmwa/specialhandler.h
+++ b/src/net/tmwa/specialhandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 727ca581a..12ff23daf 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index adaa8c0b1..d96d325a6 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 06a431ec6..e7cfc2925 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h
index 3b562e6ec..8388a4406 100644
--- a/src/net/worldinfo.h
+++ b/src/net/worldinfo.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/normalopenglgraphics.cpp b/src/normalopenglgraphics.cpp
index e263631b9..534e9bffe 100644
--- a/src/normalopenglgraphics.cpp
+++ b/src/normalopenglgraphics.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -1049,12 +1049,21 @@ void NormalOpenGLGraphics::_beginDraw()
glEnable(GL_SCISSOR_TEST);
glDisable(GL_DITHER);
+ glDisable(GL_LIGHTING);
+ glDisable(GL_DEPTH_TEST);
+ glDisable(GL_FOG);
+ glDisable(GL_COLOR_LOGIC_OP);
+ glDisable(GL_COLOR_MATERIAL);
+ glDisable(GL_STENCIL_TEST);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+ glShadeModel(GL_FLAT);
+ glDepthMask(GL_FALSE);
+
#ifndef ANDROID
glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
diff --git a/src/normalopenglgraphics.h b/src/normalopenglgraphics.h
index 022f4d596..afebc49da 100644
--- a/src/normalopenglgraphics.h
+++ b/src/normalopenglgraphics.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/particle.cpp b/src/particle.cpp
index e962c6980..666821b93 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/particle.h b/src/particle.h
index 9d510b9ae..3a48afbb4 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index b26457d3b..782b8fb24 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/particlecontainer.h b/src/particlecontainer.h
index 0cf90940d..d499fa84c 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index ea03d7b48..7f69afe83 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/particleemitter.h b/src/particleemitter.h
index a3657c1b3..b879ffa13 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h
index e9f3661d1..aad16c99a 100644
--- a/src/particleemitterprop.h
+++ b/src/particleemitterprop.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/party.cpp b/src/party.cpp
index d72b06d84..514fa3dc6 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/party.h b/src/party.h
index e95aab543..e9da47a80 100644
--- a/src/party.h
+++ b/src/party.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
index 6e75b1500..6fb482eb8 100644
--- a/src/playerinfo.cpp
+++ b/src/playerinfo.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/playerinfo.h b/src/playerinfo.h
index fcae0bd87..09699bd6d 100644
--- a/src/playerinfo.h
+++ b/src/playerinfo.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 1a18479ce..fee43107e 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/playerrelations.h b/src/playerrelations.h
index 363444f34..d301a3f3b 100644
--- a/src/playerrelations.h
+++ b/src/playerrelations.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/position.cpp b/src/position.cpp
index 7bd6cfe50..fbca3ba41 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/position.h b/src/position.h
index 717aba8d3..9b4c6a7f9 100644
--- a/src/position.h
+++ b/src/position.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/properties.h b/src/properties.h
index b2cdb6e3c..45751afd7 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index 5e70f5f4b..752446e5e 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/action.h b/src/resources/action.h
index 8cfeef576..281e95210 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 99a3b76c4..b32a93bf0 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h
index e5dac80bc..9c07dcfc2 100644
--- a/src/resources/ambientlayer.h
+++ b/src/resources/ambientlayer.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index 7c69e1372..379a0e9f2 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 1e9d34a26..3bff740bc 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index c36d23254..555a3da31 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index d19cbd224..bfb2f4368 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 029e3d40d..c5c36b209 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 44f3dcb83..0e544a3b6 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp
index 23a1066ce..577cdc111 100644
--- a/src/resources/chardb.cpp
+++ b/src/resources/chardb.cpp
@@ -1,7 +1,7 @@
/*
* Color database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/chardb.h b/src/resources/chardb.h
index c44ba6e36..fd7770061 100644
--- a/src/resources/chardb.h
+++ b/src/resources/chardb.h
@@ -1,7 +1,7 @@
/*
* Color database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index f105061d2..d664b2d5b 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -1,7 +1,7 @@
/*
* Color database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 4f48ce7b2..faf9c0a33 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -1,7 +1,7 @@
/*
* Color database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/cursor.cpp b/src/resources/cursor.cpp
index e8a4f95f3..15fe28e26 100644
--- a/src/resources/cursor.cpp
+++ b/src/resources/cursor.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/cursor.h b/src/resources/cursor.h
index ae8210c25..f6852f447 100644
--- a/src/resources/cursor.h
+++ b/src/resources/cursor.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 62be4e09e..a92af93bf 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/dye.h b/src/resources/dye.h
index bb0ee7b32..16f476399 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 1098243ac..d29e9d723 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -1,7 +1,7 @@
/*
* Emote database
* Copyright (C) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 4dfa1175e..c747042d5 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -1,7 +1,7 @@
/*
* Emote database
* Copyright (C) 2009 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index dcc76d435..ead076fa8 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index c71cbdec9..9524a64bd 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/image.h b/src/resources/image.h
index 27a34a319..f383354cc 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index d2d0a78ed..5b7797cbb 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index 39e088aa5..19500f15a 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 6876a7b14..3eead85f2 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 97d3d71fa..80ee84ba2 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 2b8b8a7d9..c9eac63ea 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 94e5f2d01..b88e0aec9 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index e6e36218c..5d8083374 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index bd0b2cdf4..edfbd31dc 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index f78674913..4b9873a3e 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 8e6cc2ee0..30b22cec8 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp
index 1fb12bf11..9c0cdce55 100644
--- a/src/resources/mapdb.cpp
+++ b/src/resources/mapdb.cpp
@@ -1,7 +1,7 @@
/*
* Color database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/mapdb.h b/src/resources/mapdb.h
index ec2561cd7..8bee4668a 100644
--- a/src/resources/mapdb.h
+++ b/src/resources/mapdb.h
@@ -1,7 +1,7 @@
/*
* Color database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 15ac55853..db3b31f25 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 4ef3eafc2..9168206c3 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 48c14b06a..969cb510d 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 35cd40dff..20e885ce5 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 350695bef..07549eb03 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 08063da99..8f3d5650c 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 5eae5c667..6fc800e4e 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 30737dc36..1c1f398eb 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 44fc59f5a..b111a4081 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 5ed8938d1..8cd8dabd6 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 20cd37587..ca96f5f25 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index d08f8043c..c010affd0 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index fb613d9cf..40f3a4a53 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index b37afaf2d..0c643d0ca 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/sdlmusic.cpp b/src/resources/sdlmusic.cpp
index fe06b43f1..5cadbd620 100644
--- a/src/resources/sdlmusic.cpp
+++ b/src/resources/sdlmusic.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index 2d599cb4b..5b60ebb64 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index d142626b5..48772291b 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 8c30aed48..67c28591b 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp
index 8d867b144..aa51a7898 100644
--- a/src/resources/specialdb.cpp
+++ b/src/resources/specialdb.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h
index e23402e3b..e392216f2 100644
--- a/src/resources/specialdb.h
+++ b/src/resources/specialdb.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 9e8e2cc90..28eeb00ed 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index f3fbdf106..ebccc2bd7 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/subimage.cpp b/src/resources/subimage.cpp
index bb63f842a..f1cec9aaf 100644
--- a/src/resources/subimage.cpp
+++ b/src/resources/subimage.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index b3403a727..1cb2835f7 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index d89ad62eb..32f4f1e10 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h
index 989087fa5..283e44a81 100644
--- a/src/resources/wallpaper.h
+++ b/src/resources/wallpaper.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp
index 84fe07d62..407bcaa56 100644
--- a/src/rotationalparticle.cpp
+++ b/src/rotationalparticle.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h
index a7a4a139c..248728bf7 100644
--- a/src/rotationalparticle.h
+++ b/src/rotationalparticle.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/safeopenglgraphics.cpp b/src/safeopenglgraphics.cpp
index d65bd4fec..5802691ec 100644
--- a/src/safeopenglgraphics.cpp
+++ b/src/safeopenglgraphics.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -374,6 +374,15 @@ void SafeOpenGLGraphics::_beginDraw()
glLoadIdentity();
glEnable(GL_SCISSOR_TEST);
+ glDisable(GL_DITHER);
+ glDisable(GL_LIGHTING);
+ glDisable(GL_DEPTH_TEST);
+ glDisable(GL_FOG);
+ glDisable(GL_COLOR_LOGIC_OP);
+ glDisable(GL_COLOR_MATERIAL);
+ glDisable(GL_STENCIL_TEST);
+
+ glShadeModel(GL_FLAT);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
diff --git a/src/safeopenglgraphics.h b/src/safeopenglgraphics.h
index ab5762bcd..e9650c6b9 100644
--- a/src/safeopenglgraphics.h
+++ b/src/safeopenglgraphics.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index 8d91c6ca0..d0a3cce4d 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/shopitem.h b/src/shopitem.h
index decaa3ad0..26616b35a 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 63ec812a9..3e5b40817 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 4d10f3fee..131cd4c07 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 5fc06eb79..b60e84ef3 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -232,11 +232,14 @@ static SDLMusic *loadMusic(const std::string &fileName)
void SoundManager::playMusic(const std::string &fileName)
{
- mCurrentMusicFile = fileName;
-
if (!mInstalled || !mPlayMusic)
return;
+ if (mCurrentMusicFile == fileName)
+ return;
+
+ mCurrentMusicFile = fileName;
+
haltMusic();
if (!fileName.empty())
@@ -407,6 +410,7 @@ void SoundManager::haltMusic()
mMusic->decRef();
mMusic = nullptr;
}
+ mCurrentMusicFile.clear();
}
void SoundManager::changeAudio()
diff --git a/src/soundmanager.h b/src/soundmanager.h
index 227b03579..710e357f1 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/sprite.h b/src/sprite.h
index 8c6c2b559..79cad1125 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index ef0a8ce10..e0a4e51a0 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/statuseffect.h b/src/statuseffect.h
index e807fe5f3..5375b383d 100644
--- a/src/statuseffect.h
+++ b/src/statuseffect.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index 2b1ea448a..917b8eedb 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h
index ba462175d..23314cc41 100644
--- a/src/test/testlauncher.h
+++ b/src/test/testlauncher.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index a305ae239..aa3254275 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/test/testmain.h b/src/test/testmain.h
index 0385822dc..f2913fe30 100644
--- a/src/test/testmain.h
+++ b/src/test/testmain.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/text.cpp b/src/text.cpp
index 8c6b00fbe..76271aecb 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net>
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/text.h b/src/text.h
index 1c922a866..ff9b4145b 100644
--- a/src/text.h
+++ b/src/text.h
@@ -3,7 +3,7 @@
* Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net>
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 85d0d6738..a30e46069 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/textparticle.h b/src/textparticle.h
index cfd6841ba..9d2f7d956 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2006-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/tileset.h b/src/tileset.h
index f88c3ee4d..9b3bc81a3 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/touchactions.cpp b/src/touchactions.cpp
index a04ff5aac..0c87c8a12 100644
--- a/src/touchactions.cpp
+++ b/src/touchactions.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/touchactions.h b/src/touchactions.h
index 4578abaa4..e85a8ca89 100644
--- a/src/touchactions.h
+++ b/src/touchactions.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index ecbda62c6..c8d813998 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -378,8 +378,8 @@ void TouchManager::loadButtons()
// 2x1
if (mButtonsFormat == 0)
{
- loadTouchItem(&mButtons[1], "dbutton.xml", "dbutton_image.xml", x, y,
- sz, sz, RIGHT, "screenActionButton1", "");
+ loadTouchItem(&mButtons[1], "dbutton.xml", "dbutton_image.xml",
+ x, y, sz, sz, RIGHT, "screenActionButton1", "");
loadTouchItem(&mButtons[0], "dbutton.xml", "dbutton_image.xml",
skipWidth, y, sz, sz, RIGHT, "screenActionButton0", "");
@@ -387,8 +387,8 @@ void TouchManager::loadButtons()
// 2x2
else if (mButtonsFormat == 1)
{
- loadTouchItem(&mButtons[3], "dbutton.xml", "dbutton_image.xml", x, y,
- sz, sz, RIGHT, "screenActionButton3", "");
+ loadTouchItem(&mButtons[3], "dbutton.xml", "dbutton_image.xml",
+ x, y, sz, sz, RIGHT, "screenActionButton3", "");
loadTouchItem(&mButtons[2], "dbutton.xml", "dbutton_image.xml",
skipWidth, y, sz, sz, RIGHT, "screenActionButton2", "");
diff --git a/src/touchmanager.h b/src/touchmanager.h
index ce972e41b..fc8a2923f 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/units.cpp b/src/units.cpp
index bfe14276e..b4542658e 100644
--- a/src/units.cpp
+++ b/src/units.cpp
@@ -2,7 +2,7 @@
* Support for custom units
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/units.h b/src/units.h
index 0665bf992..ac04f2b10 100644
--- a/src/units.h
+++ b/src/units.h
@@ -2,7 +2,7 @@
* Support for custom units
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/checkutils.cpp b/src/utils/checkutils.cpp
index c943d8f36..df95f56da 100644
--- a/src/utils/checkutils.cpp
+++ b/src/utils/checkutils.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/checkutils.h b/src/utils/checkutils.h
index de5dd8fe2..9dad2a669 100644
--- a/src/utils/checkutils.h
+++ b/src/utils/checkutils.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 82a58f113..da3d40afb 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -1,7 +1,7 @@
/*
* Retrieve string pasted depending on OS mechanisms.
* Copyright (C) 2001-2010 Wormux Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/copynpaste.h b/src/utils/copynpaste.h
index 7bc2536c5..ea827158d 100644
--- a/src/utils/copynpaste.h
+++ b/src/utils/copynpaste.h
@@ -1,7 +1,7 @@
/*
* Retrieve string pasted depending on OS mechanisms.
* Copyright (C) 2001-2010 Wormux Team
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 54fa11549..17eee70ce 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index f9aae5a71..c9ffd6c27 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/langs.cpp b/src/utils/langs.cpp
index 0b97921fa..538865b61 100644
--- a/src/utils/langs.cpp
+++ b/src/utils/langs.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/langs.h b/src/utils/langs.h
index 38fa2c8e1..a10fd72d7 100644
--- a/src/utils/langs.h
+++ b/src/utils/langs.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index 0472750d3..c58777d06 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index c7cacf0cb..bc089d3d8 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h
index f72548c92..1eb5e1c82 100644
--- a/src/utils/mkdir.h
+++ b/src/utils/mkdir.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 21e1ff9c9..5eee6761c 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp
index f67a6c473..bf4cd5e48 100644
--- a/src/utils/paths.cpp
+++ b/src/utils/paths.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/paths.h b/src/utils/paths.h
index 82e7c6a17..26a9dea27 100644
--- a/src/utils/paths.h
+++ b/src/utils/paths.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/perfomance.cpp b/src/utils/perfomance.cpp
index db25b4fe7..5114906d5 100644
--- a/src/utils/perfomance.cpp
+++ b/src/utils/perfomance.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/perfomance.h b/src/utils/perfomance.h
index ddca355c1..bd441e06b 100644
--- a/src/utils/perfomance.h
+++ b/src/utils/perfomance.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/physfsrwops.cpp b/src/utils/physfsrwops.cpp
index a52b072e3..ba3dc45e7 100644
--- a/src/utils/physfsrwops.cpp
+++ b/src/utils/physfsrwops.cpp
@@ -19,7 +19,7 @@
*
* This file was written by Ryan C. Gordon. (icculus@icculus.org).
*
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*/
#include "utils/physfsrwops.h"
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index f6d335390..fbd1020dd 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -19,7 +19,7 @@
*
* This file was written by Ryan C. Gordon. (icculus@icculus.org).
*
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*/
#ifndef UTILS_PHYSFSRWOPS_H
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index a4c4d3143..822121e9b 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/process.h b/src/utils/process.h
index 1895ed880..6b34fd22d 100644
--- a/src/utils/process.h
+++ b/src/utils/process.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index d0c4978ff..79ec25154 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2008-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file has been slighly modified as part of The ManaPlus Client.
*
diff --git a/src/utils/sha256.h b/src/utils/sha256.h
index a2a852614..7a46e5f86 100644
--- a/src/utils/sha256.h
+++ b/src/utils/sha256.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp
index 9690a9fb7..536b4158f 100644
--- a/src/utils/specialfolder.cpp
+++ b/src/utils/specialfolder.cpp
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h
index f8de79ebe..31ec95ef7 100644
--- a/src/utils/specialfolder.h
+++ b/src/utils/specialfolder.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 7c7b76ea6..14e30b659 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 819b1a7c6..45c1f4b0a 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h
index c254bd5de..ab8f77c51 100644
--- a/src/utils/stringvector.h
+++ b/src/utils/stringvector.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/translation/podict.cpp b/src/utils/translation/podict.cpp
index ebd0682ed..9161d3582 100644
--- a/src/utils/translation/podict.cpp
+++ b/src/utils/translation/podict.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h
index bfedc2578..ba7b250d3 100644
--- a/src/utils/translation/podict.h
+++ b/src/utils/translation/podict.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index 3a415b27b..c0f518b52 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h
index 1fc44adb0..b5bbd03c5 100644
--- a/src/utils/translation/poparser.h
+++ b/src/utils/translation/poparser.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 4d5767c8a..6378b0290 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h
index 55d8a44e4..cc9c8b6a5 100644
--- a/src/utils/translation/translationmanager.h
+++ b/src/utils/translation/translationmanager.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 73418cc60..1d26f0388 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/utils/xml.h b/src/utils/xml.h
index ee010dde0..a0ce23d07 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/variabledata.h b/src/variabledata.h
index 625c077e7..f20511dda 100644
--- a/src/variabledata.h
+++ b/src/variabledata.h
@@ -1,7 +1,7 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/vector.cpp b/src/vector.cpp
index e134a777a..e4ca3eafa 100644
--- a/src/vector.cpp
+++ b/src/vector.cpp
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/vector.h b/src/vector.h
index 1e8caec00..08deff1a2 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2007-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2012 The ManaPlus Developers
+ * Copyright (C) 2011-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/winver.h b/src/winver.h
index 164c304ba..cc5825959 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012 The ManaPlus Developers
+ * Copyright (C) 2012-2013 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/tools/update-copyright.sh b/tools/update-copyright.sh
index 6cebcd564..a126e7738 100755
--- a/tools/update-copyright.sh
+++ b/tools/update-copyright.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright (C) 2001-2010 Wormux Team.
# Copyright (C) 2010 The ManaWorld Development Team.
-# Copyright (C) 2012 The ManaPlus Developers.
+# Copyright (C) 2012-2013 The ManaPlus Developers.
new_year="$1"
[[ -z $new_year ]] && echo "Missing parameter: year" && exit 1